X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e58dab20ce995856303154a367bcca904066525c..71110b404c5cbef2175b2be645783e93d9a2b8c4:/src/os2/app.cpp

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index 7bcf7d2b7d..f48fa2d453 100644
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -667,7 +667,6 @@ wxApp::wxApp()
 {
     m_topWindow = NULL;
     wxTheApp = this;
-    m_wantDebugOutput = TRUE;
 
     argc = 0;
     argv = NULL;
@@ -901,7 +900,8 @@ bool wxApp::ProcessMessage(
     if (pMsg->msg == WM_TIMER &&
         (SHORT1FROMMP(pMsg->mp1) != TID_CURSOR &&
          SHORT1FROMMP(pMsg->mp1) != TID_FLASHWINDOW &&
-         SHORT1FROMMP(pMsg->mp1) != TID_SCROLL
+         SHORT1FROMMP(pMsg->mp1) != TID_SCROLL &&
+         SHORT1FROMMP(pMsg->mp1) != 0x0000
         ))
         wxTimerProc(NULL, 0, (int)pMsg->mp1, 0);
 
@@ -1175,31 +1175,6 @@ bool wxApp::Yield(bool onlyIfNeeded)
     return TRUE;
 } // end of wxYield
 
-wxIcon wxApp::GetStdIcon(
-  int                               nWhich
-) const
-{
-    switch(nWhich)
-    {
-        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");
-    }
-    return wxIcon("wxICON_ERROR");
-} // end of wxApp::GetStdIcon
-
 int wxApp::AddSocketHandler(int handle, int mask,
                             void (*callback)(void*), void * gsock)
 {