X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e193f384f7b98daef459653ddb8485173fba8ba..8c1c5302f3ac9e09703dbf29f45e9d3699b7a4d6:/src/msw/app.cpp diff --git a/src/msw/app.cpp b/src/msw/app.cpp index 145aa72a91..b45f930bf4 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" @@ -128,7 +127,7 @@ HICON wxDEFAULT_MDIPARENTFRAME_ICON = (HICON) NULL; HBRUSH wxDisableButtonBrush = (HBRUSH) 0; -LRESULT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM); +LRESULT WXDLLEXPORT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM); #if defined(__WIN95__) && !defined(__TWIN32__) #define wxUSE_RICHEDIT 1 @@ -556,7 +555,7 @@ 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. delete wxPendingEvents; #if wxUSE_THREADS @@ -621,7 +620,6 @@ int wxEntry(WXHINSTANCE hInstance, #else #undef CATCH_PROGRAM_EXCEPTIONS #endif - wxhInstance = (HINSTANCE) hInstance; if (!wxApp::Initialize()) @@ -649,6 +647,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() ) @@ -924,28 +929,6 @@ bool wxApp::ProcessIdle() return event.MoreRequested(); } -void wxApp::ProcessPendingEvents() -{ -#if wxUSE_THREADS - // ensure that we're the only thread to modify the pending events list - wxCriticalSectionLocker locker(*wxPendingEventsLocker); -#endif - - if ( !wxPendingEvents ) - return; - - wxNode *node = wxPendingEvents->First(); - while (node) - { - wxEvtHandler *handler = (wxEvtHandler *)node->Data(); - - handler->ProcessPendingEvents(); - - delete node; - node = wxPendingEvents->First(); - } -} - void wxApp::ExitMainLoop() { m_keepGoing = FALSE; @@ -979,7 +962,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