X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c089c47f344926e2f95a8aa342992ed844fe609..8870c26ecb03e87065fdb3617b8c47ca3c923a53:/src/msw/app.cpp diff --git a/src/msw/app.cpp b/src/msw/app.cpp index 4c9218cb88..de98ccfba2 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -6,7 +6,7 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -14,7 +14,6 @@ #endif // For compilers that support precompilation, includes "wx.h". -#define IN_WX_MAIN_CPP #include "wx/wxprec.h" #if defined(__BORLANDC__) @@ -22,146 +21,262 @@ #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/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" #endif #include "wx/msw/private.h" -#include "wx/postscrp.h" #include "wx/log.h" #include "wx/module.h" -#if USE_WX_RESOURCES -#include "wx/resource.h" +#if wxUSE_THREADS + #include "wx/thread.h" + + // define the array of MSG strutures + WX_DECLARE_OBJARRAY(MSG, wxMsgArray); + + #include "wx/arrimpl.cpp" + + WX_DEFINE_OBJARRAY(wxMsgArray); +#endif // wxUSE_THREADS + +#if wxUSE_WX_RESOURCES + #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__) +#include #endif +// #endif #include +#include -#if defined(__WIN95__) && !defined(__GNUWIN32__) -#include +#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) + #include +#endif + +// use debug CRT functions for memory leak detections in VC++ if we're not +// using wxWindows own methods +#if defined(__WXDEBUG__) && defined(_MSC_VER) && !wxUSE_GLOBAL_MEMORY_OPERATORS && !defined(__NO_VC_CRTDBG__) + #define wxUSE_VC_CRTDBG +#else + #undef wxUSE_VC_CRTDBG #endif +#ifdef wxUSE_VC_CRTDBG + // VC++ uses this macro as debug/release mode indicator + #ifndef _DEBUG + #define _DEBUG + #endif + + /* Need to undef new if including crtdbg.h */ + #ifdef new + #undef new + #endif + + #include + + #if defined(__WXDEBUG__) && wxUSE_GLOBAL_MEMORY_OPERATORS && wxUSE_DEBUG_NEW_ALWAYS + #define new new(__FILE__,__LINE__) + #endif +#endif // wxUSE_VC_CRTDBG + extern char *wxBuffer; extern char *wxOsVersion; extern wxList *wxWinHandleList; -extern wxList wxPendingDelete; +extern wxList WXDLLEXPORT wxPendingDelete; extern void wxSetKeyboardHook(bool doIt); extern wxCursor *g_globalCursor; -HANDLE wxhInstance = 0; +HINSTANCE wxhInstance = 0; static 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"; -HICON wxSTD_FRAME_ICON = NULL; -HICON wxSTD_MDICHILDFRAME_ICON = NULL; -HICON wxSTD_MDIPARENTFRAME_ICON = NULL; +HICON wxSTD_FRAME_ICON = (HICON) NULL; +HICON wxSTD_MDICHILDFRAME_ICON = (HICON) NULL; +HICON wxSTD_MDIPARENTFRAME_ICON = (HICON) NULL; -HICON wxDEFAULT_FRAME_ICON = NULL; -HICON wxDEFAULT_MDICHILDFRAME_ICON = NULL; -HICON wxDEFAULT_MDIPARENTFRAME_ICON = NULL; +HICON wxDEFAULT_FRAME_ICON = (HICON) NULL; +HICON wxDEFAULT_MDICHILDFRAME_ICON = (HICON) NULL; +HICON wxDEFAULT_MDIPARENTFRAME_ICON = (HICON) NULL; -HBRUSH wxDisableButtonBrush = 0; +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) -END_EVENT_TABLE() + 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; -#ifdef __WIN95__ -static HINSTANCE gs_hRichEdit = NULL; +#if defined(__WIN95__) && !defined(__TWIN32__) +#define wxUSE_RICHEDIT 1 +#else +#define wxUSE_RICHEDIT 0 #endif -bool wxApp::Initialize(WXHANDLE instance) +#if wxUSE_RICHEDIT + static HINSTANCE gs_hRichEdit = (HINSTANCE) NULL; +#endif + +//// Initialize + +bool wxApp::Initialize() { - HANDLE hInstance = (HANDLE)instance; + // Some people may wish to use this, but + // probably it shouldn't be here by default. +#ifdef __WXDEBUG__ +// wxRedirectIOToConsole(); +#endif + + wxBuffer = new char[1500]; + +#ifdef wxUSE_VC_CRTDBG + // do check for memory leaks on program exit + // (another useful flag is _CRTDBG_DELAY_FREE_MEM_DF which doesn't free + // deallocated memory which may be used to simulate low-memory condition) + _CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | _CRTDBG_LEAK_CHECK_DF); +#endif // debug build under MS VC++ + + wxClassInfo::InitializeClasses(); + +#if wxUSE_RESOURCES + wxGetResource("wxWindows", "OsVersion", &wxOsVersion); +#endif + + wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); + wxTheColourDatabase->Initialize(); + + wxInitializeStockLists(); + wxInitializeStockObjects(); + +#if wxUSE_WX_RESOURCES + wxInitializeResourceSystem(); +#endif - CommonInit(); + wxBitmap::InitStandardHandlers(); #if defined(__WIN95__) - InitCommonControls(); - gs_hRichEdit = LoadLibrary("RICHED32.DLL"); + InitCommonControls(); - if (gs_hRichEdit == NULL) - { - wxMessageBox("Could not initialise Rich Edit DLL"); - } +#if wxUSE_RICHEDIT + gs_hRichEdit = LoadLibrary("RICHED32.DLL"); + + if (gs_hRichEdit == (HINSTANCE) NULL) + { + wxMessageBox("Could not initialise Rich Edit DLL"); + } #endif -#if defined(WX_DRAG_DROP) - // we need to initialize OLE library - if ( FAILED(::OleInitialize(NULL)) ) - wxFatalError(_("Cannot initialize OLE")); +#endif + + int iMsg = 96; + + // 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__) + // we need to initialize OLE library + if ( FAILED(::OleInitialize(NULL)) ) + wxFatalError(_("Cannot initialize OLE")); #endif #if CTL3D - if (!Ctl3dRegister(hInstance)) - wxFatalError("Cannot register CTL3D"); + if (!Ctl3dRegister(wxhInstance)) + wxFatalError("Cannot register CTL3D"); - Ctl3dAutoSubclass(hInstance); + Ctl3dAutoSubclass(wxhInstance); #endif - wxSTD_FRAME_ICON = LoadIcon(hInstance, "wxSTD_FRAME"); - wxSTD_MDIPARENTFRAME_ICON = LoadIcon(hInstance, "wxSTD_MDIPARENTFRAME"); - wxSTD_MDICHILDFRAME_ICON = LoadIcon(hInstance, "wxSTD_MDICHILDFRAME"); + g_globalCursor = new wxCursor; - wxDEFAULT_FRAME_ICON = LoadIcon(hInstance, "wxDEFAULT_FRAME"); - wxDEFAULT_MDIPARENTFRAME_ICON = LoadIcon(hInstance, "wxDEFAULT_MDIPARENTFRAME"); - wxDEFAULT_MDICHILDFRAME_ICON = LoadIcon(hInstance, "wxDEFAULT_MDICHILDFRAME"); + wxSTD_FRAME_ICON = LoadIcon(wxhInstance, "wxSTD_FRAME"); + wxSTD_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, "wxSTD_MDIPARENTFRAME"); + wxSTD_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, "wxSTD_MDICHILDFRAME"); - RegisterWindowClasses(); + wxDEFAULT_FRAME_ICON = LoadIcon(wxhInstance, "wxDEFAULT_FRAME"); + wxDEFAULT_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, "wxDEFAULT_MDIPARENTFRAME"); + wxDEFAULT_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, "wxDEFAULT_MDICHILDFRAME"); - // Create the brush for disabling bitmap buttons + RegisterWindowClasses(); - LOGBRUSH lb ; - lb.lbStyle = BS_PATTERN; - lb.lbHatch = (int)LoadBitmap( hInstance, "wxDISABLE_BUTTON_BITMAP" ) ; - wxDisableButtonBrush = ::CreateBrushIndirect( & lb ) ; - ::DeleteObject( (HGDIOBJ)lb.lbHatch ) ; + // Create the brush for disabling bitmap buttons -#if USE_PENWINDOWS - wxRegisterPenWin(); + LOGBRUSH lb ; + lb.lbStyle = BS_PATTERN; + lb.lbHatch = (int)LoadBitmap( wxhInstance, "wxDISABLE_BUTTON_BITMAP" ) ; + wxDisableButtonBrush = ::CreateBrushIndirect( & lb ) ; + ::DeleteObject( (HGDIOBJ)lb.lbHatch ) ; + +#if wxUSE_PENWINDOWS + wxRegisterPenWin(); #endif - wxWinHandleList = new wxList(wxKEY_INTEGER); + wxWinHandleList = new wxList(wxKEY_INTEGER); - // This is to foil optimizations in Visual C++ that - // throw out dummy.obj. -#if (_MSC_VER >= 800) && !defined(WXMAKINGDLL) - extern char wxDummyChar; - if (wxDummyChar) wxDummyChar++; + // This is to foil optimizations in Visual C++ that + // throw out dummy.obj. + // PLEASE DO NOT ALTER THIS. +#if defined(_MSC_VER) && !defined(WXMAKINGDLL) + extern char wxDummyChar; + if (wxDummyChar) wxDummyChar++; #endif - wxSetKeyboardHook(TRUE); - wxModule::RegisterModules(); - if (!wxModule::InitializeModules()) - return FALSE; - return TRUE; + wxSetKeyboardHook(TRUE); + + wxModule::RegisterModules(); + if (!wxModule::InitializeModules()) + return FALSE; + return TRUE; } -bool wxApp::RegisterWindowClasses(void) +//// RegisterWindowClasses + +bool wxApp::RegisterWindowClasses() { /////////////////////////////////////////////////////////////////////// // Register the frame window class. @@ -172,13 +287,13 @@ bool wxApp::RegisterWindowClasses(void) wndclass.cbClsExtra = 0; wndclass.cbWndExtra = sizeof( DWORD ); // was 4 wndclass.hInstance = wxhInstance; - wndclass.hIcon = NULL; // wxSTD_FRAME_ICON; - wndclass.hCursor = LoadCursor( NULL, IDC_ARROW ); + 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; #ifdef _MULTIPLE_INSTANCES - sprintf( wxFrameClassName,"wxFrameClass%d", hInstance ); + sprintf( wxFrameClassName,"wxFrameClass%d", wxhInstance ); #endif wndclass.lpszClassName = wxFrameClassName; @@ -196,17 +311,17 @@ bool wxApp::RegisterWindowClasses(void) wndclass1.cbClsExtra = 0; wndclass1.cbWndExtra = sizeof( DWORD ); // was 4 wndclass1.hInstance = wxhInstance; - wndclass1.hIcon = NULL; // wxSTD_MDIPARENTFRAME_ICON; - wndclass1.hCursor = LoadCursor( NULL, IDC_ARROW ); + wndclass1.hIcon = (HICON) NULL; // wxSTD_MDIPARENTFRAME_ICON; + wndclass1.hCursor = LoadCursor( (HINSTANCE) NULL, IDC_ARROW ); // wndclass1.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE+1) ; - wndclass1.hbrBackground = NULL; + wndclass1.hbrBackground = (HBRUSH) NULL; wndclass1.lpszMenuName = NULL; wndclass1.lpszClassName = wxMDIFrameClassName; if (!RegisterClass( &wndclass1 )) { // wxFatalError("Can't register MDI Frame window class"); -// return FALSE; +// return FALSE; } /////////////////////////////////////////////////////////////////////// @@ -218,8 +333,8 @@ bool wxApp::RegisterWindowClasses(void) wndclass4.cbClsExtra = 0; wndclass4.cbWndExtra = sizeof( DWORD ); // was 4 wndclass4.hInstance = wxhInstance; - wndclass4.hIcon = NULL; // wxSTD_MDICHILDFRAME_ICON; - wndclass4.hCursor = LoadCursor( NULL, IDC_ARROW ); + 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?) @@ -245,10 +360,10 @@ bool wxApp::RegisterWindowClasses(void) wndclass2.cbClsExtra = 0; wndclass2.cbWndExtra = sizeof( DWORD ); // was 4 wndclass2.hInstance = wxhInstance; - wndclass2.hIcon = NULL; - wndclass2.hCursor = NULL; + wndclass2.hIcon = (HICON) NULL; + wndclass2.hCursor = (HCURSOR) NULL; // wndclass2.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1) ; - wndclass2.hbrBackground = GetStockObject( LTGRAY_BRUSH ); + wndclass2.hbrBackground = (HBRUSH) GetStockObject( LTGRAY_BRUSH ); wndclass2.lpszMenuName = NULL; wndclass2.lpszClassName = wxPanelClassName; if (!RegisterClass( &wndclass2 )) @@ -263,17 +378,17 @@ bool wxApp::RegisterWindowClasses(void) 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 ; +// wndclass3.style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC | CS_DBLCLKS ; // wxWin 2.0 - wndclass3.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS ; + 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 = NULL; - wndclass3.hCursor = NULL; + wndclass3.hIcon = (HICON) NULL; + wndclass3.hCursor = (HCURSOR) NULL; // wndclass3.hbrBackground = (HBRUSH)(COLOR_WINDOW+1) ; - wndclass3.hbrBackground = NULL; + wndclass3.hbrBackground = (HBRUSH) NULL; wndclass3.lpszMenuName = NULL; wndclass3.lpszClassName = wxCanvasClassName; if (!RegisterClass( &wndclass3)) @@ -285,21 +400,127 @@ bool wxApp::RegisterWindowClasses(void) return TRUE; } -// Cleans up any wxWindows internal structures left lying around -void wxApp::CleanUp(void) +//// Convert Windows to argc, argv style + +void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine) +{ + wxStringList args; + + wxString cmdLine(lpCmdLine); + int count = 0; + + // Get application name + char 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 + + strcpy(name, wxFileNameFromPath(name)); + wxStripExtension(name); + wxTheApp->SetAppName(name); + + // Break up string + // Treat strings enclosed in double-quotes as single arguments + int i = 0; + int len = cmdLine.Length(); + while (i < len) + { + // Skip whitespace + while ((i < len) && isspace(cmdLine.GetChar(i))) + i ++; + + if (i < len) + { + if (cmdLine.GetChar(i) == '"') // We found the start of a string + { + i ++; + int first = i; + while ((i < len) && (cmdLine.GetChar(i) != '"')) + i ++; + + wxString arg(cmdLine.Mid(first, (i - first))); + + args.Add(arg); + count ++; + + if (i < len) + i ++; // Skip past 2nd quote + } + else // Unquoted argument + { + int first = i; + while ((i < len) && !isspace(cmdLine.GetChar(i))) + i ++; + + wxString arg(cmdLine.Mid(first, (i - first))); + + args.Add(arg); + count ++; + } + } + } + + wxTheApp->argv = new char*[count + 1]; + for (i = 0; i < count; i++) + { + wxString arg(args[i]); + wxTheApp->argv[i] = copystring((const char*)arg); + } + wxTheApp->argv[count] = NULL; // argv[] is a NULL-terminated list + wxTheApp->argc = count; +} + +//// Cleans up any wxWindows internal structures left lying around + +void wxApp::CleanUp() { + //// COMMON CLEANUP wxModule::CleanUpModules(); - CommonCleanUp(); +#if wxUSE_WX_RESOURCES + wxCleanUpResourceSystem(); + +// 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; + + wxDeleteStockObjects() ; + + // Destroy all GDI lists, etc. + wxDeleteStockLists(); + + delete wxTheColourDatabase; + wxTheColourDatabase = NULL; + + wxBitmap::CleanUpHandlers(); + + delete[] wxBuffer; + wxBuffer = NULL; + + //// WINDOWS-SPECIFIC CLEANUP wxSetKeyboardHook(FALSE); #ifdef __WIN95__ - if (gs_hRichEdit != NULL) + +#if wxUSE_RICHEDIT + if (gs_hRichEdit != (HINSTANCE) NULL) FreeLibrary(gs_hRichEdit); #endif -#if USE_PENWINDOWS +#endif + +#if wxUSE_PENWINDOWS wxCleanUpPenWin(); #endif @@ -320,7 +541,7 @@ void wxApp::CleanUp(void) if ( wxDisableButtonBrush ) ::DeleteObject( wxDisableButtonBrush ) ; -#if defined(WX_DRAG_DROP) +#if !defined(__GNUWIN32__) && !defined(__SC__) && !defined(__SALFORDC__) ::OleUninitialize(); #endif @@ -330,297 +551,152 @@ void wxApp::CleanUp(void) if (wxWinHandleList) delete wxWinHandleList ; - - // do it as the very last thing because everything else can log messages - delete wxLog::SetActiveTarget(NULL); -} - -void wxApp::CommonInit(void) -{ -#ifdef __WINDOWS__ - wxBuffer = new char[1500]; -#else - wxBuffer = new char[BUFSIZ + 512]; -#endif - - wxClassInfo::InitializeClasses(); - -#ifdef __X__ - wxTheFontNameDirectory.Initialize(); -#endif - -#if defined(__X__) && USE_RESOURCES - // Read standard font names from .Xdefaults - - extern char *wxDecorativeFontName; - extern char *wxRomanFontName; - extern char *wxModernFontName; - extern char *wxSwissFontName; - extern char *wxScriptFontName; - extern char *wxTeletypeFontName; - extern char *wxDefaultFontName; - - (void) wxGetResource("wxWindows", "defaultFamily", &wxDefaultFontName); - (void) wxGetResource("wxWindows", "decorativeFamily", &wxDecorativeFontName); - (void) wxGetResource("wxWindows", "romanFamily", &wxRomanFontName); - (void) wxGetResource("wxWindows", "modernFamily", &wxModernFontName); - (void) wxGetResource("wxWindows", "swissFamily", &wxSwissFontName); - (void) wxGetResource("wxWindows", "scriptFamily", &wxScriptFontName); - (void) wxGetResource("wxWindows", "teletypeFamily", &wxTeletypeFontName); -#endif - -#if USE_RESOURCES - (void) wxGetResource("wxWindows", "OsVersion", &wxOsVersion); -#endif - - wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); - wxTheColourDatabase->Initialize(); - wxInitializeStockObjects(); - -#if USE_WX_RESOURCES - wxInitializeResourceSystem(); -#endif - - // For PostScript printing -#if USE_POSTSCRIPT - wxInitializePrintSetupData(); - wxThePrintPaperDatabase = new wxPrintPaperDatabase; - wxThePrintPaperDatabase->CreateDatabase(); -#endif - - wxBitmap::InitStandardHandlers(); - g_globalCursor = new wxCursor; -} + wxClassInfo::CleanUpClasses(); -void wxApp::CommonCleanUp(void) -{ -#if USE_WX_RESOURCES - wxCleanUpResourceSystem(); - -// 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; - - wxDeleteStockObjects() ; - - // Destroy all GDI lists, etc. - delete wxTheBrushList; - wxTheBrushList = NULL; - - delete wxThePenList; - wxThePenList = NULL; - - delete wxTheFontList; - wxTheFontList = NULL; - - delete wxTheBitmapList; - wxTheBitmapList = NULL; - - delete wxTheColourDatabase; - wxTheColourDatabase = NULL; + delete wxTheApp; + wxTheApp = NULL; -#if USE_POSTSCRIPT - wxInitializePrintSetupData(FALSE); - delete wxThePrintPaperDatabase; - wxThePrintPaperDatabase = 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); #endif - wxBitmap::CleanUpHandlers(); - - delete[] wxBuffer; - wxBuffer = NULL; + // do it as the very last thing because everything else can log messages + wxLog::DontCreateOnDemand(); + delete wxLog::SetActiveTarget(NULL); } #if !defined(_WINDLL) || (defined(_WINDLL) && defined(WXMAKINGDLL)) -// Main wxWindows entry point - -int wxEntry(WXHINSTANCE hInstance, WXHINSTANCE WXUNUSED(hPrevInstance), char *m_lpCmdLine, - int nCmdShow, bool enterLoop) +// temporarily disable this warning +#ifdef _MSC_VER + #pragma warning(disable: 4715) // not all control paths return a value +#endif // Visual C++ + +//// Main wxWindows entry point +int wxEntry(WXHINSTANCE hInstance, + WXHINSTANCE WXUNUSED(hPrevInstance), + char *lpCmdLine, + int nCmdShow, + bool enterLoop) { - wxhInstance = (HINSTANCE) hInstance; - -#if (DEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT - -#if !defined(_WINDLL) - streambuf* sBuf = new wxDebugStreamBuf; + // 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) + #define CATCH_PROGRAM_EXCEPTIONS + + __try { #else - streambuf* sBuf = NULL; + #undef CATCH_PROGRAM_EXCEPTIONS #endif - ostream* oStr = new ostream(sBuf) ; - wxDebugContext::SetStream(oStr, sBuf); -#endif + wxhInstance = (HINSTANCE) hInstance; - if (!wxApp::Initialize((WXHINSTANCE) wxhInstance)) + if (!wxApp::Initialize()) return 0; - // 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. + // create the application object or ensure that one already exists if (!wxTheApp) { - if (!wxApp::GetInitializerFunction()) - { - MessageBox(NULL, "No initializer - use IMPLEMENT_APP macro.", "wxWindows Error", MB_APPLMODAL | MB_ICONSTOP | MB_OK); - return 0; - } - - 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; - } - - // Split command line into tokens, as in usual main(argc, argv) - char **command = new char*[50]; - - int count = 0; - char *buf = new char[strlen(m_lpCmdLine) + 1]; - - // Hangs around until end of app. in case - // user carries pointers to the tokens + // 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." ); - /* Model independent strcpy */ - int i; - for (i = 0; (buf[i] = m_lpCmdLine[i]) != 0; i++) - { - /* loop */; + wxTheApp = (*wxApp::GetInitializerFunction()) (); } - // Get application name - char name[200]; - ::GetModuleFileName(wxhInstance, name, 199); - - // Is it only 16-bit Borland that already copies the program name - // to the first argv index? -#if !defined(__GNUWIN32__) -// #if ! (defined(__BORLANDC__) && !defined(__WIN32__)) - command[count++] = copystring(name); -// #endif -#endif + wxCHECK_MSG( wxTheApp, 0, "You have to define an instance of wxApp!" ); - strcpy(name, wxFileNameFromPath(name)); - wxStripExtension(name); - wxTheApp->SetAppName(name); - - /* Break up string */ - // Treat strings enclosed in double-quotes as single arguments - char* str = buf; - while (*str) - { - while (*str && *str <= ' ') str++; // skip whitespace - if (*str == '"') - { - str++; - command[count++] = str; - while (*str && *str != '"') str++; - } - else if (*str) - { - command[count++] = str; - while (*str && *str > ' ') str++; - } - if (*str) *str++ = '\0'; - } - command[count] = NULL; /* argv[] is NULL terminated list! */ - - wxTheApp->argc = count; - wxTheApp->argv = command; + // 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() ; - if (!wxTheApp->OnInit()) - { - wxTheApp->DeletePendingObjects(); - wxTheApp->OnExit(); - wxApp::CleanUp(); - - delete wxTheApp; - wxTheApp = NULL; + int retValue = 0; - delete [] buf ; - - // TODO: This should really be cleaned up in ~wxApp - delete [] command[0] ; - delete [] command ; - return 0; + if ( wxTheApp->OnInit() ) + { + if ( enterLoop ) + { + retValue = wxTheApp->OnRun(); + } } + //else: app initialization failed, so we skipped OnRun() - if (!enterLoop) - return 0; + 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); + } + } - int retValue = 1; + wxTheApp->OnExit(); -/* New behaviour - leave it to the app to show the top window - if (wxTheApp->GetTopWindow()) { - // show the toplevel frame, only if we are not iconized (from MS-Windows) - if(wxTheApp->GetShowFrameOnInit() && (nCmdShow!=SW_HIDE)) wxTheApp->GetTopWindow()->Show(TRUE); - } -*/ + // flush the logged messages if any + wxLog *pLog = wxLog::GetActiveTarget(); + if ( pLog != NULL && pLog->HasPendingMessages() ) + pLog->Flush(); - retValue = wxTheApp->OnRun(); - if (wxTheApp->GetTopWindow()) - { - // Forcibly delete the window. - if (wxTheApp->GetTopWindow()->IsKindOf(CLASSINFO(wxFrame)) || - wxTheApp->GetTopWindow()->IsKindOf(CLASSINFO(wxDialog))) - { - wxTheApp->GetTopWindow()->Close(TRUE); - wxTheApp->DeletePendingObjects(); - } - else - { - delete wxTheApp->GetTopWindow(); - wxTheApp->SetTopWindow(NULL); - } - } - - wxTheApp->OnExit(); wxApp::CleanUp(); - delete wxTheApp; - wxTheApp = NULL; - - delete [] buf ; - delete [] command[0] ; - delete [] command ; + return retValue; -#if (DEBUG && USE_MEMORY_TRACING) || USE_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) - { - wxTrace("There were memory leaks.\n"); - wxDebugContext::Dump(); - wxDebugContext::PrintStatistics(); +#ifdef CATCH_PROGRAM_EXCEPTIONS } - wxDebugContext::SetStream(NULL, NULL); -#endif + __except ( EXCEPTION_EXECUTE_HANDLER ) { + /* + if ( wxTheApp ) + wxTheApp->OnFatalException(); + */ - return retValue; + ::ExitProcess(3); // the same exit code as abort() + + // NOTREACHED + } +#endif // CATCH_PROGRAM_EXCEPTIONS } +// restore warning state +#ifdef _MSC_VER + #pragma warning(default: 4715) // not all control paths return a value +#endif // Visual C++ + #else /* _WINDLL */ +//// Entry point for DLLs + int wxEntry(WXHINSTANCE hInstance) { wxhInstance = (HINSTANCE) hInstance; - wxApp::Initialize((WXHINSTANCE) wxhInstance); + 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 @@ -628,13 +704,13 @@ int wxEntry(WXHINSTANCE hInstance) if (!wxTheApp) { - if (!wxApp::GetInitializerFunction()) - { - MessageBox(NULL, "No initializer - use IMPLEMENT_APP macro.", "wxWindows Error", MB_APPLMODAL | MB_ICONSTOP | MB_OK); - return 0; - } + if (!wxApp::GetInitializerFunction()) + { + MessageBox(NULL, "No initializer - use IMPLEMENT_APP macro.", "wxWindows Error", MB_APPLMODAL | MB_ICONSTOP | MB_OK); + return 0; + } - wxTheApp = (* wxApp::GetInitializerFunction()) (); + wxTheApp = (* wxApp::GetInitializerFunction()) (); } if (!wxTheApp) { @@ -657,33 +733,40 @@ int wxEntry(WXHINSTANCE hInstance) } #endif // _WINDLL -// Static member initialization +//// Static member initialization + wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL; -wxApp::wxApp(void) +wxApp::wxApp() { m_topWindow = NULL; wxTheApp = this; -// work_proc = NULL ; m_className = ""; -// m_resourceCollection = TRUE; -// m_pendingCleanup = FALSE; m_wantDebugOutput = TRUE ; m_appName = ""; argc = 0; argv = NULL; -#ifdef __WINDOWS__ +#ifdef __WXMSW__ m_printMode = wxPRINT_WINDOWS; #else m_printMode = wxPRINT_POSTSCRIPT; #endif -// work_proc = NULL; m_exitOnFrameDelete = TRUE; -// m_showOnInit = TRUE; m_auto3D = TRUE; } -bool wxApp::Initialized(void) +wxApp::~wxApp() +{ + // Delete command-line args + int i; + for (i = 0; i < argc; i++) + { + delete[] argv[i]; + } + delete[] argv; +} + +bool wxApp::Initialized() { #ifndef _WINDLL if (GetTopWindow()) @@ -698,24 +781,88 @@ bool wxApp::Initialized(void) /* * Get and process a message, returning FALSE if WM_QUIT - * received. + * received (and also set the flag telling the app to exit the main loop) * */ -bool wxApp::DoMessage(void) +bool wxApp::DoMessage() { - if (!::GetMessage(&s_currentMsg, (HWND) NULL, 0, 0)) - { - return FALSE; - } - - // Process the message - if (!ProcessMessage((WXMSG *)&s_currentMsg)) - { - ::TranslateMessage(&s_currentMsg); - wxApp::sm_lastMessageTime = s_currentMsg.time; /* MATTHEW: timeStamp impl. */ - ::DispatchMessage(&s_currentMsg); - } - return TRUE; + BOOL rc = ::GetMessage(&s_currentMsg, (HWND) NULL, 0, 0); + if ( rc == 0 ) + { + // got WM_QUIT + m_keepGoing = FALSE; + + return FALSE; + } + else if ( rc == -1 ) + { + // should never happen, but let's test for it nevertheless + wxLogLastError("GetMessage"); + } + else + { +#if wxUSE_THREADS + wxASSERT_MSG( wxThread::IsMain(), + "only the main thread can process Windows messages" ); + + static bool s_hadGuiLock = TRUE; + static wxMsgArray s_aSavedMessages; + + // if a secondary thread owns is doing GUI calls, save all messages for + // later processing - we can't process them right now because it will + // lead to recursive library calls (and we're not reentrant) + if ( !wxGuiOwnedByMainThread() ) + { + s_hadGuiLock = FALSE; + + // leave out WM_COMMAND messages: too dangerous, sometimes + // the message will be processed twice + if ( !wxIsWaitingForThread() || + s_currentMsg.message != WM_COMMAND ) + { + s_aSavedMessages.Add(s_currentMsg); + } + + return TRUE; + } + else + { + // have we just regained the GUI lock? if so, post all of the saved + // messages + // + // FIXME of course, it's not _exactly_ the same as processing the + // messages normally - expect some things to break... + if ( !s_hadGuiLock ) + { + s_hadGuiLock = TRUE; + + size_t count = s_aSavedMessages.Count(); + for ( size_t n = 0; n < count; n++ ) + { + MSG& msg = s_aSavedMessages[n]; + + if ( !ProcessMessage((WXMSG *)&msg) ) + { + ::TranslateMessage(&msg); + ::DispatchMessage(&msg); + } + } + + s_aSavedMessages.Empty(); + } + } +#endif // wxUSE_THREADS + + // Process the message + if ( !ProcessMessage((WXMSG *)&s_currentMsg) ) + { + ::TranslateMessage(&s_currentMsg); + wxApp::sm_lastMessageTime = s_currentMsg.time; /* MATTHEW: timeStamp impl. */ + ::DispatchMessage(&s_currentMsg); + } + } + + return TRUE; } /* @@ -732,22 +879,29 @@ bool wxApp::DoMessage(void) * are processed (it'll sit in DoMessage). */ -int wxApp::MainLoop(void) +int wxApp::MainLoop() { m_keepGoing = TRUE; - while (m_keepGoing) + + while ( m_keepGoing ) { - while (!::PeekMessage(&s_currentMsg, 0, 0, 0, PM_NOREMOVE) && - ProcessIdle()) {} - if (!DoMessage()) - m_keepGoing = FALSE; + #if wxUSE_THREADS + wxMutexGuiLeaveOrEnter(); + #endif // wxUSE_THREADS + + while ( !::PeekMessage(&s_currentMsg, 0, 0, 0, PM_NOREMOVE) && + ProcessIdle() ) + { + } + + DoMessage(); } return s_currentMsg.wParam; } // Returns TRUE if more time is needed. -bool wxApp::ProcessIdle(void) +bool wxApp::ProcessIdle() { wxIdleEvent event; event.SetEventObject(this); @@ -756,20 +910,19 @@ bool wxApp::ProcessIdle(void) return event.MoreRequested(); } -void wxApp::ExitMainLoop(void) +void wxApp::ExitMainLoop() { m_keepGoing = FALSE; } -bool wxApp::Pending(void) +bool wxApp::Pending() { return (::PeekMessage(&s_currentMsg, 0, 0, 0, PM_NOREMOVE) != 0) ; } -void wxApp::Dispatch(void) +void wxApp::Dispatch() { - if (!DoMessage()) - m_keepGoing = FALSE; + DoMessage(); } /* @@ -783,116 +936,108 @@ bool wxApp::ProcessMessage(WXMSG *Msg) HWND hWnd; - // Anyone for a message? Try youngest descendants first. - for (hWnd = msg->hwnd; hWnd != NULL; hWnd = ::GetParent(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) { - if (wnd->MSWProcessMessage(Msg)) + if (wnd->MSWTranslateMessage(Msg)) return TRUE; - - // STOP if we've reached the top of the hierarchy! -// if (m_topWindow && (wnd == m_topWindow)) -// return FALSE; } } - // TODO: Is this now obsolete, given that m_topWindow may not be defined? - // Does it do anything useful anyway? -// if (m_topWindow && m_topWindow->MSWProcessMessage(Msg)) -// return TRUE; - return FALSE; + // 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) + { + if (wnd->MSWProcessMessage(Msg)) + return TRUE; + } + } + return FALSE; } void wxApp::OnIdle(wxIdleEvent& event) { - static bool inOnIdle = FALSE; + static bool s_inOnIdle = FALSE; - // Avoid recursion (via ProcessEvent default case) - if (inOnIdle) - return; + // Avoid recursion (via ProcessEvent default case) + if ( s_inOnIdle ) + return; - inOnIdle = TRUE; + s_inOnIdle = TRUE; - // 'Garbage' collection of windows deleted with Close(). - DeletePendingObjects(); + // 'Garbage' collection of windows deleted with Close(). + DeletePendingObjects(); - // flush the logged messages if any - wxLog *pLog = wxLog::GetActiveTarget(); - if ( pLog != NULL && pLog->HasPendingMessages() ) - pLog->Flush(); - - // Send OnIdle events to all windows - bool needMore = SendIdleEvents(); -// bool needMore = FALSE; + // flush the logged messages if any + wxLog *pLog = wxLog::GetActiveTarget(); + if ( pLog != NULL && pLog->HasPendingMessages() ) + pLog->Flush(); - if (needMore) - event.RequestMore(TRUE); + // Send OnIdle events to all windows + if ( SendIdleEvents() ) + { + // SendIdleEvents() returns TRUE if at least one window requested more + // idle events + event.RequestMore(TRUE); + } - inOnIdle = FALSE; + s_inOnIdle = FALSE; } // Send idle event to all top-level windows -bool wxApp::SendIdleEvents(void) +bool wxApp::SendIdleEvents() { bool needMore = FALSE; - wxNode* node = wxTopLevelWindows.First(); - while (node) - { - wxWindow* win = (wxWindow*) node->Data(); - if (SendIdleEvents(win)) + wxNode* node = wxTopLevelWindows.First(); + while (node) + { + wxWindow* win = (wxWindow*) node->Data(); + if (SendIdleEvents(win)) needMore = TRUE; - node = node->Next(); - } + node = node->Next(); + } + return needMore; } // 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->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; - - node = node->Next(); - } - return needMore ; -} + wxNode* node = win->GetChildren().First(); + while (node) + { + wxWindow* win = (wxWindow*) node->Data(); + if (SendIdleEvents(win)) + needMore = TRUE; -// Windows specific. Intercept keyboard input: by default, -// route it to the active frame or dialog box. -#if WXWIN_COMPATIBILITY == 2 -bool wxApp::OldOnCharHook(wxKeyEvent& event) -{ - wxWindow *win = wxGetActiveWindow(); - if (win) - return win->GetEventHandler()->OldOnCharHook(event); - else - return FALSE; + node = node->Next(); + } + return needMore ; } -#endif -void wxApp::DeletePendingObjects(void) +void wxApp::DeletePendingObjects() { wxNode *node = wxPendingDelete.First(); while (node) { wxObject *obj = (wxObject *)node->Data(); - + delete obj; if (wxPendingDelete.Member(obj)) @@ -904,66 +1049,29 @@ void wxApp::DeletePendingObjects(void) } } -/* -// Free up font objects that are not being used at present. -bool wxApp::DoResourceCleanup(void) +void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event)) { -// wxDebugMsg("ResourceCleanup\n"); + if (GetTopWindow()) + GetTopWindow()->Close(TRUE); +} - if (wxTheFontList) - { - wxNode *node = wxTheFontList->First(); - while (node) - { - wxGDIObject *obj = (wxGDIObject *)node->Data(); - if ((obj->GetResourceHandle() != 0) && (obj->GetResourceUsage() == 0)) - { -// wxDebugMsg("Freeing font %ld (GDI object %d)\n", (long)obj, (int)obj->GetResourceHandle()); - obj->FreeResource(); - } - node = node->Next(); - } - } - if (wxThePenList) - { - wxNode *node = wxThePenList->First(); - while (node) - { - wxGDIObject *obj = (wxGDIObject *)node->Data(); - if ((obj->GetResourceHandle() != 0) && (obj->GetResourceUsage() == 0)) - { -// wxDebugMsg("Freeing pen %ld (GDI object %d)\n", (long)obj, (int)obj->GetResourceHandle()); - obj->FreeResource(); - } - node = node->Next(); - } - } - if (wxTheBrushList) - { - wxNode *node = wxTheBrushList->First(); - while (node) +// Default behaviour: close the application with prompts. The +// user can veto the close, and therefore the end session. +void wxApp::OnQueryEndSession(wxCloseEvent& event) +{ + if (GetTopWindow()) { - wxGDIObject *obj = (wxGDIObject *)node->Data(); - if ((obj->GetResourceHandle() != 0) && (obj->GetResourceUsage() == 0)) - { -// wxDebugMsg("Freeing brush %ld (GDI object %d)\n", (long)obj, (int)obj->GetResourceHandle()); - obj->FreeResource(); - } - node = node->Next(); + if (!GetTopWindow()->Close(!event.CanVeto())) + event.Veto(TRUE); } - } - - SetPendingCleanup(FALSE); - return FALSE; } -*/ -wxLog* wxApp::CreateLogTarget(void) +wxLog* wxApp::CreateLogTarget() { return new wxLogGui; } -wxWindow* wxApp::GetTopWindow(void) const +wxWindow* wxApp::GetTopWindow() const { if (m_topWindow) return m_topWindow; @@ -973,21 +1081,64 @@ wxWindow* wxApp::GetTopWindow(void) const return NULL; } -void wxExit(void) +int wxApp::GetComCtl32Version() const +{ + // have we loaded COMCTL32 yet? + HMODULE theModule = ::GetModuleHandle("COMCTL32"); + int version = 0; + + // if so, then we can check for the version + if (theModule) + { + // InitCommonControlsEx is unique to 4.7 and later + FARPROC theProc = ::GetProcAddress(theModule, "InitCommonControlsEx"); + + if (! theProc) + { // not found, must be 4.00 + 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; + } + } + } + return version; +} + +void wxExit() { wxApp::CleanUp(); FatalAppExit(0, "Fatal error: exiting"); } // Yield to incoming messages -bool wxYield(void) +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()) + if ( !wxTheApp->DoMessage() ) break; } @@ -996,14 +1147,11 @@ bool wxYield(void) HINSTANCE wxGetInstance() { - return wxhInstance; + return wxhInstance; } // 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__) -#include "main.cpp" +#if (defined(_MSC_VER) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__TWIN32__)) + #include "main.cpp" #endif - -#undef IN_WX_MAIN_CPP -