X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ffa221c5897a4881377fd35181a5ea18c4dc04b..2035e10e83324c6925d12725b842768f6e2b00a2:/src/msw/app.cpp?ds=inline diff --git a/src/msw/app.cpp b/src/msw/app.cpp index 81c4be228d..95ca2a631d 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -67,14 +67,17 @@ #include "wx/resource.h" #endif -// OLE is used for drag-and-drop, clipboard, OLE Automation... -#ifndef wxUSE_NORLANDER_HEADERS -#if defined(__GNUWIN32__) || defined(__SC__) || defined(__SALFORDC__) +#if wxUSE_TOOLTIPS + #include "wx/tooltip.h" +#endif // wxUSE_TOOLTIPS + +// OLE is used for drag-and-drop, clipboard, OLE Automation..., but some +// compilers don't support it (missing headers, libs, ...) +#if defined(__GNUWIN32_OLD__) || defined(__SC__) || defined(__SALFORDC__) #undef wxUSE_OLE #define wxUSE_OLE 0 #endif // broken compilers -#endif #if wxUSE_OLE #include @@ -83,7 +86,7 @@ #include #include -#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS) +#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) #include #endif @@ -123,7 +126,6 @@ extern wxChar *wxOsVersion; extern wxList *wxWinHandleList; extern wxList WXDLLEXPORT wxPendingDelete; extern void wxSetKeyboardHook(bool doIt); -extern wxCursor *g_globalCursor; MSG s_currentMsg; wxApp *wxTheApp = NULL; @@ -151,12 +153,6 @@ HBRUSH wxDisableButtonBrush = (HBRUSH) 0; LRESULT WXDLLEXPORT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM); -#if wxUSE_RICHEDIT - // the handle to richedit DLL and the version of the DLL loaded - static HINSTANCE gs_hRichEdit = (HINSTANCE)NULL; - static int gs_verRichEdit = -1; -#endif - // =========================================================================== // implementation // =========================================================================== @@ -231,8 +227,6 @@ bool wxApp::Initialize() Ctl3dAutoSubclass(wxhInstance); #endif - g_globalCursor = new wxCursor; - // VZ: these icons are not in wx.rc anyhow (but should they?)! #if 0 wxSTD_FRAME_ICON = LoadIcon(wxhInstance, wxT("wxSTD_FRAME")); @@ -500,13 +494,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. @@ -524,11 +511,6 @@ void wxApp::CleanUp() wxSetKeyboardHook(FALSE); -#if wxUSE_RICHEDIT - if (gs_hRichEdit != (HINSTANCE) NULL) - FreeLibrary(gs_hRichEdit); -#endif - #if wxUSE_PENWINDOWS wxCleanUpPenWin(); #endif @@ -582,7 +564,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(); } @@ -595,6 +577,27 @@ 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() +{ + wxTheApp->OnInitGui(); + return 0; +} + +void WXDLLEXPORT wxEntryCleanup() +{ + wxApp::CleanUp(); +} + + #if !defined(_WINDLL) || (defined(_WINDLL) && defined(WXMAKINGDLL)) // temporarily disable this warning which would be generated in release builds @@ -603,7 +606,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, @@ -638,7 +643,7 @@ int wxEntry(WXHINSTANCE hInstance, #endif wxhInstance = (HINSTANCE) hInstance; - if (!wxApp::Initialize()) + if (!wxEntryStart(0,0)) return 0; // create the application object or ensure that one already exists @@ -661,7 +666,7 @@ int wxEntry(WXHINSTANCE hInstance, // GUI-specific initialisation. In fact on Windows we don't have any, // but this call is provided for compatibility across platforms. - wxTheApp->OnInitGui(); + wxEntryInitGui(); // 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 @@ -703,7 +708,7 @@ int wxEntry(WXHINSTANCE hInstance, wxTheApp->OnExit(); - wxApp::CleanUp(); + wxEntryCleanup(); return retValue; @@ -736,12 +741,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 @@ -759,7 +766,7 @@ int wxEntry(WXHINSTANCE hInstance) wxTheApp->argc = 0; wxTheApp->argv = NULL; - wxTheApp->OnInitGui(); + wxEntryInitGui(); wxTheApp->OnInit(); @@ -923,12 +930,10 @@ int wxApp::MainLoop() wxMutexGuiLeaveOrEnter(); #endif // wxUSE_THREADS - while ( !::PeekMessage(&s_currentMsg, 0, 0, 0, PM_NOREMOVE) && - ProcessIdle() ) - { - } - + while ( !Pending() && ProcessIdle() ) + ; + // a message came or no more idle processing to do DoMessage(); } @@ -947,12 +952,13 @@ bool wxApp::ProcessIdle() void wxApp::ExitMainLoop() { + // VZ: why not ::PostQuitMessage()? m_keepGoing = FALSE; } bool wxApp::Pending() { - return (::PeekMessage(&s_currentMsg, 0, 0, 0, PM_NOREMOVE) != 0); + return ::PeekMessage(&s_currentMsg, 0, 0, 0, PM_NOREMOVE) != 0; } void wxApp::Dispatch() @@ -970,19 +976,24 @@ bool wxApp::ProcessMessage(WXMSG *wxmsg) { MSG *msg = (MSG *)wxmsg; HWND hWnd = msg->hwnd; - wxWindow *wndThis = wxFindWinFromHandle((WXHWND)hWnd), *wnd; + wxWindow *wndThis = wxGetWindowFromHWND((WXHWND)hWnd); - // for some composite controls (like a combobox), wndThis might be NULL - // because the subcontrol is not a wxWindow, but only the control itself - // is - try to catch this case - while ( hWnd && !wndThis ) +#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) ) { - hWnd = ::GetParent(hWnd); - wndThis = wxFindWinFromHandle((WXHWND)hWnd); + wxToolTip *tt = wndThis->GetToolTip(); + if ( tt ) + { + tt->RelayEvent(wxmsg); + } } +#endif // wxUSE_TOOLTIPS // Try translations first; find the youngest window with // a translation table. + wxWindow *wnd; for ( wnd = wndThis; wnd; wnd = wnd->GetParent() ) { if ( wnd->MSWTranslateMessage(wxmsg) ) @@ -1009,14 +1020,21 @@ 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 // Send OnIdle events to all windows @@ -1027,11 +1045,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; } @@ -1111,52 +1124,6 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event) } } -#if wxUSE_RICHEDIT - -/* static */ -bool wxApp::InitRichEdit(int version) -{ - wxCHECK_MSG( version >= 1 && version <= 3, FALSE, - _T("incorrect richedit control version requested") ); - - if ( version <= gs_verRichEdit ) - { - // we've already got this or better - return TRUE; - } - - if ( gs_hRichEdit ) - { - ::FreeLibrary(gs_hRichEdit); - } - - // always try load riched20.dll first - like this we won't have to reload - // it later if we're first asked for RE 1 and then for RE 2 or 3 - wxString dllname = _T("riched20.dll"); - gs_hRichEdit = ::LoadLibrary(dllname); - if ( !gs_hRichEdit && (version == 1) ) - { - // fall back to RE 1 - dllname = _T("riched32.dll"); - gs_hRichEdit = ::LoadLibrary(dllname); - } - - if ( !gs_hRichEdit ) - { - wxLogSysError(_("Could not load Rich Edit DLL '%s'"), dllname.c_str()); - - gs_verRichEdit = -1; - - return FALSE; - } - - gs_verRichEdit = version; - - return TRUE; -} - -#endif // wxUSE_RICHEDIT - /* static */ int wxApp::GetComCtl32Version() { @@ -1209,7 +1176,11 @@ int wxApp::GetComCtl32Version() FARPROC theProc = ::GetProcAddress ( hModuleComCtl32, +#if defined(__BORLANDC__) && (__BORLANDC__ <= 0x520) + "InitCommonControlsEx" +#else _T("InitCommonControlsEx") +#endif ); if ( !theProc ) @@ -1224,7 +1195,11 @@ int wxApp::GetComCtl32Version() theProc = ::GetProcAddress ( hModuleComCtl32, +#if defined(__BORLANDC__) && (__BORLANDC__ <= 0x520) + "InitializeFlatSB" +#else _T("InitializeFlatSB") +#endif ); if ( !theProc ) { @@ -1249,24 +1224,36 @@ void wxExit() wxLogError(_("Fatal error: exiting")); wxApp::CleanUp(); + exit(0); } // Yield to incoming messages bool wxYield() { + // disable log flushing from here because a call to wxYield() shouldn't + // normally result in message boxes popping up &c + wxLog::Suspend(); + // 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 ) { +#if wxUSE_THREADS + wxMutexGuiLeaveOrEnter(); +#endif // wxUSE_THREADS + if ( !wxTheApp->DoMessage() ) break; } // If they are pending events, we must process them. - wxTheApp->ProcessPendingEvents(); + if (wxTheApp) + wxTheApp->ProcessPendingEvents(); + + // let the logs be flashed again + wxLog::Resume(); return TRUE; } @@ -1319,6 +1306,6 @@ wxApp::GetStdIcon(int which) const // 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(__VISUALC__) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__TWIN32__)) +#if (defined(__VISUALC__) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__TWIN32__) && !defined(WXMAKINGDLL)) #include "main.cpp" #endif