X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3a5ffa81c1cdf446c3d79f6f4676f91092e1c0f5..18c98e42eeb75317f75c9ba20b09a5bd531a690c:/src/msw/app.cpp diff --git a/src/msw/app.cpp b/src/msw/app.cpp index 07a2d29ccd..76ef09c046 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -43,12 +43,15 @@ #include "wx/msgdlg.h" #include "wx/intl.h" #include "wx/dynarray.h" + #include "wx/wxchar.h" + #include "wx/icon.h" #endif -#include "wx/msw/private.h" #include "wx/log.h" #include "wx/module.h" +#include "wx/msw/private.h" + #if wxUSE_THREADS #include "wx/thread.h" @@ -65,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 @@ -78,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 @@ -88,14 +93,10 @@ // global variables // --------------------------------------------------------------------------- -extern char *wxBuffer; -extern char *wxOsVersion; +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; @@ -104,11 +105,17 @@ MSG s_currentMsg; wxApp *wxTheApp = NULL; // FIXME why not const? and not static? -char wxFrameClassName[] = "wxFrameClass"; -char wxMDIFrameClassName[] = "wxMDIFrameClass"; -char wxMDIChildFrameClassName[] = "wxMDIChildFrameClass"; -char wxPanelClassName[] = "wxPanelClass"; -char wxCanvasClassName[] = "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; @@ -159,19 +166,16 @@ bool wxApp::Initialize() // wxRedirectIOToConsole(); #endif - wxBuffer = new char[1500]; // FIXME + wxBuffer = new wxChar[1500]; // FIXME wxClassInfo::InitializeClasses(); #if wxUSE_RESOURCES - wxGetResource("wxWindows", "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); @@ -190,7 +194,7 @@ bool wxApp::Initialize() InitCommonControls(); #if wxUSE_RICHEDIT - gs_hRichEdit = LoadLibrary("RICHED32.DLL"); + gs_hRichEdit = LoadLibrary(wxT("RICHED32.DLL")); if (gs_hRichEdit == (HINSTANCE) NULL) { @@ -200,32 +204,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("Cannot register CTL3D"); + wxLogError(wxT("Cannot register CTL3D")); Ctl3dAutoSubclass(wxhInstance); #endif g_globalCursor = new wxCursor; - wxSTD_FRAME_ICON = LoadIcon(wxhInstance, "wxSTD_FRAME"); - wxSTD_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, "wxSTD_MDIPARENTFRAME"); - wxSTD_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, "wxSTD_MDICHILDFRAME"); + 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, "wxDEFAULT_FRAME"); - wxDEFAULT_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, "wxDEFAULT_MDIPARENTFRAME"); - wxDEFAULT_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, "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")); RegisterWindowClasses(); @@ -233,7 +240,7 @@ bool wxApp::Initialize() LOGBRUSH lb; lb.lbStyle = BS_PATTERN; - lb.lbHatch = (int)LoadBitmap( wxhInstance, "wxDISABLE_BUTTON_BITMAP" ); + lb.lbHatch = (int)LoadBitmap( wxhInstance, wxT("wxDISABLE_BUTTON_BITMAP") ); if ( lb.lbHatch ) { wxDisableButtonBrush = ::CreateBrushIndirect( & lb ); @@ -266,15 +273,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); @@ -282,10 +296,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) ) { @@ -294,9 +306,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) ) { @@ -305,9 +329,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) ) { @@ -316,9 +352,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) ) { @@ -353,13 +401,13 @@ void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine) int count = 0; // Get application name - char name[260]; // 260 is MAX_PATH value from windef.h + wxChar name[260]; // 260 is MAX_PATH value from windef.h ::GetModuleFileName(wxhInstance, name, WXSIZEOF(name)); args.Add(name); count++; - strcpy(name, wxFileNameFromPath(name)); + wxStrcpy(name, wxFileNameFromPath(name)); wxStripExtension(name); wxTheApp->SetAppName(name); @@ -370,16 +418,16 @@ void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine) while (i < len) { // Skip whitespace - while ((i < len) && isspace(cmdLine.GetChar(i))) + while ((i < len) && wxIsspace(cmdLine.GetChar(i))) i ++; if (i < len) { - if (cmdLine.GetChar(i) == '"') // 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) != '"')) + while ((i < len) && (cmdLine.GetChar(i) != wxT('"'))) i ++; wxString arg(cmdLine.Mid(first, (i - first))); @@ -393,7 +441,7 @@ void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine) else // Unquoted argument { int first = i; - while ((i < len) && !isspace(cmdLine.GetChar(i))) + while ((i < len) && !wxIsspace(cmdLine.GetChar(i))) i ++; wxString arg(cmdLine.Mid(first, (i - first))); @@ -404,11 +452,11 @@ void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine) } } - wxTheApp->argv = new char*[count + 1]; + wxTheApp->argv = new wxChar*[count + 1]; for (i = 0; i < count; i++) { wxString arg(args[i]); - wxTheApp->argv[i] = copystring((const char*)arg); + wxTheApp->argv[i] = copystring((const wxChar*)arg); } wxTheApp->argv[count] = NULL; // argv[] is a NULL-terminated list wxTheApp->argc = count; @@ -509,8 +557,8 @@ void wxApp::CleanUp() // 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(); @@ -528,7 +576,7 @@ void wxApp::CleanUp() // wxDebugContext, too. if (wxDebugContext::CountObjectsLeft(TRUE) > 0) { - wxLogDebug("There were memory leaks."); + wxLogDebug(wxT("There were memory leaks.")); wxDebugContext::Dump(); wxDebugContext::PrintStatistics(); } @@ -585,12 +633,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, - "No initializer - use IMPLEMENT_APP macro." ); + wxT("No initializer - use IMPLEMENT_APP macro.") ); wxTheApp = (*wxApp::GetInitializerFunction()) (); } - wxCHECK_MSG( wxTheApp, 0, "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); @@ -705,7 +753,7 @@ int wxEntry(WXHINSTANCE hInstance) //// Static member initialization -wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL; +wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL; wxApp::wxApp() { @@ -768,7 +816,7 @@ bool wxApp::DoMessage() { #if wxUSE_THREADS wxASSERT_MSG( wxThread::IsMain(), - "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; @@ -875,25 +923,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; @@ -921,6 +950,15 @@ bool wxApp::ProcessMessage(WXMSG *wxmsg) HWND hWnd = msg->hwnd; wxWindow *wndThis = wxFindWinFromHandle((WXHWND)hWnd), *wnd; + // 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 ) + { + hWnd = ::GetParent(hWnd); + wndThis = wxFindWinFromHandle((WXHWND)hWnd); + } + // Try translations first; find the youngest window with // a translation table. for ( wnd = wndThis; wnd; wnd = wnd->GetParent() ) @@ -967,10 +1005,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; } @@ -1050,25 +1089,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("COMCTL32"); + HMODULE theModule = ::GetModuleHandle(wxT("COMCTL32")); int version = 0; // if so, then we can check for the version @@ -1118,26 +1142,47 @@ 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; } +wxIcon +wxApp::GetStdIcon(int which) const +{ + 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(wxT("requested non existent standard icon")); + // still fall through + + case wxICON_HAND: + return wxIcon("wxICON_ERROR"); + } +} + + HINSTANCE wxGetInstance() { return wxhInstance;