diff --git a/binaries/data/config/system.cfg b/binaries/data/config/system.cfg index e58bc9f9eb..311b13ef2f 100644 --- a/binaries/data/config/system.cfg +++ b/binaries/data/config/system.cfg @@ -8,7 +8,7 @@ novbo=false noframebufferobject=false shadows=true vsync=false -fancywater=false +fancywater=true ; Specify the render path. This can be one of: ; default Automatically select one of the below, depending on system capabilities @@ -27,12 +27,12 @@ lodbias = -1.0 language=english ; Enable/disable windowed mode. -windowed=false +windowed=true ; You can specify these as well, but the default (keeping the current resolution) is ; probably best for most people. -;xres = 1024 -;yres = 768 +xres = 1024 +yres = 768 ; Logging settings: ; diff --git a/build/premake/premake.lua b/build/premake/premake.lua index b8254fa3ee..9c16289c7d 100755 --- a/build/premake/premake.lua +++ b/build/premake/premake.lua @@ -662,7 +662,8 @@ function setup_atlas_packages() "spidermonkey", "wxwidgets", "xerces", - "comsuppw" + "comsuppw", + "zlib" },{ -- extra_params pch = (not has_broken_pch), extra_links = { "AtlasObject", "AtlasScript", "wxJS", "DatafileIO" }, diff --git a/build/workspaces/required-libraries-mac.txt b/build/workspaces/required-libraries-mac.txt index 3d05efec95..07949cedb4 100644 --- a/build/workspaces/required-libraries-mac.txt +++ b/build/workspaces/required-libraries-mac.txt @@ -7,11 +7,17 @@ After installing MacPorts, use it to install the following packages: - spidermonkey - xercesc - wxWidgets +- ffmpeg This can be done with the command: sudo port install These packages bring in other dependencies, such as XFree86, libogg and zlib. +You also need to install DevIL manually. It depends on some libraries downloaded +through MacPorts above, so get those first. Next, obtain DevIL 1.6.8 RC2 from +http://openil.sourceforge.net/download.php. Then extract the archive, and run +./configure, make, and sudo make install. + WARNING: The current Mac build does not seem to work in full-screen mode. Please set windowed=true in binaries/data/config/system.cfg, and set the xres and yres parameters to a suitable window size. diff --git a/source/lib/res/file/vfs_mount.cpp b/source/lib/res/file/vfs_mount.cpp index fb6a6690bc..a8eeae5ea8 100644 --- a/source/lib/res/file/vfs_mount.cpp +++ b/source/lib/res/file/vfs_mount.cpp @@ -710,6 +710,7 @@ LibError vfs_unmount(const char* P_name) // used when receiving paths from external code. LibError mount_make_vfs_path(const char* P_path, char* V_path) { + debug_printf("mount_make_vfs_path %s %s\n", P_path, V_path); for(MountIt it = mounts.begin(); it != mounts.end(); ++it) { const Mount& m = *it; diff --git a/source/lib/sysdep/unix/dir_watch_fam.cpp b/source/lib/sysdep/unix/dir_watch_fam.cpp index 0a04e17b49..d1294828b2 100644 --- a/source/lib/sysdep/unix/dir_watch_fam.cpp +++ b/source/lib/sysdep/unix/dir_watch_fam.cpp @@ -22,7 +22,7 @@ LibError dir_cancel_watch(const intptr_t watch) LibError dir_get_changed_file(char *) { - return INFO::OK; + return ERR::AGAIN; // Say no files are available. } #else diff --git a/source/lib/sysdep/unix/unix.cpp b/source/lib/sysdep/unix/unix.cpp index 8494b5eeac..74145cfb6e 100644 --- a/source/lib/sysdep/unix/unix.cpp +++ b/source/lib/sysdep/unix/unix.cpp @@ -11,6 +11,10 @@ #define GNU_SOURCE #include +#ifdef OS_MACOSX +#include +#endif + // these are basic POSIX-compatible backends for the sysdep.h functions. // Win32 has better versions which override these. @@ -27,6 +31,25 @@ void sys_display_msgw(const wchar_t* caption, const wchar_t* msg) LibError sys_get_executable_name(char* n_path, size_t buf_size) { +#ifdef OS_MACOSX + static char name[PATH_MAX]; + static bool init = false; + if ( !init ) + { + init = true; + char temp[PATH_MAX]; + u32 size = PATH_MAX; + if (_NSGetExecutablePath( temp, &size )) + { + return ERR::NO_SYS; + } + debug_printf("exe name before realpath: %s\n", temp); + realpath(temp, name); + } + strncpy(n_path, name, buf_size); + debug_printf("exe name: %s\n", name); + return INFO::OK; +#else Dl_info dl_info; memset(&dl_info, 0, sizeof(dl_info)); @@ -38,6 +61,7 @@ LibError sys_get_executable_name(char* n_path, size_t buf_size) strncpy(n_path, dl_info.dli_fname, buf_size); return INFO::OK; +#endif } diff --git a/source/lib/sysdep/unix/x.cpp b/source/lib/sysdep/unix/x.cpp index e6a9a5b312..b9c4bcbccf 100644 --- a/source/lib/sysdep/unix/x.cpp +++ b/source/lib/sysdep/unix/x.cpp @@ -28,6 +28,15 @@ static size_t selection_size=0; // if we fail, outputs are unchanged (assumed initialized to defaults) LibError gfx_get_video_mode(int* xres, int* yres, int* bpp, int* freq) { +#if OS_MACOSX + // There might not be X. Instead, we should use Carbon. For now however, + // return some defaults. + *xres = 1024; + *yres = 768; + *bpp = 32; + *freq = 0; + return INFO::OK; +#else Display* disp = XOpenDisplay(0); if(!disp) WARN_RETURN(ERR::FAIL); @@ -55,6 +64,7 @@ LibError gfx_get_video_mode(int* xres, int* yres, int* bpp, int* freq) *freq = 0; XCloseDisplay(disp); return INFO::OK; +#endif } diff --git a/source/tools/atlas/AtlasScript/ScriptInterface.cpp b/source/tools/atlas/AtlasScript/ScriptInterface.cpp index d60e1daaae..9356cfa6e9 100644 --- a/source/tools/atlas/AtlasScript/ScriptInterface.cpp +++ b/source/tools/atlas/AtlasScript/ScriptInterface.cpp @@ -268,6 +268,8 @@ template jsval ScriptInterface::ToJSVal(JSContext* cx, const T& v) // but are required for linking with other files template bool ScriptInterface::FromJSVal(JSContext*, jsval, wxString&); +template bool ScriptInterface::FromJSVal(JSContext*, jsval, float&); + //////////////////////////////////////////////////////////////// diff --git a/source/tools/atlas/AtlasUI/ActorViewer/ActorViewer.h b/source/tools/atlas/AtlasUI/ActorViewer/ActorViewer.h index 00ce5b05f8..247245510c 100644 --- a/source/tools/atlas/AtlasUI/ActorViewer/ActorViewer.h +++ b/source/tools/atlas/AtlasUI/ActorViewer/ActorViewer.h @@ -4,6 +4,8 @@ #include "General/Observable.h" #include "ScenarioEditor/Tools/Common/ObjectSettings.h" +#include "wx/treectrl.h" + class wxTreeCtrl; class ActorViewer : public wxFrame diff --git a/source/tools/atlas/AtlasUI/ArchiveViewer/FilePreviewer.cpp b/source/tools/atlas/AtlasUI/ArchiveViewer/FilePreviewer.cpp index 22f94ad7c0..981e9a24ea 100644 --- a/source/tools/atlas/AtlasUI/ArchiveViewer/FilePreviewer.cpp +++ b/source/tools/atlas/AtlasUI/ArchiveViewer/FilePreviewer.cpp @@ -210,10 +210,16 @@ void FilePreviewer::PreviewFile(const wxString& filename, SeekableInputStream& s // (That's assuming we fix wxSound to not just leak the memory.) // So, just use a static object, and hope it stops playing before // the program is exited. + // The wxSound-from memory constructor does not exist on OS X, so + // just show a warning there. +#ifdef __APPLE__ + wxFAIL_MSG(_T("WAV playback not available on Mac OS X")); +#else static wxSound snd; snd.Stop(); snd.Create((int)bufSize, (const wxByte*)buf); snd.Play(); +#endif stream.ReleaseBuffer(buf); } diff --git a/source/tools/atlas/AtlasUI/General/VideoRecorder/FFmpeg.cpp b/source/tools/atlas/AtlasUI/General/VideoRecorder/FFmpeg.cpp index fbc03166c2..d4dceab86f 100644 --- a/source/tools/atlas/AtlasUI/General/VideoRecorder/FFmpeg.cpp +++ b/source/tools/atlas/AtlasUI/General/VideoRecorder/FFmpeg.cpp @@ -1,5 +1,9 @@ #include "precompiled.h" +#define USE_FFMPEG 0 + +#include "FFmpeg.h" + /* Code originally taken from ffmpeg's output_example.c @@ -16,6 +20,7 @@ This is all rather hacked together and unreliable. In particular, I should: Please complain if I forget to do those things. */ +#if USE_FFMPEG #ifdef __GNUC__ // ugly hack to make recent versions of FFmpeg work @@ -403,3 +408,19 @@ VideoEncoder::~VideoEncoder() delete m; } + +#else // !USE_FFMPEG: + +VideoEncoder::VideoEncoder(const wxString& filenameStr, int framerate, int bitrate, float duration, int width, int height) +{ +} + +void VideoEncoder::Frame(const unsigned char* buffer) +{ +} + +VideoEncoder::~VideoEncoder() +{ +} + +#endif // !USE_FFMPEG diff --git a/source/tools/atlas/AtlasUI/Misc/DLLInterface.cpp b/source/tools/atlas/AtlasUI/Misc/DLLInterface.cpp index 50b4d26a61..00dfd4cf54 100644 --- a/source/tools/atlas/AtlasUI/Misc/DLLInterface.cpp +++ b/source/tools/atlas/AtlasUI/Misc/DLLInterface.cpp @@ -89,7 +89,7 @@ ATLASDLLIMPEXP void Atlas_StartWindow(const wchar_t* type) #ifdef __WXMSW__ wxEntry(g_Module); #else -# ifdef __WXGTK__ +#ifdef __WXGTK__ // Because we do GL calls from a secondary thread, Xlib needs to // be told to support multiple threads safely int status = XInitThreads(); @@ -97,8 +97,7 @@ ATLASDLLIMPEXP void Atlas_StartWindow(const wchar_t* type) { fprintf(stderr, "Error enabling thread-safety via XInitThreads\n"); } -# endif - +#endif int argc = 1; char *argv[] = {"atlas", NULL}; wxEntry(argc, argv); diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinematic/Cinematic.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinematic/Cinematic.cpp index b15ad51d41..3fa4517b02 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinematic/Cinematic.cpp +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Cinematic/Cinematic.cpp @@ -14,6 +14,7 @@ #include "wx/spinctrl.h" #include "wx/filename.h" #include "wx/wfstream.h" +#include "wx/listctrl.h" #include diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Trigger/Trigger.cpp b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Trigger/Trigger.cpp index 45c892ff0d..fc7e1ef9d5 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Trigger/Trigger.cpp +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Trigger/Trigger.cpp @@ -7,6 +7,7 @@ #include "ScenarioEditor/Tools/Common/MiscState.h" #include "wx/treectrl.h" +#include "wx/listctrl.h" #include "wx/notebook.h" #include #include diff --git a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Trigger/Trigger.h b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Trigger/Trigger.h index 083cfe31db..6123dab826 100644 --- a/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Trigger/Trigger.h +++ b/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Trigger/Trigger.h @@ -13,6 +13,8 @@ class wxTreeItemId; class wxTreeItemData; class wxNotebook; class wxNotebookEvent; +class wxTreeEvent; +class wxListEvent; class TriggerSidebar : public Sidebar { diff --git a/source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp b/source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp index 02a7bda9d1..db7310b920 100644 --- a/source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp +++ b/source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp @@ -32,7 +32,7 @@ MESSAGEHANDLER(Init) if (g_IsInitialised) return; -#if OS_LINUX +#if defined(OS_LINUX) || defined(__APPLE__) // When using GLX (Linux), SDL has to load the GL library to find // glXGetProcAddressARB before it can load any extensions. // When running in Atlas, we skip the SDL video initialisation code diff --git a/source/tools/atlas/GameInterface/MessagePasserImpl.cpp b/source/tools/atlas/GameInterface/MessagePasserImpl.cpp index 7d03792ccf..14b2235fd8 100644 --- a/source/tools/atlas/GameInterface/MessagePasserImpl.cpp +++ b/source/tools/atlas/GameInterface/MessagePasserImpl.cpp @@ -58,16 +58,22 @@ void MessagePasserImpl::Query(QueryMessage* qry, void(* UNUSED(timeoutCallback) debug_printf("%8.3f add query: %s\n", get_time(), qry->GetName()); // Initialise a semaphore, so we can block until the query has been handled - int err; - sem_t sem; - err = sem_init(&sem, 0, 0); - if (err != 0) + int err = 0; + sem_t* psem = (sem_t*) SEM_FAILED; + //sem_t sem; + //psem = &sem; + //err = sem_init(psem, 0, 0); + const char* sem_name = "/tmp/atlas"; + psem = sem_open(sem_name, O_CREAT, 0777, 0); + err = errno; + if (psem == (sem_t*) SEM_FAILED) { // Probably-fatal error + debug_printf("errno: %d (%s)\n", err, strerror(err)); debug_warn("sem_init failed"); return; } - qry->m_Semaphore = (void*)&sem; + qry->m_Semaphore = (void*)psem; m_Mutex.Lock(); m_Queue.push(qry); @@ -95,19 +101,19 @@ void MessagePasserImpl::Query(QueryMessage* qry, void(* UNUSED(timeoutCallback) // #if OS_WIN // // On Win32, use MsgWaitForMultipleObjects, which waits on the semaphore // // but is also interrupted by incoming Windows-messages. -// // while (0 != (err = sem_msgwait_np(&sem))) +// // while (0 != (err = sem_msgwait_np(psem))) // -// while (0 != (err = sem_wait(&sem))) +// while (0 != (err = sem_wait(psem))) // #else // // TODO: On non-Win32, I have no idea whether the same problem exists; but // // it might do, so call the callback every few seconds just in case it helps. // struct timespec abs_timeout; // clock_gettime(CLOCK_REALTIME, &abs_timeout); // abs_timeout.tv_sec += 2; -// while (0 != (err = sem_timedwait(&sem, &abs_timeout))) +// while (0 != (err = sem_timedwait(psem, &abs_timeout))) // #endif - while (0 != (err = sem_wait(&sem))) + while (0 != (err = sem_wait(psem))) { // If timed out, call callback and try again // if (errno == ETIMEDOUT) @@ -123,7 +129,9 @@ void MessagePasserImpl::Query(QueryMessage* qry, void(* UNUSED(timeoutCallback) // Clean up qry->m_Semaphore = NULL; - sem_destroy(&sem); + //sem_destroy(psem); + sem_close(psem); + sem_unlink(sem_name); } bool MessagePasserImpl::IsEmpty() diff --git a/source/tools/atlas/GameInterface/Shareable.h b/source/tools/atlas/GameInterface/Shareable.h index 23912a041d..d16f76647e 100644 --- a/source/tools/atlas/GameInterface/Shareable.h +++ b/source/tools/atlas/GameInterface/Shareable.h @@ -43,6 +43,7 @@ after their definition. #include "SharedMemory.h" #include +#include // We want to use placement new, which breaks when compiling Debug configurations // in the game and in wx, and they both need different workarounds. diff --git a/source/tools/atlas/wxJS/common/type.cpp b/source/tools/atlas/wxJS/common/type.cpp index 1609ec179d..fb91296d58 100644 --- a/source/tools/atlas/wxJS/common/type.cpp +++ b/source/tools/atlas/wxJS/common/type.cpp @@ -73,6 +73,19 @@ bool wxjs::FromJS(JSContext *cx, jsval v, long &to) return JS_FALSE; } +template<> +bool wxjs::FromJS(JSContext *cx, jsval v, unsigned long &to) +{ + int32 temp; + if ( JS_ValueToInt32(cx, v, &temp) == JS_TRUE ) + { + to = temp; + return true; + } + else + return false; +} + template<> bool wxjs::FromJS(JSContext *cx, jsval v, double &to) { diff --git a/source/tools/atlas/wxJS/common/type.h b/source/tools/atlas/wxJS/common/type.h index a505bfc9b2..d6500e29d2 100644 --- a/source/tools/atlas/wxJS/common/type.h +++ b/source/tools/atlas/wxJS/common/type.h @@ -45,6 +45,9 @@ namespace wxjs template<> bool FromJS(JSContext *cx, jsval v, unsigned int &to); + template<> + bool FromJS(JSContext *cx, jsval v, unsigned long &to); + template<> bool FromJS(JSContext *cx, jsval v, long &to); diff --git a/source/tools/atlas/wxJS/gui/control/button.cpp b/source/tools/atlas/wxJS/gui/control/button.cpp index f0579ad339..209d62b918 100644 --- a/source/tools/atlas/wxJS/gui/control/button.cpp +++ b/source/tools/atlas/wxJS/gui/control/button.cpp @@ -397,12 +397,13 @@ void ButtonEventHandler::ConnectClicked(wxButton *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(OnClicked)); + p->Connect(wxEVT_COMMAND_BUTTON_CLICKED, + wxCommandEventHandler(ButtonEventHandler::OnClicked)); } else { p->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, - wxCommandEventHandler(OnClicked)); + wxCommandEventHandler(ButtonEventHandler::OnClicked)); } } diff --git a/source/tools/atlas/wxJS/gui/control/calendar.cpp b/source/tools/atlas/wxJS/gui/control/calendar.cpp index 553be09ee7..0765769595 100644 --- a/source/tools/atlas/wxJS/gui/control/calendar.cpp +++ b/source/tools/atlas/wxJS/gui/control/calendar.cpp @@ -756,12 +756,12 @@ void CalendarEventHandler::ConnectCalendar(wxCalendarCtrl *p, if ( connect ) { p->Connect(wxEVT_CALENDAR_DOUBLECLICKED, - wxCalendarEventHandler(OnCalendar)); + wxCalendarEventHandler(CalendarEventHandler::OnCalendar)); } else { p->Disconnect(wxEVT_CALENDAR_DOUBLECLICKED, - wxCalendarEventHandler(OnCalendar)); + wxCalendarEventHandler(CalendarEventHandler::OnCalendar)); } } @@ -770,12 +770,12 @@ void CalendarEventHandler::ConnectCalendarDay(wxCalendarCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_CALENDAR_DAY_CHANGED, - wxCalendarEventHandler(OnCalendarDay)); + wxCalendarEventHandler(CalendarEventHandler::OnCalendarDay)); } else { p->Disconnect(wxEVT_CALENDAR_DAY_CHANGED, - wxCalendarEventHandler(OnCalendarDay)); + wxCalendarEventHandler(CalendarEventHandler::OnCalendarDay)); } } @@ -785,12 +785,12 @@ void CalendarEventHandler::ConnectCalendarSelChanged(wxCalendarCtrl *p, if ( connect ) { p->Connect(wxEVT_CALENDAR_SEL_CHANGED, - wxCalendarEventHandler(OnCalendarSelChanged)); + wxCalendarEventHandler(CalendarEventHandler::OnCalendarSelChanged)); } else { p->Disconnect(wxEVT_CALENDAR_SEL_CHANGED, - wxCalendarEventHandler(OnCalendarSelChanged)); + wxCalendarEventHandler(CalendarEventHandler::OnCalendarSelChanged)); } } @@ -799,12 +799,12 @@ void CalendarEventHandler::ConnectCalendarMonth(wxCalendarCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_CALENDAR_MONTH_CHANGED, - wxCalendarEventHandler(OnCalendarMonth)); + wxCalendarEventHandler(CalendarEventHandler::OnCalendarMonth)); } else { p->Disconnect(wxEVT_CALENDAR_MONTH_CHANGED, - wxCalendarEventHandler(OnCalendarMonth)); + wxCalendarEventHandler(CalendarEventHandler::OnCalendarMonth)); } } @@ -813,12 +813,12 @@ void CalendarEventHandler::ConnectCalendarYear(wxCalendarCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_CALENDAR_YEAR_CHANGED, - wxCalendarEventHandler(OnCalendarYear)); + wxCalendarEventHandler(CalendarEventHandler::OnCalendarYear)); } else { p->Disconnect(wxEVT_CALENDAR_YEAR_CHANGED, - wxCalendarEventHandler(OnCalendarYear)); + wxCalendarEventHandler(CalendarEventHandler::OnCalendarYear)); } } @@ -828,12 +828,12 @@ void CalendarEventHandler::ConnectCalendarWeekDayClicked(wxCalendarCtrl *p, if ( connect ) { p->Connect(wxEVT_CALENDAR_WEEKDAY_CLICKED, - wxCalendarEventHandler(OnCalendarWeekDayClicked)); + wxCalendarEventHandler(CalendarEventHandler::OnCalendarWeekDayClicked)); } else { p->Disconnect(wxEVT_CALENDAR_WEEKDAY_CLICKED, - wxCalendarEventHandler(OnCalendarWeekDayClicked)); + wxCalendarEventHandler(CalendarEventHandler::OnCalendarWeekDayClicked)); } } diff --git a/source/tools/atlas/wxJS/gui/control/checkbox.cpp b/source/tools/atlas/wxJS/gui/control/checkbox.cpp index 23a3c49534..33510bd6ab 100644 --- a/source/tools/atlas/wxJS/gui/control/checkbox.cpp +++ b/source/tools/atlas/wxJS/gui/control/checkbox.cpp @@ -309,12 +309,12 @@ void CheckBoxEventHandler::ConnectCheckBox(wxCheckBox *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_CHECKBOX_CLICKED, - wxCommandEventHandler(OnCheckBox)); + wxCommandEventHandler(CheckBoxEventHandler::OnCheckBox)); } else { p->Disconnect(wxEVT_COMMAND_CHECKBOX_CLICKED, - wxCommandEventHandler(OnCheckBox)); + wxCommandEventHandler(CheckBoxEventHandler::OnCheckBox)); } } diff --git a/source/tools/atlas/wxJS/gui/control/chklstbx.cpp b/source/tools/atlas/wxJS/gui/control/chklstbx.cpp index dae3757299..e9cda09be8 100644 --- a/source/tools/atlas/wxJS/gui/control/chklstbx.cpp +++ b/source/tools/atlas/wxJS/gui/control/chklstbx.cpp @@ -314,12 +314,12 @@ void CheckListBoxEventHandler::ConnectCheckListBox(wxCheckListBox *p, if ( connect ) { p->Connect(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, - wxCommandEventHandler(OnCheckListBox)); + wxCommandEventHandler(CheckListBoxEventHandler::OnCheckListBox)); } else { p->Disconnect(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, - wxCommandEventHandler(OnCheckListBox)); + wxCommandEventHandler(CheckListBoxEventHandler::OnCheckListBox)); } } diff --git a/source/tools/atlas/wxJS/gui/control/choice.cpp b/source/tools/atlas/wxJS/gui/control/choice.cpp index bcffc806c0..a4d9f75377 100644 --- a/source/tools/atlas/wxJS/gui/control/choice.cpp +++ b/source/tools/atlas/wxJS/gui/control/choice.cpp @@ -339,12 +339,12 @@ void ChoiceEventHandler::ConnectChoice(wxChoice *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_CHOICE_SELECTED, - wxCommandEventHandler(OnChoice)); + wxCommandEventHandler(ChoiceEventHandler::OnChoice)); } else { p->Disconnect(wxEVT_COMMAND_CHOICE_SELECTED, - wxCommandEventHandler(OnChoice)); + wxCommandEventHandler(ChoiceEventHandler::OnChoice)); } } diff --git a/source/tools/atlas/wxJS/gui/control/combobox.cpp b/source/tools/atlas/wxJS/gui/control/combobox.cpp index ea237bcb6a..d49e02159c 100644 --- a/source/tools/atlas/wxJS/gui/control/combobox.cpp +++ b/source/tools/atlas/wxJS/gui/control/combobox.cpp @@ -623,12 +623,12 @@ void ComboBoxEventHandler::ConnectText(wxComboBox *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_TEXT_UPDATED, - wxCommandEventHandler(OnText)); + wxCommandEventHandler(ComboBoxEventHandler::OnText)); } else { p->Disconnect(wxEVT_COMMAND_TEXT_UPDATED, - wxCommandEventHandler(OnText)); + wxCommandEventHandler(ComboBoxEventHandler::OnText)); } } @@ -637,12 +637,12 @@ void ComboBoxEventHandler::ConnectTextEnter(wxComboBox *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_TEXT_ENTER, - wxCommandEventHandler(OnTextEnter)); + wxCommandEventHandler(ComboBoxEventHandler::OnTextEnter)); } else { p->Disconnect(wxEVT_COMMAND_TEXT_ENTER, - wxCommandEventHandler(OnTextEnter)); + wxCommandEventHandler(ComboBoxEventHandler::OnTextEnter)); } } @@ -651,12 +651,12 @@ void ComboBoxEventHandler::ConnectComboBox(wxComboBox *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_COMBOBOX_SELECTED, - wxCommandEventHandler(OnComboBox)); + wxCommandEventHandler(ComboBoxEventHandler::OnComboBox)); } else { p->Disconnect(wxEVT_COMMAND_COMBOBOX_SELECTED, - wxCommandEventHandler(OnComboBox)); + wxCommandEventHandler(ComboBoxEventHandler::OnComboBox)); } } diff --git a/source/tools/atlas/wxJS/gui/control/dialog.cpp b/source/tools/atlas/wxJS/gui/control/dialog.cpp index 16de6c7eed..bceedc10ad 100644 --- a/source/tools/atlas/wxJS/gui/control/dialog.cpp +++ b/source/tools/atlas/wxJS/gui/control/dialog.cpp @@ -430,11 +430,11 @@ void DialogEventHandler::ConnectClose(wxDialog *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(OnClose)); + p->Connect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(DialogEventHandler::OnClose)); } else { - p->Disconnect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(OnClose)); + p->Disconnect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(DialogEventHandler::OnClose)); } } @@ -442,11 +442,11 @@ void DialogEventHandler::ConnectInitDialog(wxDialog *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(OnInitDialog)); + p->Connect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(DialogEventHandler::OnInitDialog)); } else { - p->Disconnect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(OnInitDialog)); + p->Disconnect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(DialogEventHandler::OnInitDialog)); } } diff --git a/source/tools/atlas/wxJS/gui/control/findrdlg.cpp b/source/tools/atlas/wxJS/gui/control/findrdlg.cpp index 91244dde00..d3df5d1863 100644 --- a/source/tools/atlas/wxJS/gui/control/findrdlg.cpp +++ b/source/tools/atlas/wxJS/gui/control/findrdlg.cpp @@ -312,11 +312,11 @@ void FindReplaceEventHandler::ConnectFind(wxFindReplaceDialog *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_COMMAND_FIND, wxFindDialogEventHandler(OnFind)); + p->Connect(wxEVT_COMMAND_FIND, wxFindDialogEventHandler(FindReplaceEventHandler::OnFind)); } else { - p->Disconnect(wxEVT_COMMAND_FIND, wxFindDialogEventHandler(OnFind)); + p->Disconnect(wxEVT_COMMAND_FIND, wxFindDialogEventHandler(FindReplaceEventHandler::OnFind)); } } @@ -325,12 +325,12 @@ void FindReplaceEventHandler::ConnectFindNext(wxFindReplaceDialog *p, { if ( connect ) { - p->Connect(wxEVT_COMMAND_FIND_NEXT, wxFindDialogEventHandler(OnFindNext)); + p->Connect(wxEVT_COMMAND_FIND_NEXT, wxFindDialogEventHandler(FindReplaceEventHandler::OnFindNext)); } else { p->Disconnect(wxEVT_COMMAND_FIND_NEXT, - wxFindDialogEventHandler(OnFindNext)); + wxFindDialogEventHandler(FindReplaceEventHandler::OnFindNext)); } } @@ -339,12 +339,12 @@ void FindReplaceEventHandler::ConnectReplace(wxFindReplaceDialog *p, { if ( connect ) { - p->Connect(wxEVT_COMMAND_FIND_REPLACE, wxFindDialogEventHandler(OnReplace)); + p->Connect(wxEVT_COMMAND_FIND_REPLACE, wxFindDialogEventHandler(FindReplaceEventHandler::OnReplace)); } else { p->Disconnect(wxEVT_COMMAND_FIND_REPLACE, - wxFindDialogEventHandler(OnReplace)); + wxFindDialogEventHandler(FindReplaceEventHandler::OnReplace)); } } @@ -354,12 +354,12 @@ void FindReplaceEventHandler::ConnectReplaceAll(wxFindReplaceDialog *p, if ( connect ) { p->Connect(wxEVT_COMMAND_FIND_REPLACE_ALL, - wxFindDialogEventHandler(OnReplaceAll)); + wxFindDialogEventHandler(FindReplaceEventHandler::OnReplaceAll)); } else { p->Disconnect(wxEVT_COMMAND_FIND_REPLACE_ALL, - wxFindDialogEventHandler(OnReplaceAll)); + wxFindDialogEventHandler(FindReplaceEventHandler::OnReplaceAll)); } } @@ -368,12 +368,12 @@ void FindReplaceEventHandler::ConnectFindClose(wxFindReplaceDialog *p, { if ( connect ) { - p->Connect(wxEVT_COMMAND_FIND_CLOSE, wxFindDialogEventHandler(OnFindClose)); + p->Connect(wxEVT_COMMAND_FIND_CLOSE, wxFindDialogEventHandler(FindReplaceEventHandler::OnFindClose)); } else { p->Disconnect(wxEVT_COMMAND_FIND_CLOSE, - wxFindDialogEventHandler(OnFindClose)); + wxFindDialogEventHandler(FindReplaceEventHandler::OnFindClose)); } } diff --git a/source/tools/atlas/wxJS/gui/control/frame.cpp b/source/tools/atlas/wxJS/gui/control/frame.cpp index 51e201f64d..e349fa3f64 100644 --- a/source/tools/atlas/wxJS/gui/control/frame.cpp +++ b/source/tools/atlas/wxJS/gui/control/frame.cpp @@ -868,11 +868,11 @@ void FrameEventHandler::ConnectClose(wxFrame *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(OnClose)); + p->Connect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(FrameEventHandler::OnClose)); } else { - p->Disconnect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(OnClose)); + p->Disconnect(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(FrameEventHandler::OnClose)); } } @@ -880,11 +880,11 @@ void FrameEventHandler::ConnectIconize(wxFrame *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_ICONIZE, wxIconizeEventHandler(OnIconize)); + p->Connect(wxEVT_ICONIZE, wxIconizeEventHandler(FrameEventHandler::OnIconize)); } else { - p->Disconnect(wxEVT_ICONIZE, wxIconizeEventHandler(OnIconize)); + p->Disconnect(wxEVT_ICONIZE, wxIconizeEventHandler(FrameEventHandler::OnIconize)); } } @@ -892,11 +892,11 @@ void FrameEventHandler::ConnectMaximize(wxFrame *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_MAXIMIZE, wxMaximizeEventHandler(OnMaximize)); + p->Connect(wxEVT_MAXIMIZE, wxMaximizeEventHandler(FrameEventHandler::OnMaximize)); } else { - p->Disconnect(wxEVT_MAXIMIZE, wxMaximizeEventHandler(OnMaximize)); + p->Disconnect(wxEVT_MAXIMIZE, wxMaximizeEventHandler(FrameEventHandler::OnMaximize)); } } diff --git a/source/tools/atlas/wxJS/gui/control/htmlwin.cpp b/source/tools/atlas/wxJS/gui/control/htmlwin.cpp index a6f501168e..09a6372eef 100644 --- a/source/tools/atlas/wxJS/gui/control/htmlwin.cpp +++ b/source/tools/atlas/wxJS/gui/control/htmlwin.cpp @@ -811,12 +811,12 @@ void HtmlLinkEventHandler::ConnectLinkClicked(wxHtmlWindow *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_HTML_LINK_CLICKED, - wxHtmlLinkEventHandler(OnLinkClicked)); + wxHtmlLinkEventHandler(HtmlLinkEventHandler::OnLinkClicked)); } else { p->Disconnect(wxEVT_COMMAND_HTML_LINK_CLICKED, - wxHtmlLinkEventHandler(OnLinkClicked)); + wxHtmlLinkEventHandler(HtmlLinkEventHandler::OnLinkClicked)); } } diff --git a/source/tools/atlas/wxJS/gui/control/listbox.cpp b/source/tools/atlas/wxJS/gui/control/listbox.cpp index 4ef48480ec..b4e5258238 100644 --- a/source/tools/atlas/wxJS/gui/control/listbox.cpp +++ b/source/tools/atlas/wxJS/gui/control/listbox.cpp @@ -419,12 +419,12 @@ void ListBoxEventHandler::ConnectListBox(wxListBox *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_LISTBOX_SELECTED, - wxCommandEventHandler(OnListBox)); + wxCommandEventHandler(ListBoxEventHandler::OnListBox)); } else { p->Disconnect(wxEVT_COMMAND_LISTBOX_SELECTED, - wxCommandEventHandler(OnListBox)); + wxCommandEventHandler(ListBoxEventHandler::OnListBox)); } } @@ -433,12 +433,12 @@ void ListBoxEventHandler::ConnectDoubleClick(wxListBox *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, - wxCommandEventHandler(OnListBox)); + wxCommandEventHandler(ListBoxEventHandler::OnListBox)); } else { p->Disconnect(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, - wxCommandEventHandler(OnListBox)); + wxCommandEventHandler(ListBoxEventHandler::OnListBox)); } } diff --git a/source/tools/atlas/wxJS/gui/control/listctrl.cpp b/source/tools/atlas/wxJS/gui/control/listctrl.cpp index 71db5acbba..a57ecab3da 100644 --- a/source/tools/atlas/wxJS/gui/control/listctrl.cpp +++ b/source/tools/atlas/wxJS/gui/control/listctrl.cpp @@ -2820,12 +2820,12 @@ void ListCtrlEventHandler::ConnectBeginDrag(wxListCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_LIST_BEGIN_DRAG, - wxListEventHandler(OnBeginDrag)); + wxListEventHandler(ListCtrlEventHandler::OnBeginDrag)); } else { p->Disconnect(wxEVT_COMMAND_LIST_BEGIN_DRAG, - wxListEventHandler(OnBeginDrag)); + wxListEventHandler(ListCtrlEventHandler::OnBeginDrag)); } } @@ -2834,12 +2834,12 @@ void ListCtrlEventHandler::ConnectBeginRDrag(wxListCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_LIST_BEGIN_RDRAG, - wxListEventHandler(OnBeginRDrag)); + wxListEventHandler(ListCtrlEventHandler::OnBeginRDrag)); } else { p->Disconnect(wxEVT_COMMAND_LIST_BEGIN_RDRAG, - wxListEventHandler(OnBeginRDrag)); + wxListEventHandler(ListCtrlEventHandler::OnBeginRDrag)); } } @@ -2848,12 +2848,12 @@ void ListCtrlEventHandler::ConnectBeginLabelEdit(wxListCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, - wxListEventHandler(OnBeginLabelEdit)); + wxListEventHandler(ListCtrlEventHandler::OnBeginLabelEdit)); } else { p->Disconnect(wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT, - wxListEventHandler(OnBeginLabelEdit)); + wxListEventHandler(ListCtrlEventHandler::OnBeginLabelEdit)); } } @@ -2862,12 +2862,12 @@ void ListCtrlEventHandler::ConnectEndLabelEdit(wxListCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_LIST_END_LABEL_EDIT, - wxListEventHandler(OnEndLabelEdit)); + wxListEventHandler(ListCtrlEventHandler::OnEndLabelEdit)); } else { p->Disconnect(wxEVT_COMMAND_LIST_BEGIN_DRAG, - wxListEventHandler(OnEndLabelEdit)); + wxListEventHandler(ListCtrlEventHandler::OnEndLabelEdit)); } } @@ -2876,12 +2876,12 @@ void ListCtrlEventHandler::ConnectDeleteItem(wxListCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_LIST_DELETE_ITEM, - wxListEventHandler(OnDeleteItem)); + wxListEventHandler(ListCtrlEventHandler::OnDeleteItem)); } else { p->Disconnect(wxEVT_COMMAND_LIST_DELETE_ITEM, - wxListEventHandler(OnDeleteItem)); + wxListEventHandler(ListCtrlEventHandler::OnDeleteItem)); } } @@ -2890,12 +2890,12 @@ void ListCtrlEventHandler::ConnectDeleteAllItems(wxListCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, - wxListEventHandler(OnDeleteAllItems)); + wxListEventHandler(ListCtrlEventHandler::OnDeleteAllItems)); } else { p->Disconnect(wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS, - wxListEventHandler(OnDeleteAllItems)); + wxListEventHandler(ListCtrlEventHandler::OnDeleteAllItems)); } } @@ -2904,12 +2904,12 @@ void ListCtrlEventHandler::ConnectItemSelected(wxListCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_LIST_ITEM_SELECTED, - wxListEventHandler(OnItemSelected)); + wxListEventHandler(ListCtrlEventHandler::OnItemSelected)); } else { p->Disconnect(wxEVT_COMMAND_LIST_ITEM_SELECTED, - wxListEventHandler(OnItemSelected)); + wxListEventHandler(ListCtrlEventHandler::OnItemSelected)); } } @@ -2918,12 +2918,12 @@ void ListCtrlEventHandler::ConnectItemDeselected(wxListCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_LIST_ITEM_DESELECTED, - wxListEventHandler(OnItemDeselected)); + wxListEventHandler(ListCtrlEventHandler::OnItemDeselected)); } else { p->Disconnect(wxEVT_COMMAND_LIST_ITEM_DESELECTED, - wxListEventHandler(OnItemDeselected)); + wxListEventHandler(ListCtrlEventHandler::OnItemDeselected)); } } @@ -2932,12 +2932,12 @@ void ListCtrlEventHandler::ConnectItemActivated(wxListCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_LIST_ITEM_ACTIVATED, - wxListEventHandler(OnItemActivated)); + wxListEventHandler(ListCtrlEventHandler::OnItemActivated)); } else { p->Disconnect(wxEVT_COMMAND_LIST_ITEM_ACTIVATED, - wxListEventHandler(OnItemActivated)); + wxListEventHandler(ListCtrlEventHandler::OnItemActivated)); } } @@ -2946,12 +2946,12 @@ void ListCtrlEventHandler::ConnectItemFocused(wxListCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_LIST_ITEM_FOCUSED, - wxListEventHandler(OnItemFocused)); + wxListEventHandler(ListCtrlEventHandler::OnItemFocused)); } else { p->Disconnect(wxEVT_COMMAND_LIST_ITEM_FOCUSED, - wxListEventHandler(OnItemFocused)); + wxListEventHandler(ListCtrlEventHandler::OnItemFocused)); } } @@ -2960,12 +2960,12 @@ void ListCtrlEventHandler::ConnectItemRightClick(wxListCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, - wxListEventHandler(OnItemRightClick)); + wxListEventHandler(ListCtrlEventHandler::OnItemRightClick)); } else { p->Disconnect(wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK, - wxListEventHandler(OnItemRightClick)); + wxListEventHandler(ListCtrlEventHandler::OnItemRightClick)); } } @@ -2974,12 +2974,12 @@ void ListCtrlEventHandler::ConnectListKeyDown(wxListCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_LIST_KEY_DOWN, - wxListEventHandler(OnListKeyDown)); + wxListEventHandler(ListCtrlEventHandler::OnListKeyDown)); } else { p->Disconnect(wxEVT_COMMAND_LIST_KEY_DOWN, - wxListEventHandler(OnListKeyDown)); + wxListEventHandler(ListCtrlEventHandler::OnListKeyDown)); } } @@ -2988,12 +2988,12 @@ void ListCtrlEventHandler::ConnectInsertItem(wxListCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_LIST_INSERT_ITEM, - wxListEventHandler(OnInsertItem)); + wxListEventHandler(ListCtrlEventHandler::OnInsertItem)); } else { p->Disconnect(wxEVT_COMMAND_LIST_INSERT_ITEM, - wxListEventHandler(OnInsertItem)); + wxListEventHandler(ListCtrlEventHandler::OnInsertItem)); } } @@ -3002,12 +3002,12 @@ void ListCtrlEventHandler::ConnectColClick(wxListCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_LIST_COL_CLICK, - wxListEventHandler(OnColClick)); + wxListEventHandler(ListCtrlEventHandler::OnColClick)); } else { p->Disconnect(wxEVT_COMMAND_LIST_COL_CLICK, - wxListEventHandler(OnColClick)); + wxListEventHandler(ListCtrlEventHandler::OnColClick)); } } @@ -3016,12 +3016,12 @@ void ListCtrlEventHandler::ConnectColRightClick(wxListCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_LIST_COL_RIGHT_CLICK, - wxListEventHandler(OnColRightClick)); + wxListEventHandler(ListCtrlEventHandler::OnColRightClick)); } else { p->Disconnect(wxEVT_COMMAND_LIST_COL_RIGHT_CLICK, - wxListEventHandler(OnColRightClick)); + wxListEventHandler(ListCtrlEventHandler::OnColRightClick)); } } @@ -3030,12 +3030,12 @@ void ListCtrlEventHandler::ConnectColBeginDrag(wxListCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, - wxListEventHandler(OnColBeginDrag)); + wxListEventHandler(ListCtrlEventHandler::OnColBeginDrag)); } else { p->Disconnect(wxEVT_COMMAND_LIST_COL_BEGIN_DRAG, - wxListEventHandler(OnColBeginDrag)); + wxListEventHandler(ListCtrlEventHandler::OnColBeginDrag)); } } @@ -3044,12 +3044,12 @@ void ListCtrlEventHandler::ConnectColDragging(wxListCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_LIST_COL_DRAGGING, - wxListEventHandler(OnColDragging)); + wxListEventHandler(ListCtrlEventHandler::OnColDragging)); } else { p->Disconnect(wxEVT_COMMAND_LIST_COL_DRAGGING, - wxListEventHandler(OnColDragging)); + wxListEventHandler(ListCtrlEventHandler::OnColDragging)); } } @@ -3058,12 +3058,12 @@ void ListCtrlEventHandler::ConnectColEndDrag(wxListCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_LIST_COL_END_DRAG, - wxListEventHandler(OnColEndDrag)); + wxListEventHandler(ListCtrlEventHandler::OnColEndDrag)); } else { p->Disconnect(wxEVT_COMMAND_LIST_COL_END_DRAG, - wxListEventHandler(OnColEndDrag)); + wxListEventHandler(ListCtrlEventHandler::OnColEndDrag)); } } @@ -3072,12 +3072,12 @@ void ListCtrlEventHandler::ConnectCacheHint(wxListCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_LIST_CACHE_HINT, - wxListEventHandler(OnCacheHint)); + wxListEventHandler(ListCtrlEventHandler::OnCacheHint)); } else { p->Disconnect(wxEVT_COMMAND_LIST_CACHE_HINT, - wxListEventHandler(OnCacheHint)); + wxListEventHandler(ListCtrlEventHandler::OnCacheHint)); } } diff --git a/source/tools/atlas/wxJS/gui/control/notebook.cpp b/source/tools/atlas/wxJS/gui/control/notebook.cpp index 1f53c463d1..5012a690c9 100644 --- a/source/tools/atlas/wxJS/gui/control/notebook.cpp +++ b/source/tools/atlas/wxJS/gui/control/notebook.cpp @@ -227,12 +227,12 @@ void NotebookEventHandler::ConnectPageChanged(wxNotebook *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, - wxNotebookEventHandler(OnPageChanged)); + wxNotebookEventHandler(NotebookEventHandler::OnPageChanged)); } else { p->Disconnect(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, - wxNotebookEventHandler(OnPageChanged)); + wxNotebookEventHandler(NotebookEventHandler::OnPageChanged)); } } @@ -241,12 +241,12 @@ void NotebookEventHandler::ConnectPageChanging(wxNotebook *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, - wxNotebookEventHandler(OnPageChanging)); + wxNotebookEventHandler(NotebookEventHandler::OnPageChanging)); } else { p->Disconnect(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, - wxNotebookEventHandler(OnPageChanging)); + wxNotebookEventHandler(NotebookEventHandler::OnPageChanging)); } } diff --git a/source/tools/atlas/wxJS/gui/control/panel.cpp b/source/tools/atlas/wxJS/gui/control/panel.cpp index 0fb64035d1..828e7083ee 100644 --- a/source/tools/atlas/wxJS/gui/control/panel.cpp +++ b/source/tools/atlas/wxJS/gui/control/panel.cpp @@ -323,12 +323,12 @@ void PanelEventHandler::ConnectSysColourChanged(wxPanel *p, bool connect) if ( connect ) { p->Connect(wxEVT_SYS_COLOUR_CHANGED, - wxSysColourChangedEventHandler(OnSysColourChanged)); + wxSysColourChangedEventHandler(PanelEventHandler::OnSysColourChanged)); } else { p->Disconnect(wxEVT_SYS_COLOUR_CHANGED, - wxSysColourChangedEventHandler(OnSysColourChanged)); + wxSysColourChangedEventHandler(PanelEventHandler::OnSysColourChanged)); } } diff --git a/source/tools/atlas/wxJS/gui/control/radiobox.cpp b/source/tools/atlas/wxJS/gui/control/radiobox.cpp index cb2d8b7c4d..767e0bfd29 100644 --- a/source/tools/atlas/wxJS/gui/control/radiobox.cpp +++ b/source/tools/atlas/wxJS/gui/control/radiobox.cpp @@ -553,12 +553,12 @@ void RadioBoxEventHandler::ConnectRadioBox(wxRadioBox *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_RADIOBOX_SELECTED, - wxCommandEventHandler(OnRadioBox)); + wxCommandEventHandler(RadioBoxEventHandler::OnRadioBox)); } else { p->Disconnect(wxEVT_COMMAND_RADIOBOX_SELECTED, - wxCommandEventHandler(OnRadioBox)); + wxCommandEventHandler(RadioBoxEventHandler::OnRadioBox)); } } diff --git a/source/tools/atlas/wxJS/gui/control/radiobtn.cpp b/source/tools/atlas/wxJS/gui/control/radiobtn.cpp index 81318621ec..cf892e700e 100644 --- a/source/tools/atlas/wxJS/gui/control/radiobtn.cpp +++ b/source/tools/atlas/wxJS/gui/control/radiobtn.cpp @@ -299,12 +299,12 @@ void RadioButtonEventHandler::ConnectRadioButton(wxRadioButton *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_RADIOBUTTON_SELECTED, - wxCommandEventHandler(OnRadioButton)); + wxCommandEventHandler(RadioButtonEventHandler::OnRadioButton)); } else { p->Disconnect(wxEVT_COMMAND_RADIOBUTTON_SELECTED, - wxCommandEventHandler(OnRadioButton)); + wxCommandEventHandler(RadioButtonEventHandler::OnRadioButton)); } } diff --git a/source/tools/atlas/wxJS/gui/control/slider.cpp b/source/tools/atlas/wxJS/gui/control/slider.cpp index b103c62031..336cf3e115 100644 --- a/source/tools/atlas/wxJS/gui/control/slider.cpp +++ b/source/tools/atlas/wxJS/gui/control/slider.cpp @@ -754,12 +754,12 @@ void SliderEventHandler::ConnectScrollChanged(wxSlider *p, bool connect) if ( connect ) { p->Connect(wxEVT_SCROLL_CHANGED, - wxScrollEventHandler(OnScrollChanged)); + wxScrollEventHandler(SliderEventHandler::OnScrollChanged)); } else { p->Disconnect(wxEVT_SCROLL_CHANGED, - wxScrollEventHandler(OnScrollChanged)); + wxScrollEventHandler(SliderEventHandler::OnScrollChanged)); } } @@ -768,12 +768,12 @@ void SliderEventHandler::ConnectScrollTop(wxSlider *p, bool connect) if ( connect ) { p->Connect(wxEVT_SCROLL_TOP, - wxScrollEventHandler(OnScrollTop)); + wxScrollEventHandler(SliderEventHandler::OnScrollTop)); } else { p->Disconnect(wxEVT_SCROLL_TOP, - wxScrollEventHandler(OnScrollTop)); + wxScrollEventHandler(SliderEventHandler::OnScrollTop)); } } @@ -782,12 +782,12 @@ void SliderEventHandler::ConnectScrollBottom(wxSlider *p, bool connect) if ( connect ) { p->Connect(wxEVT_SCROLL_BOTTOM, - wxScrollEventHandler(OnScrollBottom)); + wxScrollEventHandler(SliderEventHandler::OnScrollBottom)); } else { p->Disconnect(wxEVT_SCROLL_BOTTOM, - wxScrollEventHandler(OnScrollBottom)); + wxScrollEventHandler(SliderEventHandler::OnScrollBottom)); } } @@ -796,12 +796,12 @@ void SliderEventHandler::ConnectScrollLineUp(wxSlider *p, bool connect) if ( connect ) { p->Connect(wxEVT_SCROLL_LINEUP, - wxScrollEventHandler(OnScrollTop)); + wxScrollEventHandler(SliderEventHandler::OnScrollTop)); } else { p->Disconnect(wxEVT_SCROLL_LINEUP, - wxScrollEventHandler(OnScrollTop)); + wxScrollEventHandler(SliderEventHandler::OnScrollTop)); } } @@ -810,12 +810,12 @@ void SliderEventHandler::ConnectScrollLineDown(wxSlider *p, bool connect) if ( connect ) { p->Connect(wxEVT_SCROLL_LINEDOWN, - wxScrollEventHandler(OnScrollLineDown)); + wxScrollEventHandler(SliderEventHandler::OnScrollLineDown)); } else { p->Disconnect(wxEVT_SCROLL_LINEDOWN, - wxScrollEventHandler(OnScrollLineDown)); + wxScrollEventHandler(SliderEventHandler::OnScrollLineDown)); } } @@ -824,12 +824,12 @@ void SliderEventHandler::ConnectScrollPageUp(wxSlider *p, bool connect) if ( connect ) { p->Connect(wxEVT_SCROLL_PAGEUP, - wxScrollEventHandler(OnScrollPageUp)); + wxScrollEventHandler(SliderEventHandler::OnScrollPageUp)); } else { p->Disconnect(wxEVT_SCROLL_PAGEUP, - wxScrollEventHandler(OnScrollPageUp)); + wxScrollEventHandler(SliderEventHandler::OnScrollPageUp)); } } @@ -838,12 +838,12 @@ void SliderEventHandler::ConnectScrollPageDown(wxSlider *p, bool connect) if ( connect ) { p->Connect(wxEVT_SCROLL_PAGEDOWN, - wxScrollEventHandler(OnScrollPageDown)); + wxScrollEventHandler(SliderEventHandler::OnScrollPageDown)); } else { p->Disconnect(wxEVT_SCROLL_PAGEDOWN, - wxScrollEventHandler(OnScrollPageDown)); + wxScrollEventHandler(SliderEventHandler::OnScrollPageDown)); } } @@ -852,12 +852,12 @@ void SliderEventHandler::ConnectScrollThumbTrack(wxSlider *p, bool connect) if ( connect ) { p->Connect(wxEVT_SCROLL_THUMBTRACK, - wxScrollEventHandler(OnScrollThumbTrack)); + wxScrollEventHandler(SliderEventHandler::OnScrollThumbTrack)); } else { p->Disconnect(wxEVT_SCROLL_THUMBTRACK, - wxScrollEventHandler(OnScrollThumbTrack)); + wxScrollEventHandler(SliderEventHandler::OnScrollThumbTrack)); } } @@ -866,12 +866,12 @@ void SliderEventHandler::ConnectScrollThumbRelease(wxSlider *p, bool connect) if ( connect ) { p->Connect(wxEVT_SCROLL_THUMBRELEASE, - wxScrollEventHandler(OnScrollThumbRelease)); + wxScrollEventHandler(SliderEventHandler::OnScrollThumbRelease)); } else { p->Disconnect(wxEVT_SCROLL_THUMBRELEASE, - wxScrollEventHandler(OnScrollThumbRelease)); + wxScrollEventHandler(SliderEventHandler::OnScrollThumbRelease)); } } diff --git a/source/tools/atlas/wxJS/gui/control/spinbtn.cpp b/source/tools/atlas/wxJS/gui/control/spinbtn.cpp index d5bd3078c2..0dbefbdc28 100644 --- a/source/tools/atlas/wxJS/gui/control/spinbtn.cpp +++ b/source/tools/atlas/wxJS/gui/control/spinbtn.cpp @@ -352,12 +352,12 @@ void SpinButtonEventHandler::ConnectSpin(wxSpinButton *p, bool connect) if ( connect ) { p->Connect(wxEVT_SCROLL_THUMBTRACK, - wxSpinEventHandler(OnSpin)); + wxSpinEventHandler(SpinButtonEventHandler::OnSpin)); } else { p->Disconnect(wxEVT_SCROLL_THUMBTRACK, - wxSpinEventHandler(OnSpin)); + wxSpinEventHandler(SpinButtonEventHandler::OnSpin)); } } @@ -366,12 +366,12 @@ void SpinButtonEventHandler::ConnectSpinUp(wxSpinButton *p, bool connect) if ( connect ) { p->Connect(wxEVT_SCROLL_LINEUP, - wxSpinEventHandler(OnSpinUp)); + wxSpinEventHandler(SpinButtonEventHandler::OnSpinUp)); } else { p->Disconnect(wxEVT_SCROLL_LINEUP, - wxSpinEventHandler(OnSpinUp)); + wxSpinEventHandler(SpinButtonEventHandler::OnSpinUp)); } } @@ -380,12 +380,12 @@ void SpinButtonEventHandler::ConnectSpinDown(wxSpinButton *p, bool connect) if ( connect ) { p->Connect(wxEVT_SCROLL_LINEDOWN, - wxSpinEventHandler(OnSpinDown)); + wxSpinEventHandler(SpinButtonEventHandler::OnSpinDown)); } else { p->Disconnect(wxEVT_SCROLL_LINEDOWN, - wxSpinEventHandler(OnSpinDown)); + wxSpinEventHandler(SpinButtonEventHandler::OnSpinDown)); } } diff --git a/source/tools/atlas/wxJS/gui/control/spinctrl.cpp b/source/tools/atlas/wxJS/gui/control/spinctrl.cpp index 0cc442737b..e77d4a10fe 100644 --- a/source/tools/atlas/wxJS/gui/control/spinctrl.cpp +++ b/source/tools/atlas/wxJS/gui/control/spinctrl.cpp @@ -449,12 +449,12 @@ void SpinCtrlEventHandler::ConnectText(wxSpinCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_TEXT_UPDATED, - wxCommandEventHandler(OnText)); + wxCommandEventHandler(SpinCtrlEventHandler::OnText)); } else { p->Disconnect(wxEVT_COMMAND_TEXT_UPDATED, - wxCommandEventHandler(OnText)); + wxCommandEventHandler(SpinCtrlEventHandler::OnText)); } } @@ -463,12 +463,12 @@ void SpinCtrlEventHandler::ConnectSpinCtrl(wxSpinCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_SPINCTRL_UPDATED, - wxSpinEventHandler(OnSpinCtrl)); + wxSpinEventHandler(SpinCtrlEventHandler::OnSpinCtrl)); } else { p->Disconnect(wxEVT_COMMAND_SPINCTRL_UPDATED, - wxSpinEventHandler(OnSpinCtrl)); + wxSpinEventHandler(SpinCtrlEventHandler::OnSpinCtrl)); } } @@ -477,12 +477,12 @@ void SpinCtrlEventHandler::ConnectSpin(wxSpinCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_SCROLL_THUMBTRACK, - wxSpinEventHandler(OnSpin)); + wxSpinEventHandler(SpinCtrlEventHandler::OnSpin)); } else { p->Disconnect(wxEVT_SCROLL_THUMBTRACK, - wxSpinEventHandler(OnSpin)); + wxSpinEventHandler(SpinCtrlEventHandler::OnSpin)); } } @@ -491,12 +491,12 @@ void SpinCtrlEventHandler::ConnectSpinUp(wxSpinCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_SCROLL_LINEUP, - wxSpinEventHandler(OnSpinUp)); + wxSpinEventHandler(SpinCtrlEventHandler::OnSpinUp)); } else { p->Disconnect(wxEVT_SCROLL_LINEUP, - wxSpinEventHandler(OnSpinUp)); + wxSpinEventHandler(SpinCtrlEventHandler::OnSpinUp)); } } @@ -505,12 +505,12 @@ void SpinCtrlEventHandler::ConnectSpinDown(wxSpinCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_SCROLL_LINEDOWN, - wxSpinEventHandler(OnSpinDown)); + wxSpinEventHandler(SpinCtrlEventHandler::OnSpinDown)); } else { p->Disconnect(wxEVT_SCROLL_LINEDOWN, - wxSpinEventHandler(OnSpinDown)); + wxSpinEventHandler(SpinCtrlEventHandler::OnSpinDown)); } } diff --git a/source/tools/atlas/wxJS/gui/control/splitwin.cpp b/source/tools/atlas/wxJS/gui/control/splitwin.cpp index af007118e6..73ae90dc17 100644 --- a/source/tools/atlas/wxJS/gui/control/splitwin.cpp +++ b/source/tools/atlas/wxJS/gui/control/splitwin.cpp @@ -702,12 +702,12 @@ void SplitterEventHandler::ConnectSashPosChanging(wxSplitterWindow *p, if ( connect ) { p->Connect(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, - wxSplitterEventHandler(OnSashPosChanging)); + wxSplitterEventHandler(SplitterEventHandler::OnSashPosChanging)); } else { p->Disconnect(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING, - wxSplitterEventHandler(OnSashPosChanging)); + wxSplitterEventHandler(SplitterEventHandler::OnSashPosChanging)); } } @@ -717,12 +717,12 @@ void SplitterEventHandler::ConnectSashPosChanged(wxSplitterWindow *p, if ( connect ) { p->Connect(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, - wxSplitterEventHandler(OnSashPosChanged)); + wxSplitterEventHandler(SplitterEventHandler::OnSashPosChanged)); } else { p->Disconnect(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, - wxSplitterEventHandler(OnSashPosChanged)); + wxSplitterEventHandler(SplitterEventHandler::OnSashPosChanged)); } } @@ -732,12 +732,12 @@ void SplitterEventHandler::ConnectUnsplit(wxSplitterWindow *p, if ( connect ) { p->Connect(wxEVT_COMMAND_SPLITTER_UNSPLIT, - wxSplitterEventHandler(OnUnsplit)); + wxSplitterEventHandler(SplitterEventHandler::OnUnsplit)); } else { p->Disconnect(wxEVT_COMMAND_SPLITTER_UNSPLIT, - wxSplitterEventHandler(OnUnsplit)); + wxSplitterEventHandler(SplitterEventHandler::OnUnsplit)); } } @@ -747,12 +747,12 @@ void SplitterEventHandler::ConnectDClick(wxSplitterWindow *p, if ( connect ) { p->Connect(wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, - wxSplitterEventHandler(OnDClick)); + wxSplitterEventHandler(SplitterEventHandler::OnDClick)); } else { p->Disconnect(wxEVT_COMMAND_SPLITTER_DOUBLECLICKED, - wxSplitterEventHandler(OnDClick)); + wxSplitterEventHandler(SplitterEventHandler::OnDClick)); } } diff --git a/source/tools/atlas/wxJS/gui/control/textctrl.cpp b/source/tools/atlas/wxJS/gui/control/textctrl.cpp index 7ef83c5a9c..4848f8e9a4 100644 --- a/source/tools/atlas/wxJS/gui/control/textctrl.cpp +++ b/source/tools/atlas/wxJS/gui/control/textctrl.cpp @@ -797,12 +797,12 @@ void TextCtrlEventHandler::ConnectText(wxTextCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_TEXT_UPDATED, - wxCommandEventHandler(OnText)); + wxCommandEventHandler(TextCtrlEventHandler::OnText)); } else { p->Disconnect(wxEVT_COMMAND_TEXT_UPDATED, - wxCommandEventHandler(OnText)); + wxCommandEventHandler(TextCtrlEventHandler::OnText)); } } @@ -811,12 +811,12 @@ void TextCtrlEventHandler::ConnectTextEnter(wxTextCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_TEXT_ENTER, - wxCommandEventHandler(OnTextEnter)); + wxCommandEventHandler(TextCtrlEventHandler::OnTextEnter)); } else { p->Disconnect(wxEVT_COMMAND_TEXT_ENTER, - wxCommandEventHandler(OnTextEnter)); + wxCommandEventHandler(TextCtrlEventHandler::OnTextEnter)); } } @@ -825,12 +825,12 @@ void TextCtrlEventHandler::ConnectTextURL(wxTextCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_TEXT_URL, - wxCommandEventHandler(OnTextURL)); + wxCommandEventHandler(TextCtrlEventHandler::OnTextURL)); } else { p->Disconnect(wxEVT_COMMAND_TEXT_URL, - wxCommandEventHandler(OnTextURL)); + wxCommandEventHandler(TextCtrlEventHandler::OnTextURL)); } } @@ -839,12 +839,12 @@ void TextCtrlEventHandler::ConnectTextMaxLen(wxTextCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_TEXT_MAXLEN, - wxCommandEventHandler(OnTextMaxLen)); + wxCommandEventHandler(TextCtrlEventHandler::OnTextMaxLen)); } else { p->Disconnect(wxEVT_COMMAND_TEXT_MAXLEN, - wxCommandEventHandler(OnTextMaxLen)); + wxCommandEventHandler(TextCtrlEventHandler::OnTextMaxLen)); } } diff --git a/source/tools/atlas/wxJS/gui/control/treectrl.cpp b/source/tools/atlas/wxJS/gui/control/treectrl.cpp index a4eaca9df2..0433c53480 100644 --- a/source/tools/atlas/wxJS/gui/control/treectrl.cpp +++ b/source/tools/atlas/wxJS/gui/control/treectrl.cpp @@ -2407,12 +2407,12 @@ void TreeCtrlEventHandler::ConnectBeginDrag(wxTreeCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_TREE_BEGIN_DRAG, - wxTreeEventHandler(onBeginDrag)); + wxTreeEventHandler(TreeCtrlEventHandler::onBeginDrag)); } else { p->Disconnect(wxEVT_COMMAND_TREE_BEGIN_DRAG, - wxTreeEventHandler(onBeginDrag)); + wxTreeEventHandler(TreeCtrlEventHandler::onBeginDrag)); } } @@ -2421,12 +2421,12 @@ void TreeCtrlEventHandler::ConnectBeginRDrag(wxTreeCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_TREE_BEGIN_RDRAG, - wxTreeEventHandler(onBeginRDrag)); + wxTreeEventHandler(TreeCtrlEventHandler::onBeginRDrag)); } else { p->Disconnect(wxEVT_COMMAND_TREE_BEGIN_RDRAG, - wxTreeEventHandler(onBeginRDrag)); + wxTreeEventHandler(TreeCtrlEventHandler::onBeginRDrag)); } } @@ -2435,12 +2435,12 @@ void TreeCtrlEventHandler::ConnectBeginLabelEdit(wxTreeCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, - wxTreeEventHandler(onBeginLabelEdit)); + wxTreeEventHandler(TreeCtrlEventHandler::onBeginLabelEdit)); } else { p->Disconnect(wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, - wxTreeEventHandler(onBeginLabelEdit)); + wxTreeEventHandler(TreeCtrlEventHandler::onBeginLabelEdit)); } } @@ -2449,12 +2449,12 @@ void TreeCtrlEventHandler::ConnectEndLabelEdit(wxTreeCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_TREE_END_LABEL_EDIT, - wxTreeEventHandler(onEndLabelEdit)); + wxTreeEventHandler(TreeCtrlEventHandler::onEndLabelEdit)); } else { p->Disconnect(wxEVT_COMMAND_TREE_END_LABEL_EDIT, - wxTreeEventHandler(onEndLabelEdit)); + wxTreeEventHandler(TreeCtrlEventHandler::onEndLabelEdit)); } } @@ -2463,12 +2463,12 @@ void TreeCtrlEventHandler::ConnectDeleteItem(wxTreeCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_TREE_DELETE_ITEM, - wxTreeEventHandler(onDeleteItem)); + wxTreeEventHandler(TreeCtrlEventHandler::onDeleteItem)); } else { p->Disconnect(wxEVT_COMMAND_TREE_DELETE_ITEM, - wxTreeEventHandler(onDeleteItem)); + wxTreeEventHandler(TreeCtrlEventHandler::onDeleteItem)); } } @@ -2477,12 +2477,12 @@ void TreeCtrlEventHandler::ConnectGetInfo(wxTreeCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_TREE_GET_INFO, - wxTreeEventHandler(onGetInfo)); + wxTreeEventHandler(TreeCtrlEventHandler::onGetInfo)); } else { p->Disconnect(wxEVT_COMMAND_TREE_GET_INFO, - wxTreeEventHandler(onGetInfo)); + wxTreeEventHandler(TreeCtrlEventHandler::onGetInfo)); } } @@ -2491,12 +2491,12 @@ void TreeCtrlEventHandler::ConnectSetInfo(wxTreeCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_TREE_SET_INFO, - wxTreeEventHandler(onSetInfo)); + wxTreeEventHandler(TreeCtrlEventHandler::onSetInfo)); } else { p->Disconnect(wxEVT_COMMAND_TREE_SET_INFO, - wxTreeEventHandler(onSetInfo)); + wxTreeEventHandler(TreeCtrlEventHandler::onSetInfo)); } } @@ -2505,12 +2505,12 @@ void TreeCtrlEventHandler::ConnectItemExpanded(wxTreeCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_TREE_ITEM_EXPANDED, - wxTreeEventHandler(onItemExpanded)); + wxTreeEventHandler(TreeCtrlEventHandler::onItemExpanded)); } else { p->Disconnect(wxEVT_COMMAND_TREE_ITEM_EXPANDED, - wxTreeEventHandler(onItemExpanded)); + wxTreeEventHandler(TreeCtrlEventHandler::onItemExpanded)); } } @@ -2519,12 +2519,12 @@ void TreeCtrlEventHandler::ConnectItemExpanding(wxTreeCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_TREE_ITEM_EXPANDING, - wxTreeEventHandler(onItemExpanding)); + wxTreeEventHandler(TreeCtrlEventHandler::onItemExpanding)); } else { p->Disconnect(wxEVT_COMMAND_TREE_ITEM_EXPANDING, - wxTreeEventHandler(onItemExpanding)); + wxTreeEventHandler(TreeCtrlEventHandler::onItemExpanding)); } } @@ -2533,12 +2533,12 @@ void TreeCtrlEventHandler::ConnectItemCollapsed(wxTreeCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_TREE_ITEM_COLLAPSED, - wxTreeEventHandler(onItemCollapsed)); + wxTreeEventHandler(TreeCtrlEventHandler::onItemCollapsed)); } else { p->Disconnect(wxEVT_COMMAND_TREE_ITEM_COLLAPSED, - wxTreeEventHandler(onItemCollapsed)); + wxTreeEventHandler(TreeCtrlEventHandler::onItemCollapsed)); } } @@ -2547,12 +2547,12 @@ void TreeCtrlEventHandler::ConnectItemCollapsing(wxTreeCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_TREE_ITEM_COLLAPSING, - wxTreeEventHandler(onItemCollapsing)); + wxTreeEventHandler(TreeCtrlEventHandler::onItemCollapsing)); } else { p->Disconnect(wxEVT_COMMAND_TREE_ITEM_COLLAPSING, - wxTreeEventHandler(onItemCollapsing)); + wxTreeEventHandler(TreeCtrlEventHandler::onItemCollapsing)); } } @@ -2561,12 +2561,12 @@ void TreeCtrlEventHandler::ConnectSelChanged(wxTreeCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_TREE_SEL_CHANGED, - wxTreeEventHandler(onSelChanged)); + wxTreeEventHandler(TreeCtrlEventHandler::onSelChanged)); } else { p->Disconnect(wxEVT_COMMAND_TREE_SEL_CHANGED, - wxTreeEventHandler(onSelChanged)); + wxTreeEventHandler(TreeCtrlEventHandler::onSelChanged)); } } @@ -2575,12 +2575,12 @@ void TreeCtrlEventHandler::ConnectSelChanging(wxTreeCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_TREE_SEL_CHANGING, - wxTreeEventHandler(onSelChanging)); + wxTreeEventHandler(TreeCtrlEventHandler::onSelChanging)); } else { p->Disconnect(wxEVT_COMMAND_TREE_SEL_CHANGING, - wxTreeEventHandler(onSelChanging)); + wxTreeEventHandler(TreeCtrlEventHandler::onSelChanging)); } } @@ -2589,12 +2589,12 @@ void TreeCtrlEventHandler::ConnectKeyDown(wxTreeCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_TREE_KEY_DOWN, - wxTreeEventHandler(onKeyDown)); + wxTreeEventHandler(TreeCtrlEventHandler::onKeyDown)); } else { p->Disconnect(wxEVT_COMMAND_TREE_KEY_DOWN, - wxTreeEventHandler(onKeyDown)); + wxTreeEventHandler(TreeCtrlEventHandler::onKeyDown)); } } @@ -2603,12 +2603,12 @@ void TreeCtrlEventHandler::ConnectItemActivated(wxTreeCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_TREE_ITEM_ACTIVATED, - wxTreeEventHandler(onItemActivated)); + wxTreeEventHandler(TreeCtrlEventHandler::onItemActivated)); } else { p->Disconnect(wxEVT_COMMAND_TREE_ITEM_ACTIVATED, - wxTreeEventHandler(onItemActivated)); + wxTreeEventHandler(TreeCtrlEventHandler::onItemActivated)); }} void TreeCtrlEventHandler::ConnectItemRightClick(wxTreeCtrl *p, bool connect) @@ -2616,12 +2616,12 @@ void TreeCtrlEventHandler::ConnectItemRightClick(wxTreeCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, - wxTreeEventHandler(onItemRightClick)); + wxTreeEventHandler(TreeCtrlEventHandler::onItemRightClick)); } else { p->Disconnect(wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, - wxTreeEventHandler(onItemRightClick)); + wxTreeEventHandler(TreeCtrlEventHandler::onItemRightClick)); } } @@ -2630,12 +2630,12 @@ void TreeCtrlEventHandler::ConnectItemMiddleClick(wxTreeCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK, - wxTreeEventHandler(onItemMiddleClick)); + wxTreeEventHandler(TreeCtrlEventHandler::onItemMiddleClick)); } else { p->Disconnect(wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK, - wxTreeEventHandler(onItemMiddleClick)); + wxTreeEventHandler(TreeCtrlEventHandler::onItemMiddleClick)); } } @@ -2644,12 +2644,12 @@ void TreeCtrlEventHandler::ConnectEndDrag(wxTreeCtrl *p, bool connect) if ( connect ) { p->Connect(wxEVT_COMMAND_TREE_END_DRAG, - wxTreeEventHandler(onEndDrag)); + wxTreeEventHandler(TreeCtrlEventHandler::onEndDrag)); } else { p->Disconnect(wxEVT_COMMAND_TREE_END_DRAG, - wxTreeEventHandler(onEndDrag)); + wxTreeEventHandler(TreeCtrlEventHandler::onEndDrag)); } } diff --git a/source/tools/atlas/wxJS/gui/control/window.cpp b/source/tools/atlas/wxJS/gui/control/window.cpp index 12cf98b598..1189d5e9ff 100644 --- a/source/tools/atlas/wxJS/gui/control/window.cpp +++ b/source/tools/atlas/wxJS/gui/control/window.cpp @@ -2137,55 +2137,55 @@ void WindowEventHandler::ConnectChar(wxWindow *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_CHAR, wxCharEventHandler(OnChar)); + p->Connect(wxEVT_CHAR, wxCharEventHandler(WindowEventHandler::OnChar)); } else { - p->Disconnect(wxEVT_CHAR, wxCharEventHandler(OnChar)); + p->Disconnect(wxEVT_CHAR, wxCharEventHandler(WindowEventHandler::OnChar)); } } void WindowEventHandler::ConnectKeyDown(wxWindow *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(OnKeyDown)); + p->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(WindowEventHandler::OnKeyDown)); } else { - p->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(OnKeyDown)); + p->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(WindowEventHandler::OnKeyDown)); } } void WindowEventHandler::ConnectKeyUp(wxWindow *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_KEY_UP, wxKeyEventHandler(OnKeyUp)); + p->Connect(wxEVT_KEY_UP, wxKeyEventHandler(WindowEventHandler::OnKeyUp)); } else { - p->Disconnect(wxEVT_KEY_UP, wxKeyEventHandler(OnKeyUp)); + p->Disconnect(wxEVT_KEY_UP, wxKeyEventHandler(WindowEventHandler::OnKeyUp)); } } void WindowEventHandler::ConnectCharHook(wxWindow *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_CHAR_HOOK, wxCharEventHandler(OnCharHook)); + p->Connect(wxEVT_CHAR_HOOK, wxCharEventHandler(WindowEventHandler::OnCharHook)); } else { - p->Disconnect(wxEVT_CHAR_HOOK, wxCharEventHandler(OnCharHook)); + p->Disconnect(wxEVT_CHAR_HOOK, wxCharEventHandler(WindowEventHandler::OnCharHook)); } } void WindowEventHandler::ConnectActivate(wxWindow *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_ACTIVATE, wxActivateEventHandler(OnActivate)); + p->Connect(wxEVT_ACTIVATE, wxActivateEventHandler(WindowEventHandler::OnActivate)); } else { - p->Disconnect(wxEVT_ACTIVATE, wxActivateEventHandler(OnActivate)); + p->Disconnect(wxEVT_ACTIVATE, wxActivateEventHandler(WindowEventHandler::OnActivate)); } } @@ -2193,11 +2193,11 @@ void WindowEventHandler::ConnectSetFocus(wxWindow *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_SET_FOCUS, wxFocusEventHandler(OnSetFocus)); + p->Connect(wxEVT_SET_FOCUS, wxFocusEventHandler(WindowEventHandler::OnSetFocus)); } else { - p->Disconnect(wxEVT_SET_FOCUS, wxFocusEventHandler(OnSetFocus)); + p->Disconnect(wxEVT_SET_FOCUS, wxFocusEventHandler(WindowEventHandler::OnSetFocus)); } } @@ -2205,132 +2205,132 @@ void WindowEventHandler::ConnectKillFocus(wxWindow *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_KILL_FOCUS, wxFocusEventHandler(OnKillFocus)); + p->Connect(wxEVT_KILL_FOCUS, wxFocusEventHandler(WindowEventHandler::OnKillFocus)); } else { - p->Disconnect(wxEVT_KILL_FOCUS, wxFocusEventHandler(OnKillFocus)); + p->Disconnect(wxEVT_KILL_FOCUS, wxFocusEventHandler(WindowEventHandler::OnKillFocus)); } } void WindowEventHandler::ConnectMove(wxWindow *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_MOVE, wxMoveEventHandler(OnMove)); + p->Connect(wxEVT_MOVE, wxMoveEventHandler(WindowEventHandler::OnMove)); } else { - p->Disconnect(wxEVT_MOVE, wxMoveEventHandler(OnMove)); + p->Disconnect(wxEVT_MOVE, wxMoveEventHandler(WindowEventHandler::OnMove)); } } void WindowEventHandler::ConnectSize(wxWindow *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_SIZE, wxSizeEventHandler(OnSize)); + p->Connect(wxEVT_SIZE, wxSizeEventHandler(WindowEventHandler::OnSize)); } else { - p->Disconnect(wxEVT_SIZE, wxSizeEventHandler(OnSize)); + p->Disconnect(wxEVT_SIZE, wxSizeEventHandler(WindowEventHandler::OnSize)); } } void WindowEventHandler::ConnectScrollTop(wxWindow *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_SCROLL_TOP, wxScrollWinEventHandler(OnScrollTop)); + p->Connect(wxEVT_SCROLL_TOP, wxScrollWinEventHandler(WindowEventHandler::OnScrollTop)); } else { - p->Disconnect(wxEVT_SCROLL_TOP, wxScrollWinEventHandler(OnScrollTop)); + p->Disconnect(wxEVT_SCROLL_TOP, wxScrollWinEventHandler(WindowEventHandler::OnScrollTop)); } } void WindowEventHandler::ConnectScrollBottom(wxWindow *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_SCROLL_BOTTOM, wxScrollWinEventHandler(OnScrollBottom)); + p->Connect(wxEVT_SCROLL_BOTTOM, wxScrollWinEventHandler(WindowEventHandler::OnScrollBottom)); } else { - p->Disconnect(wxEVT_SCROLL_BOTTOM, wxScrollWinEventHandler(OnScrollBottom)); + p->Disconnect(wxEVT_SCROLL_BOTTOM, wxScrollWinEventHandler(WindowEventHandler::OnScrollBottom)); } } void WindowEventHandler::ConnectScrollLineUp(wxWindow *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_SCROLL_LINEUP, wxScrollWinEventHandler(OnScrollLineUp)); + p->Connect(wxEVT_SCROLL_LINEUP, wxScrollWinEventHandler(WindowEventHandler::OnScrollLineUp)); } else { - p->Disconnect(wxEVT_SCROLL_LINEUP, wxScrollWinEventHandler(OnScrollLineUp)); + p->Disconnect(wxEVT_SCROLL_LINEUP, wxScrollWinEventHandler(WindowEventHandler::OnScrollLineUp)); } } void WindowEventHandler::ConnectScrollLineDown(wxWindow *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_SCROLL_LINEDOWN, wxScrollWinEventHandler(OnScrollLineDown)); + p->Connect(wxEVT_SCROLL_LINEDOWN, wxScrollWinEventHandler(WindowEventHandler::OnScrollLineDown)); } else { - p->Disconnect(wxEVT_SCROLL_LINEDOWN, wxScrollWinEventHandler(OnScrollLineDown)); + p->Disconnect(wxEVT_SCROLL_LINEDOWN, wxScrollWinEventHandler(WindowEventHandler::OnScrollLineDown)); } } void WindowEventHandler::ConnectScrollPageUp(wxWindow *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_SCROLL_PAGEUP, wxScrollWinEventHandler(OnScrollPageUp)); + p->Connect(wxEVT_SCROLL_PAGEUP, wxScrollWinEventHandler(WindowEventHandler::OnScrollPageUp)); } else { - p->Disconnect(wxEVT_SCROLL_PAGEUP, wxScrollWinEventHandler(OnScrollPageUp)); + p->Disconnect(wxEVT_SCROLL_PAGEUP, wxScrollWinEventHandler(WindowEventHandler::OnScrollPageUp)); } } void WindowEventHandler::ConnectScrollPageDown(wxWindow *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_SCROLL_PAGEDOWN, wxScrollWinEventHandler(OnScrollPageDown)); + p->Connect(wxEVT_SCROLL_PAGEDOWN, wxScrollWinEventHandler(WindowEventHandler::OnScrollPageDown)); } else { - p->Disconnect(wxEVT_SCROLL_PAGEDOWN, wxScrollWinEventHandler(OnScrollPageDown)); + p->Disconnect(wxEVT_SCROLL_PAGEDOWN, wxScrollWinEventHandler(WindowEventHandler::OnScrollPageDown)); } } void WindowEventHandler::ConnectScrollThumbTrack(wxWindow *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_SCROLL_THUMBTRACK, wxScrollWinEventHandler(OnScrollThumbTrack)); + p->Connect(wxEVT_SCROLL_THUMBTRACK, wxScrollWinEventHandler(WindowEventHandler::OnScrollThumbTrack)); } else { - p->Disconnect(wxEVT_SCROLL_THUMBTRACK, wxScrollWinEventHandler(OnScrollThumbTrack)); + p->Disconnect(wxEVT_SCROLL_THUMBTRACK, wxScrollWinEventHandler(WindowEventHandler::OnScrollThumbTrack)); } } void WindowEventHandler::ConnectScrollThumbRelease(wxWindow *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_SCROLL_THUMBRELEASE, wxScrollWinEventHandler(OnScrollThumbRelease)); + p->Connect(wxEVT_SCROLL_THUMBRELEASE, wxScrollWinEventHandler(WindowEventHandler::OnScrollThumbRelease)); } else { - p->Disconnect(wxEVT_SCROLL_THUMBRELEASE, wxScrollWinEventHandler(OnScrollThumbRelease)); + p->Disconnect(wxEVT_SCROLL_THUMBRELEASE, wxScrollWinEventHandler(WindowEventHandler::OnScrollThumbRelease)); } } void WindowEventHandler::ConnectHelp(wxWindow *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_HELP, wxHelpEventHandler(OnHelp)); + p->Connect(wxEVT_HELP, wxHelpEventHandler(WindowEventHandler::OnHelp)); } else { - p->Disconnect(wxEVT_HELP, wxHelpEventHandler(OnHelp)); + p->Disconnect(wxEVT_HELP, wxHelpEventHandler(WindowEventHandler::OnHelp)); } } @@ -2338,33 +2338,33 @@ void WindowEventHandler::ConnectLeftDown(wxWindow *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(OnLeftDown)); + p->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(WindowEventHandler::OnLeftDown)); } else { - p->Disconnect(wxEVT_LEFT_DOWN, wxMouseEventHandler(OnLeftDown)); + p->Disconnect(wxEVT_LEFT_DOWN, wxMouseEventHandler(WindowEventHandler::OnLeftDown)); } } void WindowEventHandler::ConnectLeftUp(wxWindow *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_LEFT_UP, wxMouseEventHandler(OnLeftUp)); + p->Connect(wxEVT_LEFT_UP, wxMouseEventHandler(WindowEventHandler::OnLeftUp)); } else { - p->Disconnect(wxEVT_LEFT_UP, wxMouseEventHandler(OnLeftUp)); + p->Disconnect(wxEVT_LEFT_UP, wxMouseEventHandler(WindowEventHandler::OnLeftUp)); } } void WindowEventHandler::ConnectLeftDClick(wxWindow *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_LEFT_DCLICK, wxMouseEventHandler(OnLeftDClick)); + p->Connect(wxEVT_LEFT_DCLICK, wxMouseEventHandler(WindowEventHandler::OnLeftDClick)); } else { - p->Disconnect(wxEVT_LEFT_DCLICK, wxMouseEventHandler(OnLeftDClick)); + p->Disconnect(wxEVT_LEFT_DCLICK, wxMouseEventHandler(WindowEventHandler::OnLeftDClick)); } } @@ -2372,11 +2372,11 @@ void WindowEventHandler::ConnectMiddleDown(wxWindow *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_MIDDLE_DOWN, wxMouseEventHandler(OnMiddleDown)); + p->Connect(wxEVT_MIDDLE_DOWN, wxMouseEventHandler(WindowEventHandler::OnMiddleDown)); } else { - p->Disconnect(wxEVT_MIDDLE_DOWN, wxMouseEventHandler(OnMiddleDown)); + p->Disconnect(wxEVT_MIDDLE_DOWN, wxMouseEventHandler(WindowEventHandler::OnMiddleDown)); } } @@ -2384,11 +2384,11 @@ void WindowEventHandler::ConnectMiddleUp(wxWindow *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_MIDDLE_UP, wxMouseEventHandler(OnMiddleUp)); + p->Connect(wxEVT_MIDDLE_UP, wxMouseEventHandler(WindowEventHandler::OnMiddleUp)); } else { - p->Disconnect(wxEVT_MIDDLE_UP, wxMouseEventHandler(OnMiddleUp)); + p->Disconnect(wxEVT_MIDDLE_UP, wxMouseEventHandler(WindowEventHandler::OnMiddleUp)); } } @@ -2396,11 +2396,11 @@ void WindowEventHandler::ConnectMiddleDClick(wxWindow *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_MIDDLE_DCLICK, wxMouseEventHandler(OnMiddleDClick)); + p->Connect(wxEVT_MIDDLE_DCLICK, wxMouseEventHandler(WindowEventHandler::OnMiddleDClick)); } else { - p->Disconnect(wxEVT_MIDDLE_DCLICK, wxMouseEventHandler(OnMiddleDClick)); + p->Disconnect(wxEVT_MIDDLE_DCLICK, wxMouseEventHandler(WindowEventHandler::OnMiddleDClick)); } } @@ -2408,11 +2408,11 @@ void WindowEventHandler::ConnectRightDown(wxWindow *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(OnRightDown)); + p->Connect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(WindowEventHandler::OnRightDown)); } else { - p->Disconnect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(OnRightDown)); + p->Disconnect(wxEVT_RIGHT_DOWN, wxMouseEventHandler(WindowEventHandler::OnRightDown)); } } @@ -2420,11 +2420,11 @@ void WindowEventHandler::ConnectRightUp(wxWindow *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_RIGHT_UP, wxMouseEventHandler(OnRightUp)); + p->Connect(wxEVT_RIGHT_UP, wxMouseEventHandler(WindowEventHandler::OnRightUp)); } else { - p->Disconnect(wxEVT_RIGHT_UP, wxMouseEventHandler(OnRightUp)); + p->Disconnect(wxEVT_RIGHT_UP, wxMouseEventHandler(WindowEventHandler::OnRightUp)); } } @@ -2432,11 +2432,11 @@ void WindowEventHandler::ConnectRightDClick(wxWindow *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_RIGHT_DCLICK, wxMouseEventHandler(OnRightDClick)); + p->Connect(wxEVT_RIGHT_DCLICK, wxMouseEventHandler(WindowEventHandler::OnRightDClick)); } else { - p->Disconnect(wxEVT_RIGHT_DCLICK, wxMouseEventHandler(OnRightDClick)); + p->Disconnect(wxEVT_RIGHT_DCLICK, wxMouseEventHandler(WindowEventHandler::OnRightDClick)); } } @@ -2444,11 +2444,11 @@ void WindowEventHandler::ConnectMotion(wxWindow *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_MOTION, wxMouseEventHandler(OnMotion)); + p->Connect(wxEVT_MOTION, wxMouseEventHandler(WindowEventHandler::OnMotion)); } else { - p->Disconnect(wxEVT_MOTION, wxMouseEventHandler(OnMotion)); + p->Disconnect(wxEVT_MOTION, wxMouseEventHandler(WindowEventHandler::OnMotion)); } } @@ -2456,11 +2456,11 @@ void WindowEventHandler::ConnectEnterWindow(wxWindow *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_ENTER_WINDOW, wxMouseEventHandler(OnEnterWindow)); + p->Connect(wxEVT_ENTER_WINDOW, wxMouseEventHandler(WindowEventHandler::OnEnterWindow)); } else { - p->Disconnect(wxEVT_ENTER_WINDOW, wxMouseEventHandler(OnEnterWindow)); + p->Disconnect(wxEVT_ENTER_WINDOW, wxMouseEventHandler(WindowEventHandler::OnEnterWindow)); } } @@ -2468,11 +2468,11 @@ void WindowEventHandler::ConnectLeaveWindow(wxWindow *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(OnLeaveWindow)); + p->Connect(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(WindowEventHandler::OnLeaveWindow)); } else { - p->Disconnect(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(OnLeaveWindow)); + p->Disconnect(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(WindowEventHandler::OnLeaveWindow)); } } @@ -2480,10 +2480,10 @@ void WindowEventHandler::ConnectMouseWheel(wxWindow *p, bool connect) { if ( connect ) { - p->Connect(wxEVT_MOUSEWHEEL, wxMouseEventHandler(OnMouseWheel)); + p->Connect(wxEVT_MOUSEWHEEL, wxMouseEventHandler(WindowEventHandler::OnMouseWheel)); } else { - p->Disconnect(wxEVT_MOUSEWHEEL, wxMouseEventHandler(OnMouseWheel)); + p->Disconnect(wxEVT_MOUSEWHEEL, wxMouseEventHandler(WindowEventHandler::OnMouseWheel)); } }