X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a781a38247a4e75c8c09d32e02161c72b6f029f0..803bf1c5818154dbff797029441c7de0d85339d5:/src/msw/app.cpp diff --git a/src/msw/app.cpp b/src/msw/app.cpp index f89afb5f73..cb88395f1a 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -6,34 +6,33 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ -#pragma implementation "app.h" + #pragma implementation "app.h" #endif // For compilers that support precompilation, includes "wx.h". -#define IN_WX_MAIN_CPP #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/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" #endif #include "wx/msw/private.h" @@ -42,19 +41,24 @@ #include "wx/module.h" #if USE_WX_RESOURCES -#include "wx/resource.h" + #include "wx/resource.h" #endif - #include +#include #if defined(__WIN95__) && !defined(__GNUWIN32__) -#include + #include #endif // use debug CRT functions for memory leak detections in VC++ -/* THIS CRAPS OUT in VC++ 5. +/* This still doesn't work for me, Vadim. #if defined(__WXDEBUG__) && defined(_MSC_VER) + // VC++ uses this macro as debug/release mode indicator + #ifndef _DEBUG + #define _DEBUG + #endif + #include #endif */ @@ -70,6 +74,7 @@ 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"; @@ -89,54 +94,102 @@ HBRUSH wxDisableButtonBrush = 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) + END_EVENT_TABLE() #endif long wxApp::sm_lastMessageTime = 0; #ifdef __WIN95__ -static HINSTANCE gs_hRichEdit = NULL; + static HINSTANCE gs_hRichEdit = NULL; #endif -bool wxApp::Initialize(WXHINSTANCE instance) +//// Initialize + +bool wxApp::Initialize() { - HINSTANCE hInstance = (HINSTANCE) instance; + wxBuffer = new char[1500]; - CommonInit(); +/* + #if defined(__WXDEBUG__) && defined(_MSC_VER) + // 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++ +*/ -#if defined(__WIN95__) - InitCommonControls(); - gs_hRichEdit = LoadLibrary("RICHED32.DLL"); + #if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT + #if defined(_WINDLL) + streambuf* sBuf = NULL; + #else // EXE + streambuf* sBuf = new wxDebugStreamBuf; + #endif // DLL - if (gs_hRichEdit == NULL) - { - wxMessageBox("Could not initialise Rich Edit DLL"); - } -#endif + ostream* oStr = new ostream(sBuf) ; + wxDebugContext::SetStream(oStr, sBuf); + #endif // USE_MEMORY_TRACING -#if defined(WX_DRAG_DROP) - // we need to initialize OLE library - if ( FAILED(::OleInitialize(NULL)) ) - wxFatalError(_("Cannot initialize OLE")); -#endif + wxClassInfo::InitializeClasses(); -#if CTL3D - if (!Ctl3dRegister(hInstance)) - wxFatalError("Cannot register CTL3D"); + #if USE_RESOURCES + wxGetResource("wxWindows", "OsVersion", &wxOsVersion); + #endif - Ctl3dAutoSubclass(hInstance); -#endif + wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); + wxTheColourDatabase->Initialize(); + + wxInitializeStockLists(); + wxInitializeStockObjects(); - wxSTD_FRAME_ICON = LoadIcon(hInstance, "wxSTD_FRAME"); - wxSTD_MDIPARENTFRAME_ICON = LoadIcon(hInstance, "wxSTD_MDIPARENTFRAME"); - wxSTD_MDICHILDFRAME_ICON = LoadIcon(hInstance, "wxSTD_MDICHILDFRAME"); + #if USE_WX_RESOURCES + wxInitializeResourceSystem(); + #endif - wxDEFAULT_FRAME_ICON = LoadIcon(hInstance, "wxDEFAULT_FRAME"); - wxDEFAULT_MDIPARENTFRAME_ICON = LoadIcon(hInstance, "wxDEFAULT_MDIPARENTFRAME"); - wxDEFAULT_MDICHILDFRAME_ICON = LoadIcon(hInstance, "wxDEFAULT_MDICHILDFRAME"); + // For PostScript printing + #if USE_POSTSCRIPT + wxInitializePrintSetupData(); + wxThePrintPaperDatabase = new wxPrintPaperDatabase; + wxThePrintPaperDatabase->CreateDatabase(); + #endif + + wxBitmap::InitStandardHandlers(); + + #if defined(__WIN95__) + InitCommonControls(); + gs_hRichEdit = LoadLibrary("RICHED32.DLL"); + + if (gs_hRichEdit == 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 + + #if CTL3D + if (!Ctl3dRegister(wxhInstance)) + wxFatalError("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"); + + wxDEFAULT_FRAME_ICON = LoadIcon(wxhInstance, "wxDEFAULT_FRAME"); + wxDEFAULT_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, "wxDEFAULT_MDIPARENTFRAME"); + wxDEFAULT_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, "wxDEFAULT_MDICHILDFRAME"); RegisterWindowClasses(); @@ -144,22 +197,23 @@ bool wxApp::Initialize(WXHINSTANCE instance) LOGBRUSH lb ; lb.lbStyle = BS_PATTERN; - lb.lbHatch = (int)LoadBitmap( hInstance, "wxDISABLE_BUTTON_BITMAP" ) ; + lb.lbHatch = (int)LoadBitmap( wxhInstance, "wxDISABLE_BUTTON_BITMAP" ) ; wxDisableButtonBrush = ::CreateBrushIndirect( & lb ) ; ::DeleteObject( (HGDIOBJ)lb.lbHatch ) ; -#if USE_PENWINDOWS - wxRegisterPenWin(); -#endif + #if USE_PENWINDOWS + wxRegisterPenWin(); + #endif 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++; -#endif + #if (_MSC_VER >= 800) && !defined(WXMAKINGDLL) + extern char wxDummyChar; + if (wxDummyChar) wxDummyChar++; + #endif + wxSetKeyboardHook(TRUE); wxModule::RegisterModules(); @@ -168,6 +222,8 @@ bool wxApp::Initialize(WXHINSTANCE instance) return TRUE; } +//// RegisterWindowClasses + bool wxApp::RegisterWindowClasses() { /////////////////////////////////////////////////////////////////////// @@ -185,7 +241,7 @@ bool wxApp::RegisterWindowClasses() // 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; @@ -213,7 +269,7 @@ bool wxApp::RegisterWindowClasses() if (!RegisterClass( &wndclass1 )) { // wxFatalError("Can't register MDI Frame window class"); -// return FALSE; +// return FALSE; } /////////////////////////////////////////////////////////////////////// @@ -292,95 +348,93 @@ bool wxApp::RegisterWindowClasses() return TRUE; } -// Cleans up any wxWindows internal structures left lying around -void wxApp::CleanUp() -{ - wxModule::CleanUpModules(); - - CommonCleanUp(); - - wxSetKeyboardHook(FALSE); - -#ifdef __WIN95__ - if (gs_hRichEdit != NULL) - FreeLibrary(gs_hRichEdit); -#endif - -#if USE_PENWINDOWS - 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 ) ; +//// Convert Windows to argc, argv style -#if defined(WX_DRAG_DROP) - ::OleUninitialize(); -#endif +// FIXME this code should be rewritten (use wxArrayString instead...) +void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine) +{ + // Split command line into tokens, as in usual main(argc, argv) + char **command = new char*[50]; // VZ: sure? why not 25 or 73 and a half?? -#if CTL3D - Ctl3dUnregister(wxhInstance); -#endif + int count = 0; + char *buf = new char[strlen(lpCmdLine) + 1]; - if (wxWinHandleList) - delete wxWinHandleList ; + /* Model independent strcpy */ + int i; + for (i = 0; (buf[i] = lpCmdLine[i]) != 0; i++) + { + /* loop */; + } - // do it as the very last thing because everything else can log messages - wxLog::DontCreateOnDemand(); - delete wxLog::SetActiveTarget(NULL); -} + // Get application name + char name[260]; // 260 is MAX_PATH value from windef.h + ::GetModuleFileName(wxhInstance, name, WXSIZEOF(name)); -void wxApp::CommonInit() -{ -#ifdef __WXMSW__ - wxBuffer = new char[1500]; -#else - wxBuffer = new char[BUFSIZ + 512]; + // 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 - wxClassInfo::InitializeClasses(); + strcpy(name, wxFileNameFromPath(name)); + wxStripExtension(name); + wxTheApp->SetAppName(name); -#if USE_RESOURCES - wxGetResource("wxWindows", "OsVersion", &wxOsVersion); -#endif + /* Break up string */ + // Treat strings enclosed in double-quotes as single arguments + char* str = buf; + while (*str) + { + if ( count == WXSIZEOF(command) ) + { + wxFAIL_MSG("too many command line args."); + break; + } - wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); - wxTheColourDatabase->Initialize(); + while ( *str && isspace(*str) ) // skip whitespace + str++; - wxInitializeStockLists(); - wxInitializeStockObjects(); + if (*str == '"') + { + str++; + command[count++] = str; + while (*str && *str != '"') + str++; + } + else if (*str) + { + command[count++] = str; + while (*str && !isspace(*str)) + str++; + } + if (*str) + *str++ = '\0'; + } -#if USE_WX_RESOURCES - wxInitializeResourceSystem(); -#endif + wxTheApp->argv = new char*[count + 1]; + wxTheApp->argv[count] = NULL; /* argv[] is NULL terminated list! */ + wxTheApp->argc = count; - // For PostScript printing -#if USE_POSTSCRIPT - wxInitializePrintSetupData(); - wxThePrintPaperDatabase = new wxPrintPaperDatabase; - wxThePrintPaperDatabase->CreateDatabase(); -#endif + for (i = 0; i < count; i++) + { + wxTheApp->argv[i] = copystring(command[i]); - wxBitmap::InitStandardHandlers(); + delete [] command[i]; + } - g_globalCursor = new wxCursor; + delete [] command; + delete [] buf; } -void wxApp::CommonCleanUp() +//// Cleans up any wxWindows internal structures left lying around + +void wxApp::CleanUp() { + //// COMMON CLEANUP + wxModule::CleanUpModules(); + #if USE_WX_RESOURCES wxCleanUpResourceSystem(); @@ -412,167 +466,121 @@ void wxApp::CommonCleanUp() delete[] wxBuffer; wxBuffer = NULL; -} -#if !defined(_WINDLL) || (defined(_WINDLL) && defined(WXMAKINGDLL)) + //// WINDOWS-SPECIFIC CLEANUP -// Main wxWindows entry point + wxSetKeyboardHook(FALSE); -int wxEntry(WXHINSTANCE hInstance, WXHINSTANCE WXUNUSED(hPrevInstance), char *m_lpCmdLine, - int nCmdShow, bool enterLoop) -{ - wxhInstance = (HINSTANCE) hInstance; +#ifdef __WIN95__ + if (gs_hRichEdit != NULL) + FreeLibrary(gs_hRichEdit); +#endif -/* No, sorry, whatever this is, forget it. Doesn't work with VC++ 5. +#if USE_PENWINDOWS + wxCleanUpPenWin(); +#endif - #if defined(__WXDEBUG__) && defined(_MSC_VER) - // 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++ -*/ + 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 (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT + 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 !defined(_WINDLL) - streambuf* sBuf = new wxDebugStreamBuf; -#else - streambuf* sBuf = NULL; + if ( wxDisableButtonBrush ) + ::DeleteObject( wxDisableButtonBrush ) ; + +#if defined(WX_DRAG_DROP) + ::OleUninitialize(); #endif - ostream* oStr = new ostream(sBuf) ; - wxDebugContext::SetStream(oStr, sBuf); -#endif // USE_MEMORY_TRACING +#if CTL3D + Ctl3dUnregister(wxhInstance); +#endif - if (!wxApp::Initialize((WXHINSTANCE) wxhInstance)) - return 0; + if (wxWinHandleList) + delete wxWinHandleList ; - // 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) - { - if (!wxApp::GetInitializerFunction()) - { - MessageBox(NULL, "No initializer - use IMPLEMENT_APP macro.", "wxWindows Error", MB_APPLMODAL | MB_ICONSTOP | MB_OK); - return 0; - } + wxClassInfo::CleanUpClasses(); - wxTheApp = (* wxApp::GetInitializerFunction()) (); - } + // do it as the very last thing because everything else can log messages + wxLog::DontCreateOnDemand(); + delete wxLog::SetActiveTarget(NULL); +} - if (!wxTheApp) { - MessageBox(NULL, "You have to define an instance of wxApp!", "wxWindows Error", MB_APPLMODAL | MB_ICONSTOP | MB_OK); - return 0; - } +#if !defined(_WINDLL) || (defined(_WINDLL) && defined(WXMAKINGDLL)) - // Split command line into tokens, as in usual main(argc, argv) - char **command = new char*[50]; +//// Main wxWindows entry point +int wxEntry(WXHINSTANCE hInstance, + WXHINSTANCE WXUNUSED(hPrevInstance), + char *lpCmdLine, + int nCmdShow, + bool enterLoop) +{ +#ifndef __WXDEBUG__ // take everything into a try-except block in release build + __try { +#endif - int count = 0; - char *buf = new char[strlen(m_lpCmdLine) + 1]; + wxhInstance = (HINSTANCE) hInstance; - // Hangs around until end of app. in case - // user carries pointers to the tokens + if (!wxApp::Initialize()) + return 0; - /* Model independent strcpy */ - int i; - for (i = 0; (buf[i] = m_lpCmdLine[i]) != 0; i++) + // create the application object or ensure that one already exists + if (!wxTheApp) { - /* loop */; - } - - // 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 + // 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." ); - strcpy(name, wxFileNameFromPath(name)); - wxStripExtension(name); - wxTheApp->SetAppName(name); + wxTheApp = (*wxApp::GetInitializerFunction()) (); + } - /* 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! */ + wxCHECK_MSG( wxTheApp, 0, "You have to define an instance of wxApp!" ); - 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; - - delete [] buf ; - - // TODO: This should really be cleaned up in ~wxApp - delete [] command[0] ; - delete [] command ; - return 0; - } - - if (!enterLoop) - return 0; + int retValue = 0; - int retValue = 1; - -/* 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); + if ( wxTheApp->OnInit() ) + { + if ( enterLoop ) + { + retValue = wxTheApp->OnRun(); + } } -*/ + //else: app initialization failed, so we skipped OnRun() - retValue = wxTheApp->OnRun(); - - if (wxTheApp->GetTopWindow()) + wxWindow *topWindow = wxTheApp->GetTopWindow(); + if ( topWindow ) { - // 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); - } + // 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(); @@ -581,10 +589,6 @@ int wxEntry(WXHINSTANCE hInstance, WXHINSTANCE WXUNUSED(hPrevInstance), char *m_ delete wxTheApp; wxTheApp = NULL; - delete [] buf ; - delete [] command[0] ; - delete [] command ; - #if (WXDEBUG && 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, @@ -592,22 +596,35 @@ int wxEntry(WXHINSTANCE hInstance, WXHINSTANCE WXUNUSED(hPrevInstance), char *m_ // wxDebugContext, too. if (wxDebugContext::CountObjectsLeft() > 0) { - wxTrace("There were memory leaks.\n"); - wxDebugContext::Dump(); - wxDebugContext::PrintStatistics(); + wxTrace("There were memory leaks.\n"); + wxDebugContext::Dump(); + wxDebugContext::PrintStatistics(); } wxDebugContext::SetStream(NULL, NULL); #endif return retValue; +#ifndef __WXDEBUG__ // catch exceptions only in release build + } + __except ( EXCEPTION_EXECUTE_HANDLER ) { + /* + if ( wxTheApp ) + wxTheApp->OnFatalException(); + */ + + ::ExitProcess(3); // the same exit code as abort() + } +#endif //debug } #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 @@ -615,13 +632,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) { @@ -644,17 +661,15 @@ int wxEntry(WXHINSTANCE hInstance) } #endif // _WINDLL -// Static member initialization +//// Static member initialization + wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL; 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; @@ -668,6 +683,17 @@ wxApp::wxApp() m_auto3D = TRUE; } +wxApp::~wxApp() +{ + // Delete command-line args + int i; + for (i = 0; i < argc; i++) + { + delete[] argv[i]; + } + delete argv; +} + bool wxApp::Initialized() { #ifndef _WINDLL @@ -825,40 +851,40 @@ void wxApp::OnIdle(wxIdleEvent& event) 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->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() @@ -879,60 +905,6 @@ void wxApp::DeletePendingObjects() } } -/* -// Free up font objects that are not being used at present. -bool wxApp::DoResourceCleanup() -{ -// wxDebugMsg("ResourceCleanup\n"); - - 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) - { - 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(); - } - } - - SetPendingCleanup(FALSE); - return FALSE; -} -*/ - wxLog* wxApp::CreateLogTarget() { return new wxLogGui; @@ -962,30 +934,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; @@ -1014,14 +986,11 @@ bool wxYield() 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" + #include "main.cpp" #endif - -#undef IN_WX_MAIN_CPP -