X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/094637f6d69918150d3dfdb199ad7c92e3189f78..4304b42f1a1a586e96c645cb47d1cd3c98e3dec6:/src/msw/app.cpp diff --git a/src/msw/app.cpp b/src/msw/app.cpp index 2aa0395d6e..0b947a5409 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -43,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,11 +68,13 @@ #endif // OLE is used for drag-and-drop, clipboard, OLE Automation... +#ifndef wxUSE_NORLANDER_HEADERS #if defined(__GNUWIN32__) || defined(__SC__) || defined(__SALFORDC__) #undef wxUSE_OLE #define wxUSE_OLE 0 #endif // broken compilers +#endif #if wxUSE_OLE #include @@ -81,7 +83,7 @@ #include #include -#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) +#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS) #include #endif @@ -95,23 +97,24 @@ 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? -wxChar wxFrameClassName[] = _T("wxFrameClass"); -wxChar wxMDIFrameClassName[] = _T("wxMDIFrameClass"); -wxChar wxMDIChildFrameClassName[] = _T("wxMDIChildFrameClass"); -wxChar wxPanelClassName[] = _T("wxPanelClass"); -wxChar wxCanvasClassName[] = _T("wxCanvasClass"); + +// NB: all "NoRedraw" classes must have the same names as the "normal" classes +// with NR suffix - wxWindow::MSWCreate() supposes this +wxChar wxFrameClassName[] = wxT("wxFrameClass"); +wxChar wxFrameClassNameNoRedraw[] = wxT("wxFrameClassNR"); +wxChar wxMDIFrameClassName[] = wxT("wxMDIFrameClass"); +wxChar wxMDIFrameClassNameNoRedraw[] = wxT("wxMDIFrameClassNR"); +wxChar wxMDIChildFrameClassName[] = wxT("wxMDIChildFrameClass"); +wxChar wxMDIChildFrameClassNameNoRedraw[] = wxT("wxMDIChildFrameClassNR"); +wxChar wxPanelClassName[] = wxT("wxPanelClass"); +wxChar wxCanvasClassName[] = wxT("wxCanvasClass"); HICON wxSTD_FRAME_ICON = (HICON) NULL; HICON wxSTD_MDICHILDFRAME_ICON = (HICON) NULL; @@ -123,16 +126,12 @@ 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 +LRESULT WXDLLEXPORT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM); #if wxUSE_RICHEDIT - static HINSTANCE gs_hRichEdit = (HINSTANCE) NULL; + // the handle to richedit DLL and the version of the DLL loaded + static HINSTANCE gs_hRichEdit = (HINSTANCE)NULL; + static int gs_verRichEdit = -1; #endif // =========================================================================== @@ -167,14 +166,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); @@ -192,43 +188,40 @@ 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 + +#ifdef __WIN16__ // for OLE, enlarge message queue to be as large as possible int iMsg = 96; - while (!SetMessageQueue(iMsg) && (iMsg -= 8)); - -#if wxUSE_OLE + while (!SetMessageQueue(iMsg) && (iMsg -= 8)) + ; +#endif // Win16 // we need to initialize OLE library if ( FAILED(::OleInitialize(NULL)) ) wxLogError(_("Cannot initialize OLE")); -#endif +#endif // wxUSE_OLE #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(); @@ -236,7 +229,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 ); @@ -269,15 +262,22 @@ 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; + // for each class we register one with CS_(V|H)REDRAW style and one + // without for windows created with wxNO_FULL_REDRAW_ON_REPAINT flag + static const long styleNormal = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS; + static const long styleNoRedraw = CS_DBLCLKS; + // the fields which are common to all classes - wndclass.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS; wndclass.lpfnWndProc = (WNDPROC)wxWndProc; wndclass.cbClsExtra = 0; - wndclass.cbWndExtra = sizeof( DWORD ); // what is this DWORD used for? + wndclass.cbWndExtra = sizeof( DWORD ); // VZ: what is this DWORD used for? wndclass.hInstance = wxhInstance; wndclass.hIcon = (HICON) NULL; wndclass.hCursor = ::LoadCursor((HINSTANCE)NULL, IDC_ARROW); @@ -285,10 +285,8 @@ bool wxApp::RegisterWindowClasses() // Register the frame window class. wndclass.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE + 1); -#ifdef _MULTIPLE_INSTANCES - sprintf( wxFrameClassName,"wxFrameClass%d", wxhInstance ); -#endif wndclass.lpszClassName = wxFrameClassName; + wndclass.style = styleNormal; if ( !RegisterClass(&wndclass) ) { @@ -297,9 +295,21 @@ bool wxApp::RegisterWindowClasses() return FALSE; } + // "no redraw" frame + wndclass.lpszClassName = wxFrameClassNameNoRedraw; + wndclass.style = styleNoRedraw; + + if ( !RegisterClass(&wndclass) ) + { + wxLogLastError("RegisterClass(no redraw frame)"); + + return FALSE; + } + // Register the MDI frame window class. wndclass.hbrBackground = (HBRUSH)NULL; // paint MDI frame ourselves wndclass.lpszClassName = wxMDIFrameClassName; + wndclass.style = styleNormal; if ( !RegisterClass(&wndclass) ) { @@ -308,9 +318,21 @@ bool wxApp::RegisterWindowClasses() return FALSE; } + // "no redraw" MDI frame + wndclass.lpszClassName = wxMDIFrameClassNameNoRedraw; + wndclass.style = styleNoRedraw; + + if ( !RegisterClass(&wndclass) ) + { + wxLogLastError("RegisterClass(no redraw MDI parent frame)"); + + return FALSE; + } + // Register the MDI child frame window class. wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wndclass.lpszClassName = wxMDIChildFrameClassName; + wndclass.style = styleNormal; if ( !RegisterClass(&wndclass) ) { @@ -319,9 +341,21 @@ bool wxApp::RegisterWindowClasses() return FALSE; } + // "no redraw" MDI child frame + wndclass.lpszClassName = wxMDIChildFrameClassNameNoRedraw; + wndclass.style = styleNoRedraw; + + if ( !RegisterClass(&wndclass) ) + { + wxLogLastError("RegisterClass(no redraw MDI child)"); + + return FALSE; + } + // Register the panel window class. wndclass.hbrBackground = (HBRUSH) GetStockObject( LTGRAY_BRUSH ); wndclass.lpszClassName = wxPanelClassName; + wndclass.style = styleNormal; if ( !RegisterClass(&wndclass) ) { @@ -378,11 +412,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))); @@ -469,15 +503,11 @@ 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 @@ -510,10 +540,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(); @@ -531,7 +561,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(); } @@ -575,7 +605,6 @@ int wxEntry(WXHINSTANCE hInstance, #else #undef CATCH_PROGRAM_EXCEPTIONS #endif - wxhInstance = (HINSTANCE) hInstance; if (!wxApp::Initialize()) @@ -588,12 +617,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); @@ -603,6 +632,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() ) @@ -708,7 +744,7 @@ int wxEntry(WXHINSTANCE hInstance) //// Static member initialization -wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL; +wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL; wxApp::wxApp() { @@ -771,7 +807,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; @@ -878,25 +914,6 @@ 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() { m_keepGoing = FALSE; @@ -930,7 +947,7 @@ bool wxApp::ProcessMessage(WXMSG *wxmsg) while ( hWnd && !wndThis ) { hWnd = ::GetParent(hWnd); - wndThis = wxFindWinFromHandle((WXHWND)hWnd); + wndThis = wxFindWinFromHandle((WXHWND)hWnd); } // Try translations first; find the youngest window with @@ -979,10 +996,11 @@ void wxApp::OnIdle(wxIdleEvent& event) event.RequestMore(TRUE); } - // If they are pending events, we must process them. -#if wxUSE_THREADS + // 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(); -#endif + s_inOnIdle = FALSE; } @@ -1062,47 +1080,105 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event) } } -int wxApp::GetComCtl32Version() const +#if wxUSE_RICHEDIT + +/* static */ +bool wxApp::InitRichEdit(int version) { - // have we loaded COMCTL32 yet? - HMODULE theModule = ::GetModuleHandle(_T("COMCTL32")); - int version = 0; + 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 so, then we can check for the version - if (theModule) + if ( gs_hRichEdit ) { - // InitCommonControlsEx is unique to 4.7 and later - FARPROC theProc = ::GetProcAddress(theModule, "InitCommonControlsEx"); + ::FreeLibrary(gs_hRichEdit); + } - if (! theProc) - { // not found, must be 4.00 - version = 400; - } - else + // 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() +{ + // TODO should use DllGetVersion() instead of this hack + + // cache the result + static int s_verComCtl32 = -1; // MT-FIXME + + if ( s_verComCtl32 == -1 ) + { + s_verComCtl32 = 0; + + // have we loaded COMCTL32 yet? + HMODULE theModule = ::GetModuleHandle(wxT("COMCTL32")); + + // if so, then we can check for the version + if (theModule) { - // 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; + // InitCommonControlsEx is unique to 4.7 and later + FARPROC theProc = ::GetProcAddress(theModule, + _T("InitCommonControlsEx")); + + if ( !theProc ) + { // not found, must be 4.00 + s_verComCtl32 = 400; } 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, _T("DllInstall")); + 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() @@ -1115,26 +1191,46 @@ void wxExit() // Yield to incoming messages bool wxYield() { + // 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 ( !wxTheApp->DoMessage() ) break; } + // If they are pending events, we must process them. -#if wxUSE_THREADS wxTheApp->ProcessPendingEvents(); -#endif 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 { @@ -1150,7 +1246,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: @@ -1158,17 +1254,6 @@ 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__))