X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9f38fe4bfc3e9dd7d2acaf294d15106490543c6b..9696657f22ee2f10017c0bc305ae1843ee8fe768:/samples/dll/my_dll.cpp diff --git a/samples/dll/my_dll.cpp b/samples/dll/my_dll.cpp index 4b67d6d04e..3aa93e9708 100644 --- a/samples/dll/my_dll.cpp +++ b/samples/dll/my_dll.cpp @@ -22,8 +22,8 @@ #pragma hdrstop #endif -#ifndef __WXMSW__ - #error "This sample is MSW-only" +#ifndef __WINDOWS__ + #error "This sample is Windows-only" #endif #include "wx/app.h" @@ -150,10 +150,10 @@ MyDllApp::MyDllApp() Connect(wxEVT_IDLE, wxIdleEventHandler(MyDllApp::OnIdle)); Connect(CMD_SHOW_WINDOW, - wxEVT_COMMAND_THREAD, + wxEVT_THREAD, wxThreadEventHandler(MyDllApp::OnShowWindow)); Connect(CMD_TERMINATE, - wxEVT_COMMAND_THREAD, + wxEVT_THREAD, wxThreadEventHandler(MyDllApp::OnTerminate)); } @@ -288,7 +288,7 @@ void run_wx_gui_from_dll(const char *title) // Send a message to wx thread to show a new frame: wxThreadEvent *event = - new wxThreadEvent(wxEVT_COMMAND_THREAD, CMD_SHOW_WINDOW); + new wxThreadEvent(wxEVT_THREAD, CMD_SHOW_WINDOW); event->SetString(title); wxQueueEvent(wxApp::GetInstance(), event); } @@ -303,7 +303,7 @@ void wx_dll_cleanup() // If wx main thread is running, we need to stop it. To accomplish this, // send a message telling it to terminate the app. wxThreadEvent *event = - new wxThreadEvent(wxEVT_COMMAND_THREAD, CMD_TERMINATE); + new wxThreadEvent(wxEVT_THREAD, CMD_TERMINATE); wxQueueEvent(wxApp::GetInstance(), event); // We must then wait for the thread to actually terminate.