X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ebea0891d0a5531cfd1ff85e6d77fab66dcf834b..b4a2ab728bf4627ab2b41385b69e31f10c1fd3b1:/src/msw/app.cpp diff --git a/src/msw/app.cpp b/src/msw/app.cpp index 8b1b21727f..36199a3d67 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -19,6 +19,7 @@ #ifdef __GNUG__ #pragma implementation "app.h" + #pragma implementation "appbase.h" #endif // For compilers that support precompilation, includes "wx.h". @@ -68,11 +69,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 +84,7 @@ #include #include -#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) +#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS) #include #endif @@ -107,11 +110,17 @@ 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[] = 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"); HICON wxSTD_FRAME_ICON = (HICON) NULL; HICON wxSTD_MDICHILDFRAME_ICON = (HICON) NULL; @@ -167,7 +176,7 @@ bool wxApp::Initialize() wxClassInfo::InitializeClasses(); #if wxUSE_RESOURCES - wxGetResource(_T("wxWindows"), _T("OsVersion"), &wxOsVersion); + wxGetResource(T("wxWindows"), T("OsVersion"), &wxOsVersion); #endif // I'm annoyed ... I don't know where to put this and I don't want to @@ -193,7 +202,7 @@ bool wxApp::Initialize() InitCommonControls(); #if wxUSE_RICHEDIT - gs_hRichEdit = LoadLibrary(_T("RICHED32.DLL")); + gs_hRichEdit = LoadLibrary(T("RICHED32.DLL")); if (gs_hRichEdit == (HINSTANCE) NULL) { @@ -203,32 +212,35 @@ bool wxApp::Initialize() #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(T("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")); + wxSTD_FRAME_ICON = LoadIcon(wxhInstance, T("wxSTD_FRAME")); + wxSTD_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, T("wxSTD_MDIPARENTFRAME")); + wxSTD_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, T("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, T("wxDEFAULT_FRAME")); + wxDEFAULT_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, T("wxDEFAULT_MDIPARENTFRAME")); + wxDEFAULT_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, T("wxDEFAULT_MDICHILDFRAME")); RegisterWindowClasses(); @@ -236,7 +248,7 @@ bool wxApp::Initialize() LOGBRUSH lb; lb.lbStyle = BS_PATTERN; - lb.lbHatch = (int)LoadBitmap( wxhInstance, _T("wxDISABLE_BUTTON_BITMAP") ); + lb.lbHatch = (int)LoadBitmap( wxhInstance, T("wxDISABLE_BUTTON_BITMAP") ); if ( lb.lbHatch ) { wxDisableButtonBrush = ::CreateBrushIndirect( & lb ); @@ -273,11 +285,15 @@ 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,9 +301,7 @@ bool wxApp::RegisterWindowClasses() // Register the frame window class. wndclass.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE + 1); -#ifdef _MULTIPLE_INSTANCES - sprintf( wxFrameClassName,"wxFrameClass%d", wxhInstance ); -#endif + wndclass.style = styleNormal; wndclass.lpszClassName = wxFrameClassName; if ( !RegisterClass(&wndclass) ) @@ -297,9 +311,20 @@ 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.lpszClassName = wxMDIFrameClassNameNoRedraw; if ( !RegisterClass(&wndclass) ) { @@ -308,6 +333,17 @@ bool wxApp::RegisterWindowClasses() return FALSE; } + // "no redraw" MDI frame + wndclass.lpszClassName = wxMDIFrameClassName; + 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; @@ -319,6 +355,17 @@ 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; @@ -378,11 +425,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) == T('"')) // We found the start of a string { i ++; int first = i; - while ((i < len) && (cmdLine.GetChar(i) != _T('"'))) + while ((i < len) && (cmdLine.GetChar(i) != T('"'))) i ++; wxString arg(cmdLine.Mid(first, (i - first))); @@ -531,7 +578,7 @@ void wxApp::CleanUp() // wxDebugContext, too. if (wxDebugContext::CountObjectsLeft(TRUE) > 0) { - wxLogDebug(_T("There were memory leaks.")); + wxLogDebug(T("There were memory leaks.")); wxDebugContext::Dump(); wxDebugContext::PrintStatistics(); } @@ -588,12 +635,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.") ); + T("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, T("You have to define an instance of wxApp!") ); // save the WinMain() parameters wxTheApp->ConvertToStandardCommandArgs(lpCmdLine); @@ -708,7 +755,7 @@ int wxEntry(WXHINSTANCE hInstance) //// Static member initialization -wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL; +wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL; wxApp::wxApp() { @@ -771,7 +818,7 @@ bool wxApp::DoMessage() { #if wxUSE_THREADS wxASSERT_MSG( wxThread::IsMain(), - _T("only the main thread can process Windows messages") ); + T("only the main thread can process Windows messages") ); static bool s_hadGuiLock = TRUE; static wxMsgArray s_aSavedMessages; @@ -1062,25 +1109,10 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event) } } -wxLog* wxApp::CreateLogTarget() -{ - return new wxLogGui; -} - -wxWindow* wxApp::GetTopWindow() const -{ - if (m_topWindow) - return m_topWindow; - else if (wxTopLevelWindows.GetCount() > 0) - return wxTopLevelWindows.GetFirst()->GetData(); - else - return NULL; -} - int wxApp::GetComCtl32Version() const { // have we loaded COMCTL32 yet? - HMODULE theModule = ::GetModuleHandle(_T("COMCTL32")); + HMODULE theModule = ::GetModuleHandle(T("COMCTL32")); int version = 0; // if so, then we can check for the version @@ -1149,28 +1181,28 @@ bool wxYield() return TRUE; } + wxIcon wxApp::GetStdIcon(int which) const { - switch(which) - { - case wxICON_INFORMATION: - return wxIcon("wxICON_INFO"); - break; - case wxICON_HAND: - return wxIcon("wxICON_ERROR"); - break; - case wxICON_QUESTION: - return wxIcon("wxICON_QUESTION"); - break; - case wxICON_EXCLAMATION: - return wxIcon("wxICON_WARNING"); - break; - default: - wxFAIL_MSG("requested non existent standard icon"); - return wxIcon("wxICON_ERROR"); - break; - } + switch(which) + { + case wxICON_INFORMATION: + return wxIcon("wxICON_INFO"); + + case wxICON_QUESTION: + return wxIcon("wxICON_QUESTION"); + + case wxICON_EXCLAMATION: + return wxIcon("wxICON_WARNING"); + + default: + wxFAIL_MSG(T("requested non existent standard icon")); + // still fall through + + case wxICON_HAND: + return wxIcon("wxICON_ERROR"); + } }