X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/169935ad4ed842421ef24470a06d1aa298f90fbe..b3818fbe8e439bc9af8c20371774520a5a2bc9c7:/src/msw/app.cpp diff --git a/src/msw/app.cpp b/src/msw/app.cpp index 418073ea9f..13b1806806 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -9,38 +9,48 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// +// =========================================================================== +// declarations +// =========================================================================== + +// --------------------------------------------------------------------------- +// headers +// --------------------------------------------------------------------------- + #ifdef __GNUG__ -#pragma implementation "app.h" + #pragma implementation "app.h" #endif // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #if defined(__BORLANDC__) -#pragma hdrstop + #pragma hdrstop #endif #ifndef WX_PRECOMP - #include "wx/frame.h" - #include "wx/app.h" - #include "wx/utils.h" - #include "wx/gdicmn.h" - #include "wx/pen.h" - #include "wx/brush.h" - #include "wx/cursor.h" - #include "wx/icon.h" - #include "wx/palette.h" - #include "wx/dc.h" - #include "wx/dialog.h" - #include "wx/msgdlg.h" - #include "wx/intl.h" - #include "wx/dynarray.h" + #include "wx/frame.h" + #include "wx/app.h" + #include "wx/utils.h" + #include "wx/gdicmn.h" + #include "wx/pen.h" + #include "wx/brush.h" + #include "wx/cursor.h" + #include "wx/icon.h" + #include "wx/palette.h" + #include "wx/dc.h" + #include "wx/dialog.h" + #include "wx/msgdlg.h" + #include "wx/intl.h" + #include "wx/dynarray.h" + #include "wx/wxchar.h" #endif -#include "wx/msw/private.h" #include "wx/log.h" #include "wx/module.h" +#include "wx/msw/private.h" + #if wxUSE_THREADS #include "wx/thread.h" @@ -53,14 +63,17 @@ #endif // wxUSE_THREADS #if wxUSE_WX_RESOURCES - #include "wx/resource.h" + #include "wx/resource.h" #endif -// To UG: there's no point in putting this #if here -// if you don't do the same for the Ole calls further down. -// Also, OLE is used not just for drag and drop (it's used by automatn.cpp). -// #if wxUSE_DRAG_AND_DROP -#if !defined(__GNUWIN32__) && !defined(__SC__) && !defined(__SALFORDC__) +// OLE is used for drag-and-drop, clipboard, OLE Automation... +#if defined(__GNUWIN32__) || defined(__SC__) || defined(__SALFORDC__) + #undef wxUSE_OLE + + #define wxUSE_OLE 0 +#endif // broken compilers + +#if wxUSE_OLE #include #endif @@ -68,28 +81,36 @@ #include #if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) - #include + #include #endif #include "wx/msw/msvcrt.h" -extern char *wxBuffer; -extern char *wxOsVersion; +// --------------------------------------------------------------------------- +// global variables +// --------------------------------------------------------------------------- + +extern wxChar *wxBuffer; +extern wxChar *wxOsVersion; extern wxList *wxWinHandleList; extern wxList WXDLLEXPORT wxPendingDelete; +#if wxUSE_THREADS +extern wxList *wxPendingEvents; +extern wxCriticalSection *wxPendingEventsLocker; +#endif extern void wxSetKeyboardHook(bool doIt); extern wxCursor *g_globalCursor; HINSTANCE wxhInstance = 0; -static MSG s_currentMsg; +MSG s_currentMsg; wxApp *wxTheApp = NULL; -// @@ why not const? and not static? -char wxFrameClassName[] = "wxFrameClass"; -char wxMDIFrameClassName[] = "wxMDIFrameClass"; -char wxMDIChildFrameClassName[] = "wxMDIChildFrameClass"; -char wxPanelClassName[] = "wxPanelClass"; -char wxCanvasClassName[] = "wxCanvasClass"; +// FIXME why not const? and not static? +wxChar wxFrameClassName[] = _T("wxFrameClass"); +wxChar wxMDIFrameClassName[] = _T("wxMDIFrameClass"); +wxChar wxMDIChildFrameClassName[] = _T("wxMDIChildFrameClass"); +wxChar wxPanelClassName[] = _T("wxPanelClass"); +wxChar wxCanvasClassName[] = _T("wxCanvasClass"); HICON wxSTD_FRAME_ICON = (HICON) NULL; HICON wxSTD_MDICHILDFRAME_ICON = (HICON) NULL; @@ -103,44 +124,56 @@ HBRUSH wxDisableButtonBrush = (HBRUSH) 0; LRESULT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM); -#if !USE_SHARED_LIBRARY - IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) - - BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) - EVT_IDLE(wxApp::OnIdle) - EVT_END_SESSION(wxApp::OnEndSession) - EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession) - END_EVENT_TABLE() -#endif - -long wxApp::sm_lastMessageTime = 0; - #if defined(__WIN95__) && !defined(__TWIN32__) -#define wxUSE_RICHEDIT 1 + #define wxUSE_RICHEDIT 1 #else -#define wxUSE_RICHEDIT 0 + #define wxUSE_RICHEDIT 0 #endif #if wxUSE_RICHEDIT - static HINSTANCE gs_hRichEdit = (HINSTANCE) NULL; + static HINSTANCE gs_hRichEdit = (HINSTANCE) NULL; #endif -//// Initialize +// =========================================================================== +// implementation +// =========================================================================== + +// --------------------------------------------------------------------------- +// wxApp +// --------------------------------------------------------------------------- +#if !USE_SHARED_LIBRARY + IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) + + BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) + EVT_IDLE(wxApp::OnIdle) + EVT_END_SESSION(wxApp::OnEndSession) + EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession) + END_EVENT_TABLE() +#endif + +//// Initialize bool wxApp::Initialize() { // Some people may wish to use this, but // probably it shouldn't be here by default. #ifdef __WXDEBUG__ -// wxRedirectIOToConsole(); + // wxRedirectIOToConsole(); #endif - wxBuffer = new char[1500]; + wxBuffer = new wxChar[1500]; // FIXME wxClassInfo::InitializeClasses(); #if wxUSE_RESOURCES - wxGetResource("wxWindows", "OsVersion", &wxOsVersion); + wxGetResource(_T("wxWindows"), _T("OsVersion"), &wxOsVersion); +#endif + + // I'm annoyed ... I don't know where to put this and I don't want to + // create a module for that as it's part of the core. +#if wxUSE_THREADS + wxPendingEvents = new wxList(); + wxPendingEventsLocker = new wxCriticalSection(); #endif wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); @@ -159,65 +192,56 @@ bool wxApp::Initialize() InitCommonControls(); #if wxUSE_RICHEDIT - gs_hRichEdit = LoadLibrary("RICHED32.DLL"); + gs_hRichEdit = LoadLibrary(_T("RICHED32.DLL")); if (gs_hRichEdit == (HINSTANCE) NULL) { - wxMessageBox("Could not initialise Rich Edit DLL"); + wxLogError(_("Could not initialise Rich Edit DLL")); } -#endif +#endif // wxUSE_RICHEDIT -#endif +#endif // __WIN95__ + // for OLE, enlarge message queue to be as large as possible int iMsg = 96; + while (!SetMessageQueue(iMsg) && (iMsg -= 8)); - // for OLE, enlarge message queue to be as large as possible - while (!SetMessageQueue(iMsg) && (iMsg -= 8)); - -/* - DWORD dwOleVer; - dwOleVer = CoBuildVersion(); - - // check the OLE library version - if (rmm != HIWORD(dwOleVer)) - { - wxMessageBox("Incorrect version of OLE libraries."); - return FALSE; - } -*/ - -#if !defined(__GNUWIN32__) && !defined(__SC__) && !defined(__SALFORDC__) +#if wxUSE_OLE // we need to initialize OLE library if ( FAILED(::OleInitialize(NULL)) ) - wxFatalError(_("Cannot initialize OLE")); + wxLogError(_("Cannot initialize OLE")); #endif -#if CTL3D +#if wxUSE_CTL3D if (!Ctl3dRegister(wxhInstance)) - wxFatalError("Cannot register CTL3D"); + wxLogError(_T("Cannot register CTL3D")); Ctl3dAutoSubclass(wxhInstance); #endif g_globalCursor = new wxCursor; - wxSTD_FRAME_ICON = LoadIcon(wxhInstance, "wxSTD_FRAME"); - wxSTD_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, "wxSTD_MDIPARENTFRAME"); - wxSTD_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, "wxSTD_MDICHILDFRAME"); + wxSTD_FRAME_ICON = LoadIcon(wxhInstance, _T("wxSTD_FRAME")); + wxSTD_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, _T("wxSTD_MDIPARENTFRAME")); + wxSTD_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, _T("wxSTD_MDICHILDFRAME")); - wxDEFAULT_FRAME_ICON = LoadIcon(wxhInstance, "wxDEFAULT_FRAME"); - wxDEFAULT_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, "wxDEFAULT_MDIPARENTFRAME"); - wxDEFAULT_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, "wxDEFAULT_MDICHILDFRAME"); + wxDEFAULT_FRAME_ICON = LoadIcon(wxhInstance, _T("wxDEFAULT_FRAME")); + wxDEFAULT_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, _T("wxDEFAULT_MDIPARENTFRAME")); + wxDEFAULT_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, _T("wxDEFAULT_MDICHILDFRAME")); RegisterWindowClasses(); // Create the brush for disabling bitmap buttons - LOGBRUSH lb ; + LOGBRUSH lb; lb.lbStyle = BS_PATTERN; - lb.lbHatch = (int)LoadBitmap( wxhInstance, "wxDISABLE_BUTTON_BITMAP" ) ; - wxDisableButtonBrush = ::CreateBrushIndirect( & lb ) ; - ::DeleteObject( (HGDIOBJ)lb.lbHatch ) ; + lb.lbHatch = (int)LoadBitmap( wxhInstance, _T("wxDISABLE_BUTTON_BITMAP") ); + if ( lb.lbHatch ) + { + wxDisableButtonBrush = ::CreateBrushIndirect( & lb ); + ::DeleteObject( (HGDIOBJ)lb.lbHatch ); + } + //else: wxWindows resources are probably not linked in #if wxUSE_PENWINDOWS wxRegisterPenWin(); @@ -227,7 +251,7 @@ bool wxApp::Initialize() // This is to foil optimizations in Visual C++ that throw out dummy.obj. // PLEASE DO NOT ALTER THIS. -#if defined(_MSC_VER) && !defined(WXMAKINGDLL) +#if defined(__VISUALC__) && !defined(WXMAKINGDLL) extern char wxDummyChar; if (wxDummyChar) wxDummyChar++; #endif @@ -240,133 +264,88 @@ bool wxApp::Initialize() return TRUE; } -//// RegisterWindowClasses +// --------------------------------------------------------------------------- +// RegisterWindowClasses +// --------------------------------------------------------------------------- bool wxApp::RegisterWindowClasses() { -/////////////////////////////////////////////////////////////////////// -// Register the frame window class. - WNDCLASS wndclass; // Structure used to register Windows class. - - wndclass.style = CS_HREDRAW | CS_VREDRAW; - wndclass.lpfnWndProc = (WNDPROC)wxWndProc; - wndclass.cbClsExtra = 0; - wndclass.cbWndExtra = sizeof( DWORD ); // was 4 - wndclass.hInstance = wxhInstance; - wndclass.hIcon = (HICON) NULL; // wxSTD_FRAME_ICON; - wndclass.hCursor = LoadCursor( (HINSTANCE) NULL, IDC_ARROW ); - wndclass.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE+1) ; -// wndclass.hbrBackground = GetStockObject( WHITE_BRUSH ); - wndclass.lpszMenuName = NULL; + WNDCLASS wndclass; + + // the fields which are common to all classes + wndclass.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS; + wndclass.lpfnWndProc = (WNDPROC)wxWndProc; + wndclass.cbClsExtra = 0; + wndclass.cbWndExtra = sizeof( DWORD ); // what is this DWORD used for? + wndclass.hInstance = wxhInstance; + wndclass.hIcon = (HICON) NULL; + wndclass.hCursor = ::LoadCursor((HINSTANCE)NULL, IDC_ARROW); + wndclass.lpszMenuName = NULL; + + // Register the frame window class. + wndclass.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE + 1); #ifdef _MULTIPLE_INSTANCES - sprintf( wxFrameClassName,"wxFrameClass%d", wxhInstance ); + sprintf( wxFrameClassName,"wxFrameClass%d", wxhInstance ); #endif - wndclass.lpszClassName = wxFrameClassName; - - if (!RegisterClass( &wndclass )) - { - // wxFatalError("Can't register Frame Window class"); - } - -/////////////////////////////////////////////////////////////////////// -// Register the MDI frame window class. - WNDCLASS wndclass1; // Structure used to register Windows class. - - wndclass1.style = CS_HREDRAW | CS_VREDRAW; - wndclass1.lpfnWndProc = (WNDPROC)wxWndProc; - wndclass1.cbClsExtra = 0; - wndclass1.cbWndExtra = sizeof( DWORD ); // was 4 - wndclass1.hInstance = wxhInstance; - wndclass1.hIcon = (HICON) NULL; // wxSTD_MDIPARENTFRAME_ICON; - wndclass1.hCursor = LoadCursor( (HINSTANCE) NULL, IDC_ARROW ); -// wndclass1.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE+1) ; - wndclass1.hbrBackground = (HBRUSH) NULL; - wndclass1.lpszMenuName = NULL; - - wndclass1.lpszClassName = wxMDIFrameClassName; - if (!RegisterClass( &wndclass1 )) - { -// wxFatalError("Can't register MDI Frame window class"); -// return FALSE; - } - -/////////////////////////////////////////////////////////////////////// -// Register the MDI child frame window class. - WNDCLASS wndclass4; // Structure used to register Windows class. - - wndclass4.style = CS_HREDRAW | CS_VREDRAW; - wndclass4.lpfnWndProc = (WNDPROC)wxWndProc; - wndclass4.cbClsExtra = 0; - wndclass4.cbWndExtra = sizeof( DWORD ); // was 4 - wndclass4.hInstance = wxhInstance; - wndclass4.hIcon = (HICON) NULL; // wxSTD_MDICHILDFRAME_ICON; - wndclass4.hCursor = LoadCursor( (HINSTANCE) NULL, IDC_ARROW ); - // TODO: perhaps this should be NULL so that Windows doesn't - // paint the background itself (would OnEraseBackground duplicate - // this?) - wndclass4.hbrBackground = (HBRUSH)(COLOR_WINDOW+1) ; -// wndclass4.hbrBackground = NULL; - wndclass4.lpszMenuName = NULL; - wndclass4.lpszClassName = wxMDIChildFrameClassName; - - if (!RegisterClass( &wndclass4 )) - { -// wxFatalError("Can't register MDI child frame window class"); -// return FALSE; - } - -/////////////////////////////////////////////////////////////////////// -// Register the panel window class. - WNDCLASS wndclass2; // Structure used to register Windows class. - memset(&wndclass2, 0, sizeof(WNDCLASS)); // start with NULL defaults - // Use CS_OWNDC to avoid messing about restoring the context - // for every graphic operation. - wndclass2.style = CS_HREDRAW | CS_VREDRAW; - wndclass2.lpfnWndProc = (WNDPROC)wxWndProc; - wndclass2.cbClsExtra = 0; - wndclass2.cbWndExtra = sizeof( DWORD ); // was 4 - wndclass2.hInstance = wxhInstance; - wndclass2.hIcon = (HICON) NULL; - wndclass2.hCursor = (HCURSOR) NULL; -// wndclass2.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1) ; - wndclass2.hbrBackground = (HBRUSH) GetStockObject( LTGRAY_BRUSH ); - wndclass2.lpszMenuName = NULL; - wndclass2.lpszClassName = wxPanelClassName; - if (!RegisterClass( &wndclass2 )) - { -// wxFatalError("Can't register Panel Window class"); -// return FALSE; - } - -/////////////////////////////////////////////////////////////////////// -// Register the canvas and textsubwindow class name - WNDCLASS wndclass3; // Structure used to register Windows class. - memset(&wndclass3, 0, sizeof(WNDCLASS)); // start with NULL defaults - // Use CS_OWNDC to avoid messing about restoring the context - // for every graphic operation. -// wndclass3.style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC | CS_DBLCLKS ; - // wxWin 2.0 - wndclass3.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS ; - wndclass3.lpfnWndProc = (WNDPROC)wxWndProc; - wndclass3.cbClsExtra = 0; - wndclass3.cbWndExtra = sizeof( DWORD ); // was 4 - wndclass3.hInstance = wxhInstance; - wndclass3.hIcon = (HICON) NULL; - wndclass3.hCursor = (HCURSOR) NULL; -// wndclass3.hbrBackground = (HBRUSH)(COLOR_WINDOW+1) ; - wndclass3.hbrBackground = (HBRUSH) NULL; - wndclass3.lpszMenuName = NULL; - wndclass3.lpszClassName = wxCanvasClassName; - if (!RegisterClass( &wndclass3)) - { -// wxFatalError("Can't register Canvas class"); -// return FALSE; - } - - return TRUE; + wndclass.lpszClassName = wxFrameClassName; + + if ( !RegisterClass(&wndclass) ) + { + wxLogLastError("RegisterClass(frame)"); + + return FALSE; + } + + // Register the MDI frame window class. + wndclass.hbrBackground = (HBRUSH)NULL; // paint MDI frame ourselves + wndclass.lpszClassName = wxMDIFrameClassName; + + if ( !RegisterClass(&wndclass) ) + { + wxLogLastError("RegisterClass(MDI parent)"); + + return FALSE; + } + + // Register the MDI child frame window class. + wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + wndclass.lpszClassName = wxMDIChildFrameClassName; + + if ( !RegisterClass(&wndclass) ) + { + wxLogLastError("RegisterClass(MDI child)"); + + return FALSE; + } + + // Register the panel window class. + wndclass.hbrBackground = (HBRUSH) GetStockObject( LTGRAY_BRUSH ); + wndclass.lpszClassName = wxPanelClassName; + + if ( !RegisterClass(&wndclass) ) + { + wxLogLastError("RegisterClass(panel)"); + + return FALSE; + } + + // Register the canvas and textsubwindow class name + wndclass.hbrBackground = (HBRUSH)NULL; + wndclass.lpszClassName = wxCanvasClassName; + + if ( !RegisterClass(&wndclass) ) + { + wxLogLastError("RegisterClass(canvas)"); + + return FALSE; + } + + return TRUE; } -//// Convert Windows to argc, argv style +// --------------------------------------------------------------------------- +// Convert Windows to argc, argv style +// --------------------------------------------------------------------------- void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine) { @@ -376,16 +355,13 @@ void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine) int count = 0; // Get application name - char name[260]; // 260 is MAX_PATH value from windef.h + wxChar name[260]; // 260 is MAX_PATH value from windef.h ::GetModuleFileName(wxhInstance, name, WXSIZEOF(name)); - // GNUWIN32 already fills in the first arg with the application name. -#if !defined(__GNUWIN32__) args.Add(name); - count ++; -#endif + count++; - strcpy(name, wxFileNameFromPath(name)); + wxStrcpy(name, wxFileNameFromPath(name)); wxStripExtension(name); wxTheApp->SetAppName(name); @@ -396,16 +372,16 @@ void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine) while (i < len) { // Skip whitespace - while ((i < len) && isspace(cmdLine.GetChar(i))) + while ((i < len) && wxIsspace(cmdLine.GetChar(i))) i ++; if (i < len) { - if (cmdLine.GetChar(i) == '"') // We found the start of a string + if (cmdLine.GetChar(i) == _T('"')) // We found the start of a string { i ++; int first = i; - while ((i < len) && (cmdLine.GetChar(i) != '"')) + while ((i < len) && (cmdLine.GetChar(i) != _T('"'))) i ++; wxString arg(cmdLine.Mid(first, (i - first))); @@ -419,7 +395,7 @@ void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine) else // Unquoted argument { int first = i; - while ((i < len) && !isspace(cmdLine.GetChar(i))) + while ((i < len) && !wxIsspace(cmdLine.GetChar(i))) i ++; wxString arg(cmdLine.Mid(first, (i - first))); @@ -430,11 +406,11 @@ void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine) } } - wxTheApp->argv = new char*[count + 1]; + wxTheApp->argv = new wxChar*[count + 1]; for (i = 0; i < count; i++) { wxString arg(args[i]); - wxTheApp->argv[i] = copystring((const char*)arg); + wxTheApp->argv[i] = copystring((const wxChar*)arg); } wxTheApp->argv[count] = NULL; // argv[] is a NULL-terminated list wxTheApp->argc = count; @@ -444,108 +420,134 @@ void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine) void wxApp::CleanUp() { - //// COMMON CLEANUP - wxModule::CleanUpModules(); + //// COMMON CLEANUP + +#if wxUSE_LOG + // flush the logged messages if any and install a 'safer' log target: the + // default one (wxLogGui) can't be used after the resources are freed just + // below and the user suppliedo ne might be even more unsafe (using any + // wxWindows GUI function is unsafe starting from now) + wxLog::DontCreateOnDemand(); + + // this will flush the old messages if any + delete wxLog::SetActiveTarget(new wxLogStderr); +#endif // wxUSE_LOG + + // One last chance for pending objects to be cleaned up + wxTheApp->DeletePendingObjects(); + + wxModule::CleanUpModules(); #if wxUSE_WX_RESOURCES - wxCleanUpResourceSystem(); + wxCleanUpResourceSystem(); -// wxDefaultResourceTable->ClearTable(); + // wxDefaultResourceTable->ClearTable(); #endif - // Indicate that the cursor can be freed, - // so that cursor won't be deleted by deleting - // the bitmap list before g_globalCursor goes out - // of scope (double deletion of the cursor). - wxSetCursor(wxNullCursor); - delete g_globalCursor; + // Indicate that the cursor can be freed, so that cursor won't be deleted + // by deleting the bitmap list before g_globalCursor goes out of scope + // (double deletion of the cursor). + wxSetCursor(wxNullCursor); + delete g_globalCursor; + g_globalCursor = NULL; - wxDeleteStockObjects() ; + wxDeleteStockObjects(); - // Destroy all GDI lists, etc. - wxDeleteStockLists(); + // Destroy all GDI lists, etc. + wxDeleteStockLists(); - delete wxTheColourDatabase; - wxTheColourDatabase = NULL; + delete wxTheColourDatabase; + wxTheColourDatabase = NULL; - wxBitmap::CleanUpHandlers(); + wxBitmap::CleanUpHandlers(); - delete[] wxBuffer; - wxBuffer = NULL; + delete[] wxBuffer; + wxBuffer = NULL; - //// WINDOWS-SPECIFIC CLEANUP + //// WINDOWS-SPECIFIC CLEANUP - wxSetKeyboardHook(FALSE); + wxSetKeyboardHook(FALSE); #ifdef __WIN95__ #if wxUSE_RICHEDIT - if (gs_hRichEdit != (HINSTANCE) NULL) - FreeLibrary(gs_hRichEdit); + if (gs_hRichEdit != (HINSTANCE) NULL) + FreeLibrary(gs_hRichEdit); #endif #endif #if wxUSE_PENWINDOWS - wxCleanUpPenWin(); + wxCleanUpPenWin(); #endif - if (wxSTD_FRAME_ICON) - DestroyIcon(wxSTD_FRAME_ICON); - if (wxSTD_MDICHILDFRAME_ICON) - DestroyIcon(wxSTD_MDICHILDFRAME_ICON); - if (wxSTD_MDIPARENTFRAME_ICON) - DestroyIcon(wxSTD_MDIPARENTFRAME_ICON); - - if (wxDEFAULT_FRAME_ICON) - DestroyIcon(wxDEFAULT_FRAME_ICON); - if (wxDEFAULT_MDICHILDFRAME_ICON) - DestroyIcon(wxDEFAULT_MDICHILDFRAME_ICON); - if (wxDEFAULT_MDIPARENTFRAME_ICON) - DestroyIcon(wxDEFAULT_MDIPARENTFRAME_ICON); - - if ( wxDisableButtonBrush ) - ::DeleteObject( wxDisableButtonBrush ) ; - -#if !defined(__GNUWIN32__) && !defined(__SC__) && !defined(__SALFORDC__) - ::OleUninitialize(); + if (wxSTD_FRAME_ICON) + DestroyIcon(wxSTD_FRAME_ICON); + if (wxSTD_MDICHILDFRAME_ICON) + DestroyIcon(wxSTD_MDICHILDFRAME_ICON); + if (wxSTD_MDIPARENTFRAME_ICON) + DestroyIcon(wxSTD_MDIPARENTFRAME_ICON); + + if (wxDEFAULT_FRAME_ICON) + DestroyIcon(wxDEFAULT_FRAME_ICON); + if (wxDEFAULT_MDICHILDFRAME_ICON) + DestroyIcon(wxDEFAULT_MDICHILDFRAME_ICON); + if (wxDEFAULT_MDIPARENTFRAME_ICON) + DestroyIcon(wxDEFAULT_MDIPARENTFRAME_ICON); + + if ( wxDisableButtonBrush ) + ::DeleteObject( wxDisableButtonBrush ); + +#if wxUSE_OLE + ::OleUninitialize(); #endif -#if CTL3D - Ctl3dUnregister(wxhInstance); +#if wxUSE_CTL3D + Ctl3dUnregister(wxhInstance); #endif - if (wxWinHandleList) - delete wxWinHandleList ; + if (wxWinHandleList) + delete wxWinHandleList; + + // GL: I'm annoyed ... I don't know where to put this and I don't want to + // create a module for that as it's part of the core. +#if wxUSE_THREADS + delete wxPendingEvents; + delete wxPendingEventsLocker; + // If we don't do the following, we get an apparent memory leak. + ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker(); +#endif - wxClassInfo::CleanUpClasses(); + wxClassInfo::CleanUpClasses(); - delete wxTheApp; - wxTheApp = NULL; + delete wxTheApp; + wxTheApp = NULL; #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT - // At this point we want to check if there are any memory - // blocks that aren't part of the wxDebugContext itself, - // as a special case. Then when dumping we need to ignore - // wxDebugContext, too. - if (wxDebugContext::CountObjectsLeft() > 0) - { - wxLogDebug("There were memory leaks."); - wxDebugContext::Dump(); - wxDebugContext::PrintStatistics(); - } -// wxDebugContext::SetStream(NULL, NULL); + // At this point we want to check if there are any memory + // blocks that aren't part of the wxDebugContext itself, + // as a special case. Then when dumping we need to ignore + // wxDebugContext, too. + if (wxDebugContext::CountObjectsLeft(TRUE) > 0) + { + wxLogDebug(_T("There were memory leaks.")); + wxDebugContext::Dump(); + wxDebugContext::PrintStatistics(); + } + // wxDebugContext::SetStream(NULL, NULL); #endif - // do it as the very last thing because everything else can log messages - wxLog::DontCreateOnDemand(); - delete wxLog::SetActiveTarget(NULL); +#if wxUSE_LOG + // do it as the very last thing because everything else can log messages + delete wxLog::SetActiveTarget(NULL); +#endif // wxUSE_LOG } #if !defined(_WINDLL) || (defined(_WINDLL) && defined(WXMAKINGDLL)) -// temporarily disable this warning -#ifdef _MSC_VER +// temporarily disable this warning which would be generated in release builds +// because of __try +#ifdef __VISUALC__ #pragma warning(disable: 4715) // not all control paths return a value #endif // Visual C++ @@ -561,102 +563,106 @@ int wxEntry(WXHINSTANCE hInstance, // deallocated memory which may be used to simulate low-memory condition) wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF); - // take everything into a try-except block in release build - // FIXME other compilers must support Win32 SEH (structured exception - // handling) too, just find the appropriate keyword in their docs! - // Please note that it's _not_ the same as C++ exceptions! -#if !defined(__WXDEBUG__) && defined(_MSC_VER) && !defined(__MWERKS__) + // take everything into a try-except block in release build + // FIXME other compilers must support Win32 SEH (structured exception + // handling) too, just find the appropriate keyword in their docs! + // Please note that it's _not_ the same as C++ exceptions! +#if !defined(__WXDEBUG__) && defined(__VISUALC__) #define CATCH_PROGRAM_EXCEPTIONS - __try { + __try { #else #undef CATCH_PROGRAM_EXCEPTIONS #endif - wxhInstance = (HINSTANCE) hInstance; + wxhInstance = (HINSTANCE) hInstance; - if (!wxApp::Initialize()) - return 0; + if (!wxApp::Initialize()) + return 0; - // create the application object or ensure that one already exists - if (!wxTheApp) - { - // The app may have declared a global application object, but we recommend - // the IMPLEMENT_APP macro is used instead, which sets an initializer - // function for delayed, dynamic app object construction. - wxCHECK_MSG( wxApp::GetInitializerFunction(), 0, - "No initializer - use IMPLEMENT_APP macro." ); - - wxTheApp = (*wxApp::GetInitializerFunction()) (); - } - - wxCHECK_MSG( wxTheApp, 0, "You have to define an instance of wxApp!" ); - - // save the WinMain() parameters - wxTheApp->ConvertToStandardCommandArgs(lpCmdLine); - wxTheApp->m_nCmdShow = nCmdShow; - - // GUI-specific initialisation. In fact on Windows we don't have any, - // but this call is provided for compatibility across platforms. - wxTheApp->OnInitGui() ; - - int retValue = 0; - - if ( wxTheApp->OnInit() ) - { - if ( enterLoop ) - { - retValue = wxTheApp->OnRun(); - } - } - //else: app initialization failed, so we skipped OnRun() - - wxWindow *topWindow = wxTheApp->GetTopWindow(); - if ( topWindow ) - { - // Forcibly delete the window. - if ( topWindow->IsKindOf(CLASSINFO(wxFrame)) || - topWindow->IsKindOf(CLASSINFO(wxDialog)) ) - { - topWindow->Close(TRUE); - wxTheApp->DeletePendingObjects(); - } - else - { - delete topWindow; - wxTheApp->SetTopWindow(NULL); - } - } - - wxTheApp->OnExit(); - - // flush the logged messages if any - wxLog *pLog = wxLog::GetActiveTarget(); - if ( pLog != NULL && pLog->HasPendingMessages() ) - pLog->Flush(); - - - wxApp::CleanUp(); - - return retValue; + // create the application object or ensure that one already exists + if (!wxTheApp) + { + // The app may have declared a global application object, but we recommend + // the IMPLEMENT_APP macro is used instead, which sets an initializer + // function for delayed, dynamic app object construction. + wxCHECK_MSG( wxApp::GetInitializerFunction(), 0, + _T("No initializer - use IMPLEMENT_APP macro.") ); -#ifdef CATCH_PROGRAM_EXCEPTIONS - } - __except ( EXCEPTION_EXECUTE_HANDLER ) { - /* - if ( wxTheApp ) - wxTheApp->OnFatalException(); - */ + wxTheApp = (*wxApp::GetInitializerFunction()) (); + } + + wxCHECK_MSG( wxTheApp, 0, _T("You have to define an instance of wxApp!") ); + + // save the WinMain() parameters + wxTheApp->ConvertToStandardCommandArgs(lpCmdLine); + wxTheApp->m_nCmdShow = nCmdShow; + + // GUI-specific initialisation. In fact on Windows we don't have any, + // but this call is provided for compatibility across platforms. + wxTheApp->OnInitGui(); + + int retValue = 0; + + if ( wxTheApp->OnInit() ) + { + if ( enterLoop ) + { + retValue = wxTheApp->OnRun(); + } + else + // We want to initialize, but not run or exit immediately. + return 1; + } + //else: app initialization failed, so we skipped OnRun() + + wxWindow *topWindow = wxTheApp->GetTopWindow(); + if ( topWindow ) + { + // Forcibly delete the window. + if ( topWindow->IsKindOf(CLASSINFO(wxFrame)) || + topWindow->IsKindOf(CLASSINFO(wxDialog)) ) + { + topWindow->Close(TRUE); + wxTheApp->DeletePendingObjects(); + } + else + { + delete topWindow; + wxTheApp->SetTopWindow(NULL); + } + } - ::ExitProcess(3); // the same exit code as abort() + wxTheApp->OnExit(); - // NOTREACHED - } + wxApp::CleanUp(); + + return retValue; + +#ifdef CATCH_PROGRAM_EXCEPTIONS + } + __except ( EXCEPTION_EXECUTE_HANDLER ) { + /* + if ( wxTheApp ) + wxTheApp->OnFatalException(); + */ + + // using wxLog would be unsafe here + ::MessageBox(NULL, + _("Unrecoverable program error detected: " + " the application will terminate."), + _("Fatal Error"), + MB_APPLMODAL | MB_ICONSTOP | MB_OK); + + ::ExitProcess(3); // the same exit code as abort() + + // NOTREACHED + } #endif // CATCH_PROGRAM_EXCEPTIONS } // restore warning state -#ifdef _MSC_VER +#ifdef __VISUALC__ #pragma warning(default: 4715) // not all control paths return a value #endif // Visual C++ @@ -666,41 +672,36 @@ int wxEntry(WXHINSTANCE hInstance, int wxEntry(WXHINSTANCE hInstance) { - wxhInstance = (HINSTANCE) hInstance; - wxApp::Initialize(); - - // The app may have declared a global application object, but we recommend - // the IMPLEMENT_APP macro is used instead, which sets an initializer function - // for delayed, dynamic app object construction. + wxhInstance = (HINSTANCE) hInstance; + wxApp::Initialize(); - if (!wxTheApp) - { - if (!wxApp::GetInitializerFunction()) + // The app may have declared a global application object, but we recommend + // the IMPLEMENT_APP macro is used instead, which sets an initializer function + // for delayed, dynamic app object construction. + if (!wxTheApp) { - MessageBox(NULL, "No initializer - use IMPLEMENT_APP macro.", "wxWindows Error", MB_APPLMODAL | MB_ICONSTOP | MB_OK); - return 0; - } + wxCHECK_MSG( wxApp::GetInitializerFunction(), 0, + "No initializer - use IMPLEMENT_APP macro." ); - wxTheApp = (* wxApp::GetInitializerFunction()) (); - } + wxTheApp = (* wxApp::GetInitializerFunction()) (); + } - if (!wxTheApp) { - MessageBox(NULL, "You have to define an instance of wxApp!", "wxWindows Error", MB_APPLMODAL | MB_ICONSTOP | MB_OK); - return 0; - } + wxCHECK_MSG( wxTheApp, 0, "You have to define an instance of wxApp!" ); - wxTheApp->argc = 0; - wxTheApp->argv = NULL; + wxTheApp->argc = 0; + wxTheApp->argv = NULL; - wxTheApp->OnInitGui(); + wxTheApp->OnInitGui(); - wxTheApp->OnInit(); + wxTheApp->OnInit(); - if (wxTheApp->GetTopWindow() && wxTheApp->GetTopWindow()->GetHWND()) { - wxTheApp->GetTopWindow()->Show(TRUE); - } + wxWindow *topWindow = wxTheApp->GetTopWindow(); + if ( topWindow && topWindow->GetHWND()) + { + topWindow->Show(TRUE); + } - return 1; + return 1; } #endif // _WINDLL @@ -710,43 +711,38 @@ wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL; wxApp::wxApp() { - m_topWindow = NULL; - wxTheApp = this; - m_className = ""; - m_wantDebugOutput = TRUE ; - m_appName = ""; - argc = 0; - argv = NULL; -#ifdef __WXMSW__ - m_printMode = wxPRINT_WINDOWS; -#else - m_printMode = wxPRINT_POSTSCRIPT; -#endif - m_exitOnFrameDelete = TRUE; - m_auto3D = TRUE; + m_topWindow = NULL; + wxTheApp = this; + m_wantDebugOutput = TRUE; + + argc = 0; + argv = NULL; + m_printMode = wxPRINT_WINDOWS; + m_exitOnFrameDelete = TRUE; + m_auto3D = TRUE; } wxApp::~wxApp() { - // Delete command-line args - int i; - for (i = 0; i < argc; i++) - { - delete[] argv[i]; - } - delete[] argv; + // Delete command-line args + int i; + for (i = 0; i < argc; i++) + { + delete[] argv[i]; + } + delete[] argv; } bool wxApp::Initialized() { #ifndef _WINDLL - if (GetTopWindow()) - return TRUE; - else - return FALSE; + if (GetTopWindow()) + return TRUE; + else + return FALSE; #endif #ifdef _WINDLL // Assume initialized if DLL (no way of telling) - return TRUE; + return TRUE; #endif } @@ -774,7 +770,7 @@ bool wxApp::DoMessage() { #if wxUSE_THREADS wxASSERT_MSG( wxThread::IsMain(), - "only the main thread can process Windows messages" ); + _T("only the main thread can process Windows messages") ); static bool s_hadGuiLock = TRUE; static wxMsgArray s_aSavedMessages; @@ -789,7 +785,7 @@ bool wxApp::DoMessage() // leave out WM_COMMAND messages: too dangerous, sometimes // the message will be processed twice if ( !wxIsWaitingForThread() || - s_currentMsg.message != WM_COMMAND ) + s_currentMsg.message != WM_COMMAND ) { s_aSavedMessages.Add(s_currentMsg); } @@ -828,7 +824,6 @@ bool wxApp::DoMessage() if ( !ProcessMessage((WXMSG *)&s_currentMsg) ) { ::TranslateMessage(&s_currentMsg); - wxApp::sm_lastMessageTime = s_currentMsg.time; /* MATTHEW: timeStamp impl. */ ::DispatchMessage(&s_currentMsg); } } @@ -852,23 +847,24 @@ bool wxApp::DoMessage() int wxApp::MainLoop() { - m_keepGoing = TRUE; + m_keepGoing = TRUE; - while ( m_keepGoing ) - { - #if wxUSE_THREADS + while ( m_keepGoing ) + { +#if wxUSE_THREADS wxMutexGuiLeaveOrEnter(); - #endif // wxUSE_THREADS +#endif // wxUSE_THREADS - while ( !::PeekMessage(&s_currentMsg, 0, 0, 0, PM_NOREMOVE) && - ProcessIdle() ) - { - } + while ( !::PeekMessage(&s_currentMsg, 0, 0, 0, PM_NOREMOVE) && + ProcessIdle() ) + { + } - DoMessage(); - } - return s_currentMsg.wParam; + DoMessage(); + } + + return s_currentMsg.wParam; } // Returns TRUE if more time is needed. @@ -881,14 +877,33 @@ bool wxApp::ProcessIdle() return event.MoreRequested(); } +#if wxUSE_THREADS +void wxApp::ProcessPendingEvents() +{ + wxNode *node = wxPendingEvents->First(); + wxCriticalSectionLocker locker(*wxPendingEventsLocker); + + while (node) + { + wxEvtHandler *handler = (wxEvtHandler *)node->Data(); + + handler->ProcessPendingEvents(); + + delete node; + node = wxPendingEvents->First(); + } +} +#endif + + void wxApp::ExitMainLoop() { - m_keepGoing = FALSE; + m_keepGoing = FALSE; } bool wxApp::Pending() { - return (::PeekMessage(&s_currentMsg, 0, 0, 0, PM_NOREMOVE) != 0) ; + return (::PeekMessage(&s_currentMsg, 0, 0, 0, PM_NOREMOVE) != 0); } void wxApp::Dispatch() @@ -901,35 +916,38 @@ void wxApp::Dispatch() * the message. Some may have accelerator tables, or have * MDI complications. */ -bool wxApp::ProcessMessage(WXMSG *Msg) -{ - MSG *msg = (MSG *)Msg; - HWND hWnd; +bool wxApp::ProcessMessage(WXMSG *wxmsg) +{ + MSG *msg = (MSG *)wxmsg; + HWND hWnd = msg->hwnd; + wxWindow *wndThis = wxFindWinFromHandle((WXHWND)hWnd), *wnd; + + // for some composite controls (like a combobox), wndThis might be NULL + // because the subcontrol is not a wxWindow, but only the control itself + // is - try to catch this case + while ( hWnd && !wndThis ) + { + hWnd = ::GetParent(hWnd); + wndThis = wxFindWinFromHandle((WXHWND)hWnd); + } - // Try translations first; find the youngest window with - // a translation table. - for (hWnd = msg->hwnd; hWnd != (HWND) NULL; hWnd = ::GetParent(hWnd)) - { - wxWindow *wnd = wxFindWinFromHandle((WXHWND) hWnd); - if (wnd) + // Try translations first; find the youngest window with + // a translation table. + for ( wnd = wndThis; wnd; wnd = wnd->GetParent() ) { - if (wnd->MSWTranslateMessage(Msg)) - return TRUE; + if ( wnd->MSWTranslateMessage(wxmsg) ) + return TRUE; } - } - // Anyone for a non-translation message? Try youngest descendants first. - for (hWnd = msg->hwnd; hWnd != (HWND) NULL; hWnd = ::GetParent(hWnd)) - { - wxWindow *wnd = wxFindWinFromHandle((WXHWND) hWnd); - if (wnd) + // Anyone for a non-translation message? Try youngest descendants first. + for ( wnd = wndThis; wnd; wnd = wnd->GetParent() ) { - if (wnd->MSWProcessMessage(Msg)) - return TRUE; + if ( wnd->MSWProcessMessage(wxmsg) ) + return TRUE; } - } - return FALSE; + + return FALSE; } void wxApp::OnIdle(wxIdleEvent& event) @@ -945,10 +963,12 @@ void wxApp::OnIdle(wxIdleEvent& event) // 'Garbage' collection of windows deleted with Close(). DeletePendingObjects(); +#if wxUSE_LOG // flush the logged messages if any wxLog *pLog = wxLog::GetActiveTarget(); if ( pLog != NULL && pLog->HasPendingMessages() ) pLog->Flush(); +#endif // wxUSE_LOG // Send OnIdle events to all windows if ( SendIdleEvents() ) @@ -958,6 +978,10 @@ void wxApp::OnIdle(wxIdleEvent& event) event.RequestMore(TRUE); } + // If they are pending events, we must process them. +#if wxUSE_THREADS + ProcessPendingEvents(); +#endif s_inOnIdle = FALSE; } @@ -965,14 +989,14 @@ void wxApp::OnIdle(wxIdleEvent& event) bool wxApp::SendIdleEvents() { bool needMore = FALSE; - wxNode* node = wxTopLevelWindows.First(); + + wxWindowList::Node* node = wxTopLevelWindows.GetFirst(); while (node) { - wxWindow* win = (wxWindow*) node->Data(); + wxWindow* win = node->GetData(); if (SendIdleEvents(win)) needMore = TRUE; - - node = node->Next(); + node = node->GetNext(); } return needMore; @@ -981,43 +1005,43 @@ bool wxApp::SendIdleEvents() // Send idle event to window and all subwindows bool wxApp::SendIdleEvents(wxWindow* win) { - bool needMore = FALSE; + bool needMore = FALSE; - wxIdleEvent event; - event.SetEventObject(win); - win->GetEventHandler()->ProcessEvent(event); + wxIdleEvent event; + event.SetEventObject(win); + win->GetEventHandler()->ProcessEvent(event); - if (event.MoreRequested()) - needMore = TRUE; + if (event.MoreRequested()) + needMore = TRUE; - wxNode* node = win->GetChildren().First(); - while (node) - { - wxWindow* win = (wxWindow*) node->Data(); - if (SendIdleEvents(win)) - needMore = TRUE; + wxNode* node = win->GetChildren().First(); + while (node) + { + wxWindow* win = (wxWindow*) node->Data(); + if (SendIdleEvents(win)) + needMore = TRUE; - node = node->Next(); - } - return needMore ; + node = node->Next(); + } + return needMore; } void wxApp::DeletePendingObjects() { - wxNode *node = wxPendingDelete.First(); - while (node) - { - wxObject *obj = (wxObject *)node->Data(); + wxNode *node = wxPendingDelete.First(); + while (node) + { + wxObject *obj = (wxObject *)node->Data(); - delete obj; + delete obj; - if (wxPendingDelete.Member(obj)) - delete node; + if (wxPendingDelete.Member(obj)) + delete node; - // Deleting one object may have deleted other pending - // objects, so start from beginning of list again. - node = wxPendingDelete.First(); - } + // Deleting one object may have deleted other pending + // objects, so start from beginning of list again. + node = wxPendingDelete.First(); + } } void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event)) @@ -1046,8 +1070,8 @@ wxWindow* wxApp::GetTopWindow() const { if (m_topWindow) return m_topWindow; - else if (wxTopLevelWindows.Number() > 0) - return (wxWindow*) wxTopLevelWindows.First()->Data(); + else if (wxTopLevelWindows.GetCount() > 0) + return wxTopLevelWindows.GetFirst()->GetData(); else return NULL; } @@ -1055,7 +1079,7 @@ wxWindow* wxApp::GetTopWindow() const int wxApp::GetComCtl32Version() const { // have we loaded COMCTL32 yet? - HMODULE theModule = ::GetModuleHandle("COMCTL32"); + HMODULE theModule = ::GetModuleHandle(_T("COMCTL32")); int version = 0; // if so, then we can check for the version @@ -1066,30 +1090,30 @@ int wxApp::GetComCtl32Version() const if (! theProc) { // not found, must be 4.00 - version = 400; + version = 400; } else { - // The following symbol are unique to 4.71 - // DllInstall - // FlatSB_EnableScrollBar FlatSB_GetScrollInfo FlatSB_GetScrollPos - // FlatSB_GetScrollProp FlatSB_GetScrollRange FlatSB_SetScrollInfo - // FlatSB_SetScrollPos FlatSB_SetScrollProp FlatSB_SetScrollRange - // FlatSB_ShowScrollBar - // _DrawIndirectImageList _DuplicateImageList - // InitializeFlatSB - // UninitializeFlatSB - // we could check for any of these - I chose DllInstall - FARPROC theProc = ::GetProcAddress(theModule, "DllInstall"); - if (! theProc) - { - // not found, must be 4.70 - version = 470; - } - else - { // found, must be 4.71 - version = 471; - } + // The following symbol are unique to 4.71 + // DllInstall + // FlatSB_EnableScrollBar FlatSB_GetScrollInfo FlatSB_GetScrollPos + // FlatSB_GetScrollProp FlatSB_GetScrollRange FlatSB_SetScrollInfo + // FlatSB_SetScrollPos FlatSB_SetScrollProp FlatSB_SetScrollRange + // FlatSB_ShowScrollBar + // _DrawIndirectImageList _DuplicateImageList + // InitializeFlatSB + // UninitializeFlatSB + // we could check for any of these - I chose DllInstall + FARPROC theProc = ::GetProcAddress(theModule, "DllInstall"); + if (! theProc) + { + // not found, must be 4.70 + version = 470; + } + else + { // found, must be 4.71 + version = 471; + } } } return version; @@ -1097,32 +1121,46 @@ int wxApp::GetComCtl32Version() const void wxExit() { - wxApp::CleanUp(); - FatalAppExit(0, "Fatal error: exiting"); + wxLogError(_("Fatal error: exiting")); + + wxApp::CleanUp(); } // Yield to incoming messages bool wxYield() { - MSG msg; - // We want to go back to the main message loop - // if we see a WM_QUIT. (?) - while (PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE) && msg.message != WM_QUIT) - { - if ( !wxTheApp->DoMessage() ) - break; - } - - return TRUE; + MSG msg; + // We want to go back to the main message loop + // if we see a WM_QUIT. (?) +#ifdef __WXWINE__ + while (PeekMessage(&msg, (HWND)NULL, 0, 0, PM_NOREMOVE) && msg.message != WM_QUIT) +#else + while (PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE) && msg.message != WM_QUIT) +#endif + { + if ( !wxTheApp->DoMessage() ) + break; + } + // If they are pending events, we must process them. +#if wxUSE_THREADS + wxTheApp->ProcessPendingEvents(); +#endif + + return TRUE; } HINSTANCE wxGetInstance() { - return wxhInstance; + return wxhInstance; +} + +void wxSetInstance(HINSTANCE hInst) +{ + wxhInstance = hInst; } // For some reason, with MSVC++ 1.5, WinMain isn't linked in properly // if in a separate file. So include it here to ensure it's linked. -#if (defined(_MSC_VER) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__TWIN32__)) - #include "main.cpp" +#if (defined(__VISUALC__) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__TWIN32__)) +#include "main.cpp" #endif