X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e146b8c8bf449e2264ac3edc6a0228585c619dd1..75d684d9f772126b02aaea7eedadc79cd24aaf32:/src/msw/app.cpp diff --git a/src/msw/app.cpp b/src/msw/app.cpp index 91433c5051..d1a70a3d3c 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". @@ -43,12 +44,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 +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 @@ -78,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 @@ -88,27 +94,33 @@ // 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; +extern wxList *wxPendingEvents; +extern wxCriticalSection *wxPendingEventsLocker; #endif extern void wxSetKeyboardHook(bool doIt); extern wxCursor *g_globalCursor; HINSTANCE wxhInstance = 0; -static MSG s_currentMsg; +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[] = _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; @@ -150,8 +162,6 @@ LRESULT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM); END_EVENT_TABLE() #endif -long wxApp::sm_lastMessageTime = 0; - //// Initialize bool wxApp::Initialize() { @@ -161,12 +171,19 @@ 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(_T("wxWindows"), _T("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(); #endif wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING); @@ -185,7 +202,7 @@ bool wxApp::Initialize() InitCommonControls(); #if wxUSE_RICHEDIT - gs_hRichEdit = LoadLibrary("RICHED32.DLL"); + gs_hRichEdit = LoadLibrary(_T("RICHED32.DLL")); if (gs_hRichEdit == (HINSTANCE) NULL) { @@ -195,54 +212,49 @@ 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)); - - /* - DWORD dwOleVer; - dwOleVer = CoBuildVersion(); - - // check the OLE library version - if (rmm != HIWORD(dwOleVer)) - { - wxMessageBox("Incorrect version of OLE libraries."); - return FALSE; - } - */ - -#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(_T("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, _T("wxSTD_FRAME")); + wxSTD_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, _T("wxSTD_MDIPARENTFRAME")); + wxSTD_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, _T("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, _T("wxDEFAULT_FRAME")); + wxDEFAULT_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, _T("wxDEFAULT_MDIPARENTFRAME")); + wxDEFAULT_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, _T("wxDEFAULT_MDICHILDFRAME")); RegisterWindowClasses(); // Create the brush for disabling bitmap buttons - LOGBRUSH lb ; + LOGBRUSH lb; lb.lbStyle = BS_PATTERN; - lb.lbHatch = (int)LoadBitmap( wxhInstance, "wxDISABLE_BUTTON_BITMAP" ) ; - wxDisableButtonBrush = ::CreateBrushIndirect( & lb ) ; - ::DeleteObject( (HGDIOBJ)lb.lbHatch ) ; + lb.lbHatch = (int)LoadBitmap( wxhInstance, _T("wxDISABLE_BUTTON_BITMAP") ); + if ( lb.lbHatch ) + { + wxDisableButtonBrush = ::CreateBrushIndirect( & lb ); + ::DeleteObject( (HGDIOBJ)lb.lbHatch ); + } + //else: wxWindows resources are probably not linked in #if wxUSE_PENWINDOWS wxRegisterPenWin(); @@ -265,131 +277,123 @@ bool wxApp::Initialize() return TRUE; } -//// RegisterWindowClasses +// --------------------------------------------------------------------------- +// RegisterWindowClasses +// --------------------------------------------------------------------------- bool wxApp::RegisterWindowClasses() { - /////////////////////////////////////////////////////////////////////// - // Register the frame window class. - WNDCLASS wndclass; // Structure used to register Windows class. + 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; - wndclass.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS ; + // the fields which are common to all classes wndclass.lpfnWndProc = (WNDPROC)wxWndProc; wndclass.cbClsExtra = 0; - wndclass.cbWndExtra = sizeof( DWORD ); // was 4 + wndclass.cbWndExtra = sizeof( DWORD ); // VZ: what is this DWORD used for? wndclass.hInstance = wxhInstance; - wndclass.hIcon = (HICON) NULL; // wxSTD_FRAME_ICON; - wndclass.hCursor = LoadCursor( (HINSTANCE) NULL, IDC_ARROW ); - wndclass.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE+1) ; - // wndclass.hbrBackground = GetStockObject( WHITE_BRUSH ); + wndclass.hIcon = (HICON) NULL; + wndclass.hCursor = ::LoadCursor((HINSTANCE)NULL, IDC_ARROW); wndclass.lpszMenuName = NULL; -#ifdef _MULTIPLE_INSTANCES - sprintf( wxFrameClassName,"wxFrameClass%d", wxhInstance ); -#endif + + // Register the frame window class. + wndclass.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE + 1); + wndclass.style = styleNormal; wndclass.lpszClassName = wxFrameClassName; - if (!RegisterClass( &wndclass )) + if ( !RegisterClass(&wndclass) ) + { + wxLogLastError("RegisterClass(frame)"); + + return FALSE; + } + + // "no redraw" frame + wndclass.lpszClassName = wxFrameClassNameNoRedraw; + wndclass.style = styleNoRedraw; + + if ( !RegisterClass(&wndclass) ) { - // wxFatalError("Can't register Frame Window class"); + wxLogLastError("RegisterClass(no redraw frame)"); + + return FALSE; } - /////////////////////////////////////////////////////////////////////// // Register the MDI frame window class. - WNDCLASS wndclass1; // Structure used to register Windows class. - - wndclass1.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS ; - wndclass1.lpfnWndProc = (WNDPROC)wxWndProc; - wndclass1.cbClsExtra = 0; - wndclass1.cbWndExtra = sizeof( DWORD ); // was 4 - wndclass1.hInstance = wxhInstance; - wndclass1.hIcon = (HICON) NULL; // wxSTD_MDIPARENTFRAME_ICON; - wndclass1.hCursor = LoadCursor( (HINSTANCE) NULL, IDC_ARROW ); - // wndclass1.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE+1) ; - wndclass1.hbrBackground = (HBRUSH) NULL; - wndclass1.lpszMenuName = NULL; - - wndclass1.lpszClassName = wxMDIFrameClassName; - if (!RegisterClass( &wndclass1 )) + wndclass.hbrBackground = (HBRUSH)NULL; // paint MDI frame ourselves + wndclass.lpszClassName = wxMDIFrameClassNameNoRedraw; + + if ( !RegisterClass(&wndclass) ) { - // wxFatalError("Can't register MDI Frame window class"); - // return FALSE; + wxLogLastError("RegisterClass(MDI parent)"); + + 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 wndclass4; // Structure used to register Windows class. - - wndclass4.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS ; - wndclass4.lpfnWndProc = (WNDPROC)wxWndProc; - wndclass4.cbClsExtra = 0; - wndclass4.cbWndExtra = sizeof( DWORD ); // was 4 - wndclass4.hInstance = wxhInstance; - wndclass4.hIcon = (HICON) NULL; // wxSTD_MDICHILDFRAME_ICON; - wndclass4.hCursor = LoadCursor( (HINSTANCE) NULL, IDC_ARROW ); - // TODO: perhaps this should be NULL so that Windows doesn't - // paint the background itself (would OnEraseBackground duplicate - // this?) - wndclass4.hbrBackground = (HBRUSH)(COLOR_WINDOW+1) ; - // wndclass4.hbrBackground = NULL; - wndclass4.lpszMenuName = NULL; - wndclass4.lpszClassName = wxMDIChildFrameClassName; - - if (!RegisterClass( &wndclass4 )) + wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + wndclass.lpszClassName = wxMDIChildFrameClassName; + + if ( !RegisterClass(&wndclass) ) + { + wxLogLastError("RegisterClass(MDI child)"); + + return FALSE; + } + + // "no redraw" MDI child frame + wndclass.lpszClassName = wxMDIChildFrameClassNameNoRedraw; + wndclass.style = styleNoRedraw; + + if ( !RegisterClass(&wndclass) ) { - // wxFatalError("Can't register MDI child frame window class"); - // return FALSE; + wxLogLastError("RegisterClass(no redraw MDI child)"); + + return FALSE; } - /////////////////////////////////////////////////////////////////////// // Register the panel window class. - WNDCLASS wndclass2; // Structure used to register Windows class. - memset(&wndclass2, 0, sizeof(WNDCLASS)); // start with NULL defaults - wndclass2.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS ; - wndclass2.lpfnWndProc = (WNDPROC)wxWndProc; - wndclass2.cbClsExtra = 0; - wndclass2.cbWndExtra = sizeof( DWORD ); // was 4 - wndclass2.hInstance = wxhInstance; - wndclass2.hIcon = (HICON) NULL; - wndclass2.hCursor = LoadCursor( (HINSTANCE) NULL, IDC_ARROW ); - // wndclass2.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1) ; - wndclass2.hbrBackground = (HBRUSH) GetStockObject( LTGRAY_BRUSH ); - wndclass2.lpszMenuName = NULL; - wndclass2.lpszClassName = wxPanelClassName; - if (!RegisterClass( &wndclass2 )) + wndclass.hbrBackground = (HBRUSH) GetStockObject( LTGRAY_BRUSH ); + wndclass.lpszClassName = wxPanelClassName; + + if ( !RegisterClass(&wndclass) ) { - // wxFatalError("Can't register Panel Window class"); - // return FALSE; + wxLogLastError("RegisterClass(panel)"); + + return FALSE; } - /////////////////////////////////////////////////////////////////////// // Register the canvas and textsubwindow class name - WNDCLASS wndclass3; // Structure used to register Windows class. - memset(&wndclass3, 0, sizeof(WNDCLASS)); // start with NULL defaults - // Use CS_OWNDC to avoid messing about restoring the context - // for every graphic operation. - // wndclass3.style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC | CS_DBLCLKS ; - // wxWin 2.0 - wndclass3.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS ; - wndclass3.lpfnWndProc = (WNDPROC)wxWndProc; - wndclass3.cbClsExtra = 0; - wndclass3.cbWndExtra = sizeof( DWORD ); // was 4 - wndclass3.hInstance = wxhInstance; - wndclass3.hIcon = (HICON) NULL; - wndclass3.hCursor = LoadCursor( (HINSTANCE) NULL, IDC_ARROW ); - // wndclass3.hbrBackground = (HBRUSH)(COLOR_WINDOW+1) ; - wndclass3.hbrBackground = (HBRUSH) NULL; - wndclass3.lpszMenuName = NULL; - wndclass3.lpszClassName = wxCanvasClassName; - if (!RegisterClass( &wndclass3)) + wndclass.hbrBackground = (HBRUSH)NULL; + wndclass.lpszClassName = wxCanvasClassName; + + if ( !RegisterClass(&wndclass) ) { - // wxFatalError("Can't register Canvas class"); - // return FALSE; + wxLogLastError("RegisterClass(canvas)"); + + return FALSE; } return TRUE; } -//// Convert Windows to argc, argv style +// --------------------------------------------------------------------------- +// Convert Windows to argc, argv style +// --------------------------------------------------------------------------- void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine) { @@ -399,13 +403,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); @@ -416,16 +420,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) == _T('"')) // We found the start of a string { i ++; int first = i; - while ((i < len) && (cmdLine.GetChar(i) != '"')) + while ((i < len) && (cmdLine.GetChar(i) != _T('"'))) i ++; wxString arg(cmdLine.Mid(first, (i - first))); @@ -439,7 +443,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))); @@ -450,11 +454,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; @@ -466,6 +470,7 @@ void wxApp::CleanUp() { //// COMMON CLEANUP +#if wxUSE_LOG // flush the logged messages if any and install a 'safer' log target: the // default one (wxLogGui) can't be used after the resources are freed just // below and the user suppliedo ne might be even more unsafe (using any @@ -474,6 +479,7 @@ void wxApp::CleanUp() // this will flush the old messages if any delete wxLog::SetActiveTarget(new wxLogStderr); +#endif // wxUSE_LOG // One last chance for pending objects to be cleaned up wxTheApp->DeletePendingObjects(); @@ -493,7 +499,7 @@ void wxApp::CleanUp() delete g_globalCursor; g_globalCursor = NULL; - wxDeleteStockObjects() ; + wxDeleteStockObjects(); // Destroy all GDI lists, etc. wxDeleteStockLists(); @@ -538,7 +544,7 @@ void wxApp::CleanUp() DestroyIcon(wxDEFAULT_MDIPARENTFRAME_ICON); if ( wxDisableButtonBrush ) - ::DeleteObject( wxDisableButtonBrush ) ; + ::DeleteObject( wxDisableButtonBrush ); #if wxUSE_OLE ::OleUninitialize(); @@ -549,7 +555,16 @@ void wxApp::CleanUp() #endif if (wxWinHandleList) - delete wxWinHandleList ; + delete wxWinHandleList; + + // 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; + delete wxPendingEventsLocker; + // If we don't do the following, we get an apparent memory leak. + ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker(); +#endif wxClassInfo::CleanUpClasses(); @@ -563,15 +578,17 @@ void wxApp::CleanUp() // wxDebugContext, too. if (wxDebugContext::CountObjectsLeft(TRUE) > 0) { - wxLogDebug("There were memory leaks."); + wxLogDebug(_T("There were memory leaks.")); wxDebugContext::Dump(); wxDebugContext::PrintStatistics(); } // wxDebugContext::SetStream(NULL, NULL); #endif +#if wxUSE_LOG // do it as the very last thing because everything else can log messages delete wxLog::SetActiveTarget(NULL); +#endif // wxUSE_LOG } #if !defined(_WINDLL) || (defined(_WINDLL) && defined(WXMAKINGDLL)) @@ -618,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, - "No initializer - use IMPLEMENT_APP macro." ); + _T("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, _T("You have to define an instance of wxApp!") ); // save the WinMain() parameters wxTheApp->ConvertToStandardCommandArgs(lpCmdLine); @@ -631,7 +648,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() ; + wxTheApp->OnInitGui(); int retValue = 0; @@ -738,22 +755,17 @@ int wxEntry(WXHINSTANCE hInstance) //// Static member initialization -wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL; +wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL; wxApp::wxApp() { m_topWindow = NULL; wxTheApp = this; - m_className = ""; - m_wantDebugOutput = TRUE ; - m_appName = ""; + m_wantDebugOutput = TRUE; + argc = 0; argv = NULL; -#ifdef __WXMSW__ m_printMode = wxPRINT_WINDOWS; -#else - m_printMode = wxPRINT_POSTSCRIPT; -#endif m_exitOnFrameDelete = TRUE; m_auto3D = TRUE; } @@ -806,7 +818,7 @@ bool wxApp::DoMessage() { #if wxUSE_THREADS wxASSERT_MSG( wxThread::IsMain(), - "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; @@ -860,7 +872,6 @@ bool wxApp::DoMessage() if ( !ProcessMessage((WXMSG *)&s_currentMsg) ) { ::TranslateMessage(&s_currentMsg); - wxApp::sm_lastMessageTime = s_currentMsg.time; /* MATTHEW: timeStamp impl. */ ::DispatchMessage(&s_currentMsg); } } @@ -899,11 +910,6 @@ int wxApp::MainLoop() DoMessage(); - - // If they are pending events, we must process them. -#if wxUSE_THREADS - ProcessPendingEvents(); -#endif } return s_currentMsg.wParam; @@ -922,8 +928,8 @@ bool wxApp::ProcessIdle() #if wxUSE_THREADS void wxApp::ProcessPendingEvents() { - wxNode *node = wxPendingEvents.First(); - wxCriticalSectionLocker locker(wxPendingEventsLocker); + wxNode *node = wxPendingEvents->First(); + wxCriticalSectionLocker locker(*wxPendingEventsLocker); while (node) { @@ -932,7 +938,7 @@ void wxApp::ProcessPendingEvents() handler->ProcessPendingEvents(); delete node; - node = wxPendingEvents.First(); + node = wxPendingEvents->First(); } } #endif @@ -945,7 +951,7 @@ void wxApp::ExitMainLoop() 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() @@ -965,6 +971,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() ) @@ -996,10 +1011,12 @@ void wxApp::OnIdle(wxIdleEvent& event) // '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(); +#endif // wxUSE_LOG // Send OnIdle events to all windows if ( SendIdleEvents() ) @@ -1009,6 +1026,10 @@ 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; } @@ -1017,7 +1038,7 @@ bool wxApp::SendIdleEvents() { bool needMore = FALSE; - wxWindowList::Node* node = wxTopLevelWindows.First(); + wxWindowList::Node* node = wxTopLevelWindows.GetFirst(); while (node) { wxWindow* win = node->GetData(); @@ -1050,7 +1071,7 @@ bool wxApp::SendIdleEvents(wxWindow* win) node = node->Next(); } - return needMore ; + return needMore; } void wxApp::DeletePendingObjects() @@ -1088,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("COMCTL32"); + HMODULE theModule = ::GetModuleHandle(_T("COMCTL32")); int version = 0; // if so, then we can check for the version @@ -1159,15 +1165,47 @@ bool wxYield() 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 { 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(_T("requested non existent standard icon")); + // still fall through + + case wxICON_HAND: + return wxIcon("wxICON_ERROR"); + } +} + + HINSTANCE wxGetInstance() { return wxhInstance;