X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..af547d51b7494fd365ae29e048d458ff72b27056:/src/msw/app.cpp?ds=sidebyside diff --git a/src/msw/app.cpp b/src/msw/app.cpp index 36199a3d67..903493b2f1 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -19,7 +19,6 @@ #ifdef __GNUG__ #pragma implementation "app.h" - #pragma implementation "appbase.h" #endif // For compilers that support precompilation, includes "wx.h". @@ -44,8 +43,8 @@ #include "wx/msgdlg.h" #include "wx/intl.h" #include "wx/dynarray.h" -# include "wx/wxchar.h" -# include "wx/icon.h" + #include "wx/wxchar.h" + #include "wx/icon.h" #endif #include "wx/log.h" @@ -68,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 @@ -84,12 +86,37 @@ #include #include -#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS) +#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) #include #endif #include "wx/msw/msvcrt.h" +// ---------------------------------------------------------------------------- +// conditional compilation +// ---------------------------------------------------------------------------- + +// The macro _WIN32_IE is defined by commctrl.h (unless it had already been +// defined before) and shows us what common control features are available +// during the compile time (it doesn't mean that they will be available during +// the run-time, use GetComCtl32Version() to test for them!). The possible +// values are: +// +// 0x0200 for comctl32.dll 4.00 shipped with Win95/NT 4.0 +// 0x0300 4.70 IE 3.x +// 0x0400 4.71 IE 4.0 +// 0x0401 4.72 IE 4.01 and Win98 +// 0x0500 5.00 IE 5.x and NT 5.0 (Win2000) + +#ifndef _WIN32_IE + // minimal set of features by default + #define _WIN32_IE 0x0200 +#endif + +#if _WIN32_IE >= 0x0300 + #include +#endif + // --------------------------------------------------------------------------- // global variables // --------------------------------------------------------------------------- @@ -98,29 +125,21 @@ extern wxChar *wxBuffer; extern wxChar *wxOsVersion; extern wxList *wxWinHandleList; extern wxList WXDLLEXPORT wxPendingDelete; -#if wxUSE_THREADS -extern wxList *wxPendingEvents; -extern wxCriticalSection *wxPendingEventsLocker; -#endif extern void wxSetKeyboardHook(bool doIt); -extern wxCursor *g_globalCursor; -HINSTANCE wxhInstance = 0; MSG s_currentMsg; wxApp *wxTheApp = NULL; -// FIXME why not const? and not static? - // NB: all "NoRedraw" classes must have the same names as the "normal" classes // with NR suffix - wxWindow::MSWCreate() supposes this -wxChar wxFrameClassName[] = T("wxFrameClass"); -wxChar wxFrameClassNameNoRedraw[] = T("wxFrameClassNR"); -wxChar wxMDIFrameClassName[] = T("wxMDIFrameClass"); -wxChar wxMDIFrameClassNameNoRedraw[] = T("wxMDIFrameClassNR"); -wxChar wxMDIChildFrameClassName[] = T("wxMDIChildFrameClass"); -wxChar wxMDIChildFrameClassNameNoRedraw[] = T("wxMDIChildFrameClassNR"); -wxChar wxPanelClassName[] = T("wxPanelClass"); -wxChar wxCanvasClassName[] = T("wxCanvasClass"); +const wxChar *wxFrameClassName = wxT("wxFrameClass"); +const wxChar *wxFrameClassNameNoRedraw = wxT("wxFrameClassNR"); +const wxChar *wxMDIFrameClassName = wxT("wxMDIFrameClass"); +const wxChar *wxMDIFrameClassNameNoRedraw = wxT("wxMDIFrameClassNR"); +const wxChar *wxMDIChildFrameClassName = wxT("wxMDIChildFrameClass"); +const wxChar *wxMDIChildFrameClassNameNoRedraw = wxT("wxMDIChildFrameClassNR"); +const wxChar *wxPanelClassName = wxT("wxPanelClass"); +const wxChar *wxCanvasClassName = wxT("wxCanvasClass"); HICON wxSTD_FRAME_ICON = (HICON) NULL; HICON wxSTD_MDICHILDFRAME_ICON = (HICON) NULL; @@ -132,17 +151,7 @@ HICON wxDEFAULT_MDIPARENTFRAME_ICON = (HICON) NULL; HBRUSH wxDisableButtonBrush = (HBRUSH) 0; -LRESULT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM); - -#if defined(__WIN95__) && !defined(__TWIN32__) - #define wxUSE_RICHEDIT 1 -#else - #define wxUSE_RICHEDIT 0 -#endif - -#if wxUSE_RICHEDIT - static HINSTANCE gs_hRichEdit = (HINSTANCE) NULL; -#endif +LRESULT WXDLLEXPORT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM); // =========================================================================== // implementation @@ -152,7 +161,6 @@ LRESULT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM); // wxApp // --------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler) BEGIN_EVENT_TABLE(wxApp, wxEvtHandler) @@ -160,7 +168,6 @@ LRESULT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM); EVT_END_SESSION(wxApp::OnEndSession) EVT_QUERY_END_SESSION(wxApp::OnQueryEndSession) END_EVENT_TABLE() -#endif //// Initialize bool wxApp::Initialize() @@ -176,14 +183,11 @@ bool wxApp::Initialize() wxClassInfo::InitializeClasses(); #if wxUSE_RESOURCES - wxGetResource(T("wxWindows"), T("OsVersion"), &wxOsVersion); + wxGetResource(wxT("wxWindows"), wxT("OsVersion"), &wxOsVersion); #endif - // I'm annoyed ... I don't know where to put this and I don't want to - // create a module for that as it's part of the core. #if wxUSE_THREADS - wxPendingEvents = new wxList(); - wxPendingEventsLocker = new wxCriticalSection(); + wxPendingEventsLocker = new wxCriticalSection; #endif wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); @@ -201,15 +205,6 @@ bool wxApp::Initialize() #if defined(__WIN95__) InitCommonControls(); -#if wxUSE_RICHEDIT - gs_hRichEdit = LoadLibrary(T("RICHED32.DLL")); - - if (gs_hRichEdit == (HINSTANCE) NULL) - { - wxLogError(_("Could not initialise Rich Edit DLL")); - } -#endif // wxUSE_RICHEDIT - #endif // __WIN95__ #if wxUSE_OLE @@ -227,20 +222,21 @@ bool wxApp::Initialize() #if wxUSE_CTL3D if (!Ctl3dRegister(wxhInstance)) - wxLogError(T("Cannot register CTL3D")); + wxLogError(wxT("Cannot register CTL3D")); Ctl3dAutoSubclass(wxhInstance); #endif - g_globalCursor = new wxCursor; - - wxSTD_FRAME_ICON = LoadIcon(wxhInstance, T("wxSTD_FRAME")); - wxSTD_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, T("wxSTD_MDIPARENTFRAME")); - wxSTD_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, T("wxSTD_MDICHILDFRAME")); + // VZ: these icons are not in wx.rc anyhow (but should they?)! +#if 0 + wxSTD_FRAME_ICON = LoadIcon(wxhInstance, wxT("wxSTD_FRAME")); + wxSTD_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, wxT("wxSTD_MDIPARENTFRAME")); + wxSTD_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, wxT("wxSTD_MDICHILDFRAME")); - wxDEFAULT_FRAME_ICON = LoadIcon(wxhInstance, T("wxDEFAULT_FRAME")); - wxDEFAULT_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, T("wxDEFAULT_MDIPARENTFRAME")); - wxDEFAULT_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, T("wxDEFAULT_MDICHILDFRAME")); + wxDEFAULT_FRAME_ICON = LoadIcon(wxhInstance, wxT("wxDEFAULT_FRAME")); + wxDEFAULT_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, wxT("wxDEFAULT_MDIPARENTFRAME")); + wxDEFAULT_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, wxT("wxDEFAULT_MDICHILDFRAME")); +#endif // 0 RegisterWindowClasses(); @@ -248,7 +244,7 @@ bool wxApp::Initialize() LOGBRUSH lb; lb.lbStyle = BS_PATTERN; - lb.lbHatch = (int)LoadBitmap( wxhInstance, T("wxDISABLE_BUTTON_BITMAP") ); + lb.lbHatch = (int)LoadBitmap( wxhInstance, wxT("wxDISABLE_BUTTON_BITMAP") ); if ( lb.lbHatch ) { wxDisableButtonBrush = ::CreateBrushIndirect( & lb ); @@ -281,6 +277,9 @@ bool wxApp::Initialize() // RegisterWindowClasses // --------------------------------------------------------------------------- +// TODO we should only register classes really used by the app. For this it +// would be enough to just delay the class registration until an attempt +// to create a window of this class is made. bool wxApp::RegisterWindowClasses() { WNDCLASS wndclass; @@ -301,8 +300,8 @@ bool wxApp::RegisterWindowClasses() // Register the frame window class. wndclass.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE + 1); - wndclass.style = styleNormal; wndclass.lpszClassName = wxFrameClassName; + wndclass.style = styleNormal; if ( !RegisterClass(&wndclass) ) { @@ -324,7 +323,8 @@ bool wxApp::RegisterWindowClasses() // Register the MDI frame window class. wndclass.hbrBackground = (HBRUSH)NULL; // paint MDI frame ourselves - wndclass.lpszClassName = wxMDIFrameClassNameNoRedraw; + wndclass.lpszClassName = wxMDIFrameClassName; + wndclass.style = styleNormal; if ( !RegisterClass(&wndclass) ) { @@ -334,7 +334,7 @@ bool wxApp::RegisterWindowClasses() } // "no redraw" MDI frame - wndclass.lpszClassName = wxMDIFrameClassName; + wndclass.lpszClassName = wxMDIFrameClassNameNoRedraw; wndclass.style = styleNoRedraw; if ( !RegisterClass(&wndclass) ) @@ -347,6 +347,7 @@ bool wxApp::RegisterWindowClasses() // Register the MDI child frame window class. wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wndclass.lpszClassName = wxMDIChildFrameClassName; + wndclass.style = styleNormal; if ( !RegisterClass(&wndclass) ) { @@ -369,6 +370,7 @@ bool wxApp::RegisterWindowClasses() // Register the panel window class. wndclass.hbrBackground = (HBRUSH) GetStockObject( LTGRAY_BRUSH ); wndclass.lpszClassName = wxPanelClassName; + wndclass.style = styleNormal; if ( !RegisterClass(&wndclass) ) { @@ -425,11 +427,11 @@ void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine) if (i < len) { - if (cmdLine.GetChar(i) == T('"')) // We found the start of a string + if (cmdLine.GetChar(i) == wxT('"')) // We found the start of a string { i ++; int first = i; - while ((i < len) && (cmdLine.GetChar(i) != T('"'))) + while ((i < len) && (cmdLine.GetChar(i) != wxT('"'))) i ++; wxString arg(cmdLine.Mid(first, (i - first))); @@ -492,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. @@ -516,15 +511,6 @@ void wxApp::CleanUp() wxSetKeyboardHook(FALSE); -#ifdef __WIN95__ - -#if wxUSE_RICHEDIT - if (gs_hRichEdit != (HINSTANCE) NULL) - FreeLibrary(gs_hRichEdit); -#endif - -#endif - #if wxUSE_PENWINDOWS wxCleanUpPenWin(); #endif @@ -557,10 +543,10 @@ void wxApp::CleanUp() if (wxWinHandleList) delete wxWinHandleList; - // GL: I'm annoyed ... I don't know where to put this and I don't want to + // GL: I'm annoyed ... I don't know where to put this and I don't want to // create a module for that as it's part of the core. -#if wxUSE_THREADS delete wxPendingEvents; +#if wxUSE_THREADS delete wxPendingEventsLocker; // If we don't do the following, we get an apparent memory leak. ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker(); @@ -578,7 +564,7 @@ void wxApp::CleanUp() // wxDebugContext, too. if (wxDebugContext::CountObjectsLeft(TRUE) > 0) { - wxLogDebug(T("There were memory leaks.")); + wxLogDebug(wxT("There were memory leaks.")); wxDebugContext::Dump(); wxDebugContext::PrintStatistics(); } @@ -610,7 +596,17 @@ int wxEntry(WXHINSTANCE hInstance, // (another useful flag is _CRTDBG_DELAY_FREE_MEM_DF which doesn't free // deallocated memory which may be used to simulate low-memory condition) wxCrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF); - +#ifdef __MWERKS__ +#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT + // This seems to be necessary since there are 'rogue' + // objects present at this point (perhaps global objects?) + // Setting a checkpoint will ignore them as far as the + // memory checking facility is concerned. + // Of course you may argue that memory allocated in globals should be + // checked, but this is a reasonable compromise. + 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! @@ -622,7 +618,6 @@ int wxEntry(WXHINSTANCE hInstance, #else #undef CATCH_PROGRAM_EXCEPTIONS #endif - wxhInstance = (HINSTANCE) hInstance; if (!wxApp::Initialize()) @@ -635,12 +630,12 @@ int wxEntry(WXHINSTANCE hInstance, // the IMPLEMENT_APP macro is used instead, which sets an initializer // function for delayed, dynamic app object construction. wxCHECK_MSG( wxApp::GetInitializerFunction(), 0, - T("No initializer - use IMPLEMENT_APP macro.") ); + wxT("No initializer - use IMPLEMENT_APP macro.") ); wxTheApp = (*wxApp::GetInitializerFunction()) (); } - wxCHECK_MSG( wxTheApp, 0, T("You have to define an instance of wxApp!") ); + wxCHECK_MSG( wxTheApp, 0, wxT("You have to define an instance of wxApp!") ); // save the WinMain() parameters wxTheApp->ConvertToStandardCommandArgs(lpCmdLine); @@ -650,6 +645,13 @@ int wxEntry(WXHINSTANCE hInstance, // 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. +#ifdef __VISUALC__ + wxLog::SetTimestamp(NULL); +#endif + int retValue = 0; if ( wxTheApp->OnInit() ) @@ -818,7 +820,7 @@ bool wxApp::DoMessage() { #if wxUSE_THREADS wxASSERT_MSG( wxThread::IsMain(), - T("only the main thread can process Windows messages") ); + wxT("only the main thread can process Windows messages") ); static bool s_hadGuiLock = TRUE; static wxMsgArray s_aSavedMessages; @@ -903,12 +905,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(); } @@ -925,33 +925,15 @@ bool wxApp::ProcessIdle() return event.MoreRequested(); } -#if wxUSE_THREADS -void wxApp::ProcessPendingEvents() -{ - wxNode *node = wxPendingEvents->First(); - wxCriticalSectionLocker locker(*wxPendingEventsLocker); - - while (node) - { - wxEvtHandler *handler = (wxEvtHandler *)node->Data(); - - handler->ProcessPendingEvents(); - - delete node; - node = wxPendingEvents->First(); - } -} -#endif - - void wxApp::ExitMainLoop() { + // 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() @@ -969,19 +951,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) ) @@ -1008,14 +995,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 @@ -1026,10 +1020,6 @@ void wxApp::OnIdle(wxIdleEvent& event) event.RequestMore(TRUE); } - // If they are pending events, we must process them. -#if wxUSE_THREADS - ProcessPendingEvents(); -#endif s_inOnIdle = FALSE; } @@ -1109,47 +1099,99 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event) } } -int wxApp::GetComCtl32Version() const +/* static */ +int wxApp::GetComCtl32Version() { - // have we loaded COMCTL32 yet? - HMODULE theModule = ::GetModuleHandle(T("COMCTL32")); - int version = 0; + // cache the result + static int s_verComCtl32 = -1; + + wxCRIT_SECT_DECLARE(csComCtl32); + wxCRIT_SECT_LOCKER(lock, csComCtl32); - // if so, then we can check for the version - if (theModule) + if ( s_verComCtl32 == -1 ) { - // InitCommonControlsEx is unique to 4.7 and later - FARPROC theProc = ::GetProcAddress(theModule, "InitCommonControlsEx"); + // initally assume no comctl32.dll at all + s_verComCtl32 = 0; - if (! theProc) - { // not found, must be 4.00 - version = 400; - } - else + // do we have it? + HMODULE hModuleComCtl32 = ::GetModuleHandle(wxT("COMCTL32")); + + // if so, then we can check for the version + if ( hModuleComCtl32 ) { - // 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; - } + // try to use DllGetVersion() if available in _headers_ + #ifdef DLLVER_PLATFORM_WINDOWS // defined in shlwapi.h + DLLGETVERSIONPROC pfnDllGetVersion = (DLLGETVERSIONPROC) + ::GetProcAddress(hModuleComCtl32, _T("DllGetVersion")); + if ( pfnDllGetVersion ) + { + DLLVERSIONINFO dvi; + dvi.cbSize = sizeof(dvi); + + HRESULT hr = (*pfnDllGetVersion)(&dvi); + if ( FAILED(hr) ) + { + wxLogApiError(_T("DllGetVersion"), hr); + } + else + { + // this is incompatible with _WIN32_IE values, but + // compatible with the other values returned by + // GetComCtl32Version() + s_verComCtl32 = 100*dvi.dwMajorVersion + + dvi.dwMinorVersion; + } + } + #endif + // DllGetVersion() unavailable either during compile or + // run-time, try to guess the version otherwise + if ( !s_verComCtl32 ) + { + // InitCommonControlsEx is unique to 4.70 and later + FARPROC theProc = ::GetProcAddress + ( + hModuleComCtl32, +#if defined(__BORLANDC__) && (__BORLANDC__ <= 0x520) + "InitCommonControlsEx" +#else + _T("InitCommonControlsEx") +#endif + ); + + if ( !theProc ) + { + // not found, must be 4.00 + s_verComCtl32 = 400; + } + else + { + // many symbols appeared in comctl32 4.71, could use + // any of them except may be DllInstall + theProc = ::GetProcAddress + ( + hModuleComCtl32, +#if defined(__BORLANDC__) && (__BORLANDC__ <= 0x520) + "InitializeFlatSB" +#else + _T("InitializeFlatSB") +#endif + ); + if ( !theProc ) + { + // not found, must be 4.70 + s_verComCtl32 = 470; + } + else + { + // found, must be 4.71 + s_verComCtl32 = 471; + } + } + } } } - return version; + + return s_verComCtl32; } void wxExit() @@ -1162,26 +1204,56 @@ void wxExit() // 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; - // We want to go back to the main message loop - // if we see a WM_QUIT. (?) -#ifdef __WXWINE__ - while (PeekMessage(&msg, (HWND)NULL, 0, 0, PM_NOREMOVE) && msg.message != WM_QUIT) -#else - while (PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE) && msg.message != WM_QUIT) -#endif + 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. -#if wxUSE_THREADS wxTheApp->ProcessPendingEvents(); -#endif + + // let the logs be flashed again + wxLog::Resume(); return TRUE; } +//----------------------------------------------------------------------------- +// wxWakeUpIdle +//----------------------------------------------------------------------------- + +void wxWakeUpIdle() +{ + // Send the top window a dummy message so idle handler processing will + // start up again. Doing it this way ensures that the idle handler + // wakes up in the right thread (see also wxWakeUpMainThread() which does + // the same for the main app thread only) + wxWindow *topWindow = wxTheApp->GetTopWindow(); + if ( topWindow ) + { + if ( !::PostMessage(GetHwndOf(topWindow), WM_NULL, 0, 0) ) + { + // should never happen + wxLogLastError("PostMessage(WM_NULL)"); + } + } +} + +//----------------------------------------------------------------------------- + wxIcon wxApp::GetStdIcon(int which) const { @@ -1197,7 +1269,7 @@ wxApp::GetStdIcon(int which) const return wxIcon("wxICON_WARNING"); default: - wxFAIL_MSG(T("requested non existent standard icon")); + wxFAIL_MSG(wxT("requested non existent standard icon")); // still fall through case wxICON_HAND: @@ -1205,19 +1277,8 @@ wxApp::GetStdIcon(int which) const } } - -HINSTANCE wxGetInstance() -{ - return wxhInstance; -} - -void wxSetInstance(HINSTANCE hInst) -{ - wxhInstance = hInst; -} - // For some reason, with MSVC++ 1.5, WinMain isn't linked in properly // if in a separate file. So include it here to ensure it's linked. -#if (defined(__VISUALC__) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__TWIN32__)) +#if (defined(__VISUALC__) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__TWIN32__) && !defined(WXMAKINGDLL)) #include "main.cpp" #endif