X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c42404a58eac2c9eb0557565a471a794c387a715..d21d2e5adf7a5acf3b496a9c4e87eab220bd75d8:/src/msw/app.cpp?ds=sidebyside diff --git a/src/msw/app.cpp b/src/msw/app.cpp index cb05b27011..480bb9b54d 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -45,9 +45,11 @@ #include "wx/dynarray.h" #include "wx/wxchar.h" #include "wx/icon.h" + #include "wx/log.h" #endif -#include "wx/log.h" +#include "wx/cmdline.h" +#include "wx/filename.h" #include "wx/module.h" #include "wx/msw/private.h" @@ -86,11 +88,13 @@ #include #include -#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) +#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__) || defined(__WXMICROWIN__)) && !defined(__CYGWIN10__)) #include #endif +#ifndef __WXMICROWIN__ #include "wx/msw/msvcrt.h" +#endif // ---------------------------------------------------------------------------- // conditional compilation @@ -113,7 +117,7 @@ #define _WIN32_IE 0x0200 #endif -#if _WIN32_IE >= 0x0300 +#if _WIN32_IE >= 0x0300 && !defined(__MINGW32__) #include #endif @@ -122,11 +126,10 @@ // --------------------------------------------------------------------------- extern wxChar *wxBuffer; -extern wxChar *wxOsVersion; -extern wxList *wxWinHandleList; extern wxList WXDLLEXPORT wxPendingDelete; +#ifndef __WXMICROWIN__ extern void wxSetKeyboardHook(bool doIt); -extern wxCursor *g_globalCursor; +#endif MSG s_currentMsg; wxApp *wxTheApp = NULL; @@ -140,7 +143,9 @@ const wxChar *wxMDIFrameClassNameNoRedraw = wxT("wxMDIFrameClassNR"); const wxChar *wxMDIChildFrameClassName = wxT("wxMDIChildFrameClass"); const wxChar *wxMDIChildFrameClassNameNoRedraw = wxT("wxMDIChildFrameClassNR"); const wxChar *wxPanelClassName = wxT("wxPanelClass"); +const wxChar *wxPanelClassNameNR = wxT("wxPanelClassNR"); const wxChar *wxCanvasClassName = wxT("wxCanvasClass"); +const wxChar *wxCanvasClassNameNR = wxT("wxCanvasClassNR"); HICON wxSTD_FRAME_ICON = (HICON) NULL; HICON wxSTD_MDICHILDFRAME_ICON = (HICON) NULL; @@ -154,6 +159,20 @@ HBRUSH wxDisableButtonBrush = (HBRUSH) 0; LRESULT WXDLLEXPORT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM); +// FIXME wxUSE_ON_FATAL_EXCEPTION is only supported for VC++ now because it +// needs compiler support for Win32 SEH. Others (especially Borland) +// probably have it too, but I'm not sure about how it works +// JACS: get 'Cannot use __try in functions that require unwinding +// in Unicode mode, so disabling. +#if !defined(__VISUALC__) || defined(__WIN16__) || defined(UNICODE) + #undef wxUSE_ON_FATAL_EXCEPTION + #define wxUSE_ON_FATAL_EXCEPTION 0 +#endif // VC++ + +#if wxUSE_ON_FATAL_EXCEPTION + static bool gs_handleExceptions = FALSE; +#endif + // =========================================================================== // implementation // =========================================================================== @@ -162,17 +181,38 @@ LRESULT WXDLLEXPORT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM); // wxApp // --------------------------------------------------------------------------- - IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) +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() +BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) + EVT_IDLE(wxApp::OnIdle) + EVT_END_SESSION(wxApp::OnEndSession) + EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession) +END_EVENT_TABLE() //// Initialize bool wxApp::Initialize() { + // the first thing to do is to check if we're trying to run an Unicode + // program under Win9x - if so, abort right now as it has no chance to + // work +#if wxUSE_UNICODE && !wxUSE_UNICODE_MSLU + if ( wxGetOsVersion() != wxWINDOWS_NT ) + { + // note that we can use MessageBoxW() as it's implemented even under + // Win9x - OTOH, we can't use wxGetTranslation() because the file APIs + // used by wxLocale are not + ::MessageBox + ( + NULL, + _T("This program uses Unicode and requires Windows NT/2000/XP.\nProgram aborted."), + _T("wxWindows Fatal Error"), + MB_ICONERROR | MB_OK + ); + + return FALSE; + } +#endif // wxUSE_UNICODE && !wxUSE_UNICODE_MSLU + // Some people may wish to use this, but // probably it shouldn't be here by default. #ifdef __WXDEBUG__ @@ -183,10 +223,6 @@ bool wxApp::Initialize() wxClassInfo::InitializeClasses(); -#if wxUSE_RESOURCES - wxGetResource(wxT("wxWindows"), wxT("OsVersion"), &wxOsVersion); -#endif - #if wxUSE_THREADS wxPendingEventsLocker = new wxCriticalSection; #endif @@ -203,12 +239,11 @@ bool wxApp::Initialize() wxBitmap::InitStandardHandlers(); -#if defined(__WIN95__) +#if defined(__WIN95__) && !defined(__WXMICROWIN__) InitCommonControls(); - #endif // __WIN95__ -#if wxUSE_OLE +#if wxUSE_OLE || wxUSE_DRAG_AND_DROP #ifdef __WIN16__ // for OLE, enlarge message queue to be as large as possible @@ -216,9 +251,11 @@ bool wxApp::Initialize() while (!SetMessageQueue(iMsg) && (iMsg -= 8)) ; #endif // Win16 + // we need to initialize OLE library if ( FAILED(::OleInitialize(NULL)) ) wxLogError(_("Cannot initialize OLE")); + #endif // wxUSE_OLE #if wxUSE_CTL3D @@ -226,9 +263,7 @@ bool wxApp::Initialize() wxLogError(wxT("Cannot register CTL3D")); Ctl3dAutoSubclass(wxhInstance); -#endif - - g_globalCursor = new wxCursor; +#endif // wxUSE_CTL3D // VZ: these icons are not in wx.rc anyhow (but should they?)! #if 0 @@ -243,10 +278,12 @@ bool wxApp::Initialize() RegisterWindowClasses(); +#ifndef __WXMICROWIN__ // Create the brush for disabling bitmap buttons LOGBRUSH lb; lb.lbStyle = BS_PATTERN; + lb.lbColor = 0; lb.lbHatch = (int)LoadBitmap( wxhInstance, wxT("wxDISABLE_BUTTON_BITMAP") ); if ( lb.lbHatch ) { @@ -254,21 +291,24 @@ bool wxApp::Initialize() ::DeleteObject( (HGDIOBJ)lb.lbHatch ); } //else: wxWindows resources are probably not linked in +#endif #if wxUSE_PENWINDOWS wxRegisterPenWin(); #endif - wxWinHandleList = new wxList(wxKEY_INTEGER); + wxWinHandleHash = new wxWinHashTable(wxKEY_INTEGER, 100); // This is to foil optimizations in Visual C++ that throw out dummy.obj. // PLEASE DO NOT ALTER THIS. -#if defined(__VISUALC__) && !defined(WXMAKINGDLL) +#if defined(__VISUALC__) && defined(__WIN16__) && !defined(WXMAKINGDLL) extern char wxDummyChar; if (wxDummyChar) wxDummyChar++; #endif +#ifndef __WXMICROWIN__ wxSetKeyboardHook(TRUE); +#endif wxModule::RegisterModules(); if (!wxModule::InitializeModules()) @@ -308,7 +348,7 @@ bool wxApp::RegisterWindowClasses() if ( !RegisterClass(&wndclass) ) { - wxLogLastError("RegisterClass(frame)"); + wxLogLastError(wxT("RegisterClass(frame)")); return FALSE; } @@ -319,7 +359,7 @@ bool wxApp::RegisterWindowClasses() if ( !RegisterClass(&wndclass) ) { - wxLogLastError("RegisterClass(no redraw frame)"); + wxLogLastError(wxT("RegisterClass(no redraw frame)")); return FALSE; } @@ -331,7 +371,7 @@ bool wxApp::RegisterWindowClasses() if ( !RegisterClass(&wndclass) ) { - wxLogLastError("RegisterClass(MDI parent)"); + wxLogLastError(wxT("RegisterClass(MDI parent)")); return FALSE; } @@ -342,7 +382,7 @@ bool wxApp::RegisterWindowClasses() if ( !RegisterClass(&wndclass) ) { - wxLogLastError("RegisterClass(no redraw MDI parent frame)"); + wxLogLastError(wxT("RegisterClass(no redraw MDI parent frame)")); return FALSE; } @@ -354,7 +394,7 @@ bool wxApp::RegisterWindowClasses() if ( !RegisterClass(&wndclass) ) { - wxLogLastError("RegisterClass(MDI child)"); + wxLogLastError(wxT("RegisterClass(MDI child)")); return FALSE; } @@ -365,7 +405,7 @@ bool wxApp::RegisterWindowClasses() if ( !RegisterClass(&wndclass) ) { - wxLogLastError("RegisterClass(no redraw MDI child)"); + wxLogLastError(wxT("RegisterClass(no redraw MDI child)")); return FALSE; } @@ -377,7 +417,18 @@ bool wxApp::RegisterWindowClasses() if ( !RegisterClass(&wndclass) ) { - wxLogLastError("RegisterClass(panel)"); + wxLogLastError(wxT("RegisterClass(panel)")); + + return FALSE; + } + + // Register the no redraw panel window class. + wndclass.lpszClassName = wxPanelClassNameNR; + wndclass.style = styleNoRedraw; + + if ( !RegisterClass(&wndclass) ) + { + wxLogLastError(wxT("RegisterClass(no redraw panel)")); return FALSE; } @@ -388,7 +439,16 @@ bool wxApp::RegisterWindowClasses() if ( !RegisterClass(&wndclass) ) { - wxLogLastError("RegisterClass(canvas)"); + wxLogLastError(wxT("RegisterClass(canvas)")); + + return FALSE; + } + + wndclass.lpszClassName = wxCanvasClassNameNR; + wndclass.style = styleNoRedraw; + if ( !RegisterClass(&wndclass) ) + { + wxLogLastError(wxT("RegisterClass(no redraw canvas)")); return FALSE; } @@ -397,76 +457,130 @@ bool wxApp::RegisterWindowClasses() } // --------------------------------------------------------------------------- -// Convert Windows to argc, argv style +// UnregisterWindowClasses // --------------------------------------------------------------------------- -void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine) +bool wxApp::UnregisterWindowClasses() { - wxStringList args; + bool retval = TRUE; - wxString cmdLine(lpCmdLine); - int count = 0; +#ifndef __WXMICROWIN__ + // frame window class. + if ( !UnregisterClass(wxFrameClassName, wxhInstance) ) + { + wxLogLastError(wxT("UnregisterClass(frame)")); - // Get application name - wxChar name[260]; // 260 is MAX_PATH value from windef.h - ::GetModuleFileName(wxhInstance, name, WXSIZEOF(name)); + retval = FALSE; + } - args.Add(name); - count++; + // "no redraw" frame + if ( !UnregisterClass(wxFrameClassNameNoRedraw, wxhInstance) ) + { + wxLogLastError(wxT("UnregisterClass(no redraw frame)")); - wxStrcpy(name, wxFileNameFromPath(name)); - wxStripExtension(name); - wxTheApp->SetAppName(name); + return FALSE; + } - // Break up string - // Treat strings enclosed in double-quotes as single arguments - int i = 0; - int len = cmdLine.Length(); - while (i < len) + // MDI frame window class. + if ( !UnregisterClass(wxMDIFrameClassName, wxhInstance) ) { - // Skip whitespace - while ((i < len) && wxIsspace(cmdLine.GetChar(i))) - i ++; + wxLogLastError(wxT("UnregisterClass(MDI parent)")); - if (i < len) - { - if (cmdLine.GetChar(i) == wxT('"')) // We found the start of a string - { - i ++; - int first = i; - while ((i < len) && (cmdLine.GetChar(i) != wxT('"'))) - i ++; + retval = FALSE; + } - wxString arg(cmdLine.Mid(first, (i - first))); + // "no redraw" MDI frame + if ( !UnregisterClass(wxMDIFrameClassNameNoRedraw, wxhInstance) ) + { + wxLogLastError(wxT("UnregisterClass(no redraw MDI parent frame)")); - args.Add(arg); - count ++; + retval = FALSE; + } - if (i < len) - i ++; // Skip past 2nd quote - } - else // Unquoted argument - { - int first = i; - while ((i < len) && !wxIsspace(cmdLine.GetChar(i))) - i ++; + // MDI child frame window class. + if ( !UnregisterClass(wxMDIChildFrameClassName, wxhInstance) ) + { + wxLogLastError(wxT("UnregisterClass(MDI child)")); - wxString arg(cmdLine.Mid(first, (i - first))); + retval = FALSE; + } - args.Add(arg); - count ++; - } - } + // "no redraw" MDI child frame + if ( !UnregisterClass(wxMDIChildFrameClassNameNoRedraw, wxhInstance) ) + { + wxLogLastError(wxT("UnregisterClass(no redraw MDI child)")); + + retval = FALSE; + } + + // panel window class. + if ( !UnregisterClass(wxPanelClassName, wxhInstance) ) + { + wxLogLastError(wxT("UnregisterClass(panel)")); + + retval = FALSE; } - wxTheApp->argv = new wxChar*[count + 1]; - for (i = 0; i < count; i++) + // no redraw panel window class. + if ( !UnregisterClass(wxPanelClassNameNR, wxhInstance) ) { - wxString arg(args[i]); - wxTheApp->argv[i] = copystring((const wxChar*)arg); + wxLogLastError(wxT("UnregisterClass(no redraw panel)")); + + retval = FALSE; } - wxTheApp->argv[count] = NULL; // argv[] is a NULL-terminated list - wxTheApp->argc = count; + + // canvas and textsubwindow class name + if ( !UnregisterClass(wxCanvasClassName, wxhInstance) ) + { + wxLogLastError(wxT("UnregisterClass(canvas)")); + + retval = FALSE; + } + + if ( !UnregisterClass(wxCanvasClassNameNR, wxhInstance) ) + { + wxLogLastError(wxT("UnregisterClass(no redraw canvas)")); + + retval = FALSE; + } +#endif + // __WXMICROWIN__ + return retval; +} + +// --------------------------------------------------------------------------- +// Convert Windows to argc, argv style +// --------------------------------------------------------------------------- + +void wxApp::ConvertToStandardCommandArgs(const char* lpCmdLine) +{ + // break the command line in words + wxArrayString args = + wxCmdLineParser::ConvertStringToArgs(wxConvertMB2WX(lpCmdLine)); + + // +1 here for the program name + argc = args.GetCount() + 1; + + // and +1 here for the terminating NULL + argv = new wxChar *[argc + 1]; + + argv[0] = new wxChar[260]; // 260 is MAX_PATH value from windef.h + ::GetModuleFileName(wxhInstance, argv[0], 260); + + // also set the app name from argv[0] + wxString name; + wxFileName::SplitPath(argv[0], NULL, &name, NULL); + + SetAppName(name); + + // copy all the other arguments to wxApp::argv[] + for ( int i = 1; i < argc; i++ ) + { + argv[i] = copystring(args[i - 1]); + } + + // argv[] must be NULL-terminated + argv[argc] = NULL; } //// Cleans up any wxWindows internal structures left lying around @@ -497,13 +611,6 @@ void wxApp::CleanUp() // 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; - g_globalCursor = NULL; - wxDeleteStockObjects(); // Destroy all GDI lists, etc. @@ -519,7 +626,9 @@ void wxApp::CleanUp() //// WINDOWS-SPECIFIC CLEANUP +#ifndef __WXMICROWIN__ wxSetKeyboardHook(FALSE); +#endif #if wxUSE_PENWINDOWS wxCleanUpPenWin(); @@ -546,21 +655,31 @@ void wxApp::CleanUp() ::OleUninitialize(); #endif +#ifdef WXMAKINGDLL + // for an EXE the classes are unregistered when it terminates but DLL may + // be loaded several times (load/unload/load) into the same process in + // which case the registration will fail after the first time if we don't + // unregister the classes now + UnregisterWindowClasses(); +#endif // WXMAKINGDLL + #if wxUSE_CTL3D Ctl3dUnregister(wxhInstance); #endif - if (wxWinHandleList) - delete wxWinHandleList; + delete wxWinHandleHash; // 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. delete wxPendingEvents; + #if wxUSE_THREADS delete wxPendingEventsLocker; - // If we don't do the following, we get an apparent memory leak. + // If we don't do the following, we get an apparent memory leak +#if wxUSE_VALIDATORS ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker(); -#endif +#endif // wxUSE_VALIDATORS +#endif // wxUSE_THREADS wxClassInfo::CleanUpClasses(); @@ -574,7 +693,7 @@ void wxApp::CleanUp() // wxDebugContext, too. if (wxDebugContext::CountObjectsLeft(TRUE) > 0) { - wxLogDebug(wxT("There were memory leaks.")); + wxLogMessage(wxT("There were memory leaks.")); wxDebugContext::Dump(); wxDebugContext::PrintStatistics(); } @@ -587,6 +706,26 @@ void wxApp::CleanUp() #endif // wxUSE_LOG } +//---------------------------------------------------------------------- +// Entry point helpers, used by wxPython +//---------------------------------------------------------------------- + +int WXDLLEXPORT wxEntryStart( int WXUNUSED(argc), char** WXUNUSED(argv) ) +{ + return wxApp::Initialize(); +} + +int WXDLLEXPORT wxEntryInitGui() +{ + return wxTheApp->OnInitGui(); +} + +void WXDLLEXPORT wxEntryCleanup() +{ + wxApp::CleanUp(); +} + + #if !defined(_WINDLL) || (defined(_WINDLL) && defined(WXMAKINGDLL)) // temporarily disable this warning which would be generated in release builds @@ -595,7 +734,9 @@ void wxApp::CleanUp() #pragma warning(disable: 4715) // not all control paths return a value #endif // Visual C++ -//// Main wxWindows entry point +//---------------------------------------------------------------------- +// Main wxWindows entry point +//---------------------------------------------------------------------- int wxEntry(WXHINSTANCE hInstance, WXHINSTANCE WXUNUSED(hPrevInstance), char *lpCmdLine, @@ -605,7 +746,10 @@ int wxEntry(WXHINSTANCE hInstance, // 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) +#ifndef __WXMICROWIN__ wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF); +#endif + #ifdef __MWERKS__ #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT // This seems to be necessary since there are 'rogue' @@ -617,20 +761,15 @@ int wxEntry(WXHINSTANCE hInstance, wxDebugContext::SetCheckpoint(); #endif #endif - // 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 + // take everything into a try-except block to be able to call + // OnFatalException() if necessary +#if wxUSE_ON_FATAL_EXCEPTION __try { -#else - #undef CATCH_PROGRAM_EXCEPTIONS #endif wxhInstance = (HINSTANCE) hInstance; - if (!wxApp::Initialize()) + if (!wxEntryStart(0,0)) return 0; // create the application object or ensure that one already exists @@ -642,19 +781,16 @@ int wxEntry(WXHINSTANCE hInstance, wxCHECK_MSG( wxApp::GetInitializerFunction(), 0, wxT("No initializer - use IMPLEMENT_APP macro.") ); - wxTheApp = (*wxApp::GetInitializerFunction()) (); + wxTheApp = (wxApp*) (*wxApp::GetInitializerFunction()) (); } wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") ); // save the WinMain() parameters - wxTheApp->ConvertToStandardCommandArgs(lpCmdLine); + if (lpCmdLine) // MicroWindows passes NULL + 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(); - // We really don't want timestamps by default, because it means // we can't simply double-click on the error message and get to that // line in the source. So VC++ at least, let's have a sensible default. @@ -664,15 +800,33 @@ int wxEntry(WXHINSTANCE hInstance, int retValue = 0; - if ( wxTheApp->OnInit() ) + // it is common to create a modal dialog in OnInit() (to ask/notify the + // user about something) but it wouldn't work if we don't change the + // "exit on delete last frame" flag here as when this dialog is + // deleted, the app would terminate (it was the last top level window + // as the main frame wasn't created yet!), so disable this behaviour + // temproarily + bool exitOnLastFrameDelete = wxTheApp->GetExitOnFrameDelete(); + wxTheApp->SetExitOnFrameDelete(FALSE); + + // init the app + retValue = wxEntryInitGui() && wxTheApp->OnInit() ? 0 : -1; + + // restore the old flag value + wxTheApp->SetExitOnFrameDelete(exitOnLastFrameDelete); + + if ( retValue == 0 ) { if ( enterLoop ) { + // run the main loop retValue = wxTheApp->OnRun(); } else - // We want to initialize, but not run or exit immediately. + { + // we want to initialize, but not run or exit immediately. return 1; + } } //else: app initialization failed, so we skipped OnRun() @@ -695,30 +849,25 @@ int wxEntry(WXHINSTANCE hInstance, wxTheApp->OnExit(); - wxApp::CleanUp(); + wxEntryCleanup(); return retValue; -#ifdef CATCH_PROGRAM_EXCEPTIONS +#if wxUSE_ON_FATAL_EXCEPTION } - __except ( EXCEPTION_EXECUTE_HANDLER ) { - /* - if ( wxTheApp ) + __except ( gs_handleExceptions ? EXCEPTION_EXECUTE_HANDLER + : EXCEPTION_CONTINUE_SEARCH ) { + if ( wxTheApp ) + { + // give the user a chance to do something special about this 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 +#endif // wxUSE_ON_FATAL_EXCEPTION } // restore warning state @@ -728,12 +877,14 @@ int wxEntry(WXHINSTANCE hInstance, #else /* _WINDLL */ -//// Entry point for DLLs +//---------------------------------------------------------------------- +// Entry point for wxWindows + the App in a DLL +//---------------------------------------------------------------------- int wxEntry(WXHINSTANCE hInstance) { wxhInstance = (HINSTANCE) hInstance; - wxApp::Initialize(); + wxEntryStart(0, 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 @@ -751,7 +902,7 @@ int wxEntry(WXHINSTANCE hInstance) wxTheApp->argc = 0; wxTheApp->argv = NULL; - wxTheApp->OnInitGui(); + wxEntryInitGui(); wxTheApp->OnInit(); @@ -771,14 +922,9 @@ wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NUL wxApp::wxApp() { - m_topWindow = NULL; - wxTheApp = this; - m_wantDebugOutput = TRUE; - argc = 0; argv = NULL; m_printMode = wxPRINT_WINDOWS; - m_exitOnFrameDelete = TRUE; m_auto3D = TRUE; } @@ -800,8 +946,7 @@ bool wxApp::Initialized() return TRUE; else return FALSE; -#endif -#ifdef _WINDLL // Assume initialized if DLL (no way of telling) +#else // Assume initialized if DLL (no way of telling) return TRUE; #endif } @@ -824,7 +969,7 @@ bool wxApp::DoMessage() else if ( rc == -1 ) { // should never happen, but let's test for it nevertheless - wxLogLastError("GetMessage"); + wxLogLastError(wxT("GetMessage")); } else { @@ -881,16 +1026,21 @@ bool wxApp::DoMessage() #endif // wxUSE_THREADS // Process the message - if ( !ProcessMessage((WXMSG *)&s_currentMsg) ) - { - ::TranslateMessage(&s_currentMsg); - ::DispatchMessage(&s_currentMsg); - } + DoMessage((WXMSG *)&s_currentMsg); } return TRUE; } +void wxApp::DoMessage(WXMSG *pMsg) +{ + if ( !ProcessMessage(pMsg) ) + { + ::TranslateMessage((MSG *)pMsg); + ::DispatchMessage((MSG *)pMsg); + } +} + /* * Keep trying to process messages until WM_QUIT * received. @@ -960,13 +1110,29 @@ void wxApp::Dispatch() bool wxApp::ProcessMessage(WXMSG *wxmsg) { MSG *msg = (MSG *)wxmsg; - HWND hWnd = msg->hwnd; - wxWindow *wndThis = wxGetWindowFromHWND((WXHWND)hWnd); + HWND hwnd = msg->hwnd; + wxWindow *wndThis = wxGetWindowFromHWND((WXHWND)hwnd); + + // this may happen if the event occured in a standard modeless dialog (the + // only example of which I know of is the find/replace dialog) - then call + // IsDialogMessage() to make TAB navigation in it work + if ( !wndThis ) + { + // we need to find the dialog containing this control as + // IsDialogMessage() just eats all the messages (i.e. returns TRUE for + // them) if we call it for the control itself + while ( hwnd && ::GetWindowLong(hwnd, GWL_STYLE) & WS_CHILD ) + { + hwnd = ::GetParent(hwnd); + } + + return hwnd && ::IsDialogMessage(hwnd, msg) != 0; + } #if wxUSE_TOOLTIPS // we must relay WM_MOUSEMOVE events to the tooltip ctrl if we want it to // popup the tooltip bubbles - if ( wndThis && (msg->message == WM_MOUSEMOVE) ) + if ( (msg->message == WM_MOUSEMOVE) ) { wxToolTip *tt = wndThis->GetToolTip(); if ( tt ) @@ -976,22 +1142,39 @@ bool wxApp::ProcessMessage(WXMSG *wxmsg) } #endif // wxUSE_TOOLTIPS - // Try translations first; find the youngest window with - // a translation table. + // allow the window to prevent certain messages from being + // translated/processed (this is currently used by wxTextCtrl to always + // grab Ctrl-C/V/X, even if they are also accelerators in some parent) + if ( !wndThis->MSWShouldPreProcessMessage(wxmsg) ) + { + return FALSE; + } + + // try translations first: the accelerators override everything wxWindow *wnd; + for ( wnd = wndThis; wnd; wnd = wnd->GetParent() ) { - if ( wnd->MSWTranslateMessage(wxmsg) ) + if ( wnd->MSWTranslateMessage(wxmsg)) return TRUE; + + // stop at first top level window, i.e. don't try to process the key + // strokes originating in a dialog using the accelerators of the parent + // frame - this doesn't make much sense + if ( wnd->IsTopLevel() ) + break; } - // Anyone for a non-translation message? Try youngest descendants first. - for ( wnd = wndThis; wnd; wnd = wnd->GetParent() ) + // now try the other hooks (kbd navigation is handled here): we start from + // wndThis->GetParent() because wndThis->MSWProcessMessage() was already + // called above + for ( wnd = wndThis->GetParent(); wnd; wnd = wnd->GetParent() ) { if ( wnd->MSWProcessMessage(wxmsg) ) return TRUE; } + // no special preprocessing for this message, dispatch it normally return FALSE; } @@ -1005,16 +1188,31 @@ void wxApp::OnIdle(wxIdleEvent& event) s_inOnIdle = TRUE; + // If there are pending events, we must process them: pending events + // are either events to the threads other than main or events posted + // with wxPostEvent() functions + // GRG: I have moved this here so that all pending events are processed + // before starting to delete any objects. This behaves better (in + // particular, wrt wxPostEvent) and is coherent with wxGTK's current + // behaviour. Changed Feb/2000 before 2.1.14 + ProcessPendingEvents(); + // '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(); + wxLog::FlushActive(); #endif // wxUSE_LOG +#if wxUSE_DC_CACHEING + // automated DC cache management: clear the cached DCs and bitmap + // if it's likely that the app has finished with them, that is, we + // get an idle event and we're not dragging anything. + if (!::GetKeyState(MK_LBUTTON) && !::GetKeyState(MK_MBUTTON) && !::GetKeyState(MK_RBUTTON)) + wxDC::ClearCache(); +#endif // wxUSE_DC_CACHEING + // Send OnIdle events to all windows if ( SendIdleEvents() ) { @@ -1023,11 +1221,6 @@ void wxApp::OnIdle(wxIdleEvent& event) event.RequestMore(TRUE); } - // If they are pending events, we must process them: pending events are - // either events to the threads other than main or events posted with - // wxPostEvent() functions - ProcessPendingEvents(); - s_inOnIdle = FALSE; } @@ -1110,6 +1303,9 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event) /* static */ int wxApp::GetComCtl32Version() { +#ifdef __WXMICROWIN__ + return 0; +#else // cache the result static int s_verComCtl32 = -1; @@ -1130,7 +1326,7 @@ int wxApp::GetComCtl32Version() // try to use DllGetVersion() if available in _headers_ #ifdef DLLVER_PLATFORM_WINDOWS // defined in shlwapi.h DLLGETVERSIONPROC pfnDllGetVersion = (DLLGETVERSIONPROC) - ::GetProcAddress(hModuleComCtl32, _T("DllGetVersion")); + ::GetProcAddress(hModuleComCtl32, "DllGetVersion"); if ( pfnDllGetVersion ) { DLLVERSIONINFO dvi; @@ -1159,11 +1355,7 @@ int wxApp::GetComCtl32Version() FARPROC theProc = ::GetProcAddress ( hModuleComCtl32, -#if defined(__BORLANDC__) && (__BORLANDC__ <= 0x520) "InitCommonControlsEx" -#else - _T("InitCommonControlsEx") -#endif ); if ( !theProc ) @@ -1178,11 +1370,7 @@ int wxApp::GetComCtl32Version() theProc = ::GetProcAddress ( hModuleComCtl32, -#if defined(__BORLANDC__) && (__BORLANDC__ <= 0x520) "InitializeFlatSB" -#else - _T("InitializeFlatSB") -#endif ); if ( !theProc ) { @@ -1200,6 +1388,7 @@ int wxApp::GetComCtl32Version() } return s_verComCtl32; +#endif } void wxExit() @@ -1207,14 +1396,34 @@ void wxExit() wxLogError(_("Fatal error: exiting")); wxApp::CleanUp(); + exit(0); } // Yield to incoming messages -bool wxYield() + +bool wxApp::Yield(bool onlyIfNeeded) { + // MT-FIXME + static bool s_inYield = FALSE; + + // disable log flushing from here because a call to wxYield() shouldn't + // normally result in message boxes popping up &c + wxLog::Suspend(); + + if ( s_inYield ) + { + if ( !onlyIfNeeded ) + { + wxFAIL_MSG( wxT("wxYield called recursively" ) ); + } + + return FALSE; + } + + s_inYield = TRUE; + // we don't want to process WM_QUIT from here - it should be processed in // the main event loop in order to stop it - MSG msg; while ( PeekMessage(&msg, (HWND)0, 0, 0, PM_NOREMOVE) && msg.message != WM_QUIT ) @@ -1227,10 +1436,30 @@ bool wxYield() break; } - // If they are pending events, we must process them. - wxTheApp->ProcessPendingEvents(); + // if there are pending events, we must process them. + ProcessPendingEvents(); + + // let the logs be flashed again + wxLog::Resume(); + + s_inYield = FALSE; + + return TRUE; +} + +bool wxHandleFatalExceptions(bool doit) +{ +#if wxUSE_ON_FATAL_EXCEPTION + // assume this can only be called from the main thread + gs_handleExceptions = doit; return TRUE; +#else + wxFAIL_MSG(_T("set wxUSE_ON_FATAL_EXCEPTION to 1 to use this function")); + + (void)doit; + return FALSE; +#endif } //----------------------------------------------------------------------------- @@ -1249,7 +1478,7 @@ void wxWakeUpIdle() if ( !::PostMessage(GetHwndOf(topWindow), WM_NULL, 0, 0) ) { // should never happen - wxLogLastError("PostMessage(WM_NULL)"); + wxLogLastError(wxT("PostMessage(WM_NULL)")); } } }