submenu preparation in two methods encapsulated

[wxWidgets.git] / src / os2 / app.cpp

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index f6b538d15aa7b500ce0ab27749bdbd85b7afc4af..4d47ed155090c453d394595a8f36bbb5ffa47924 100644 (file)
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -9,6 +9,10 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+#ifdef __GNUG__
+    #pragma implementation "app.h"
+#endif
+

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -609,7 +613,7 @@ int wxEntry(
     {
         if (wxTheApp->OnInit())
         {
     {
         if (wxTheApp->OnInit())
         {

-            nRetValue = wxTheApp->OnRun();
+            wxTheApp->OnRun();

         }
         // Normal exit
         wxWindow*                   pTopWindow = wxTheApp->GetTopWindow();
         }
         // Normal exit
         wxWindow*                   pTopWindow = wxTheApp->GetTopWindow();


@@ -637,7 +641,7 @@ int wxEntry(
     printf("wxTheApp->OnExit ");
     fflush(stdout);
 #endif
     printf("wxTheApp->OnExit ");
     fflush(stdout);
 #endif

-    wxTheApp->OnExit();
+    nRetValue = wxTheApp->OnExit();

 #if wxUSE_CONSOLEDEBUG
     printf("wxApp::CleanUp ");
     fflush(stdout);
 #if wxUSE_CONSOLEDEBUG
     printf("wxApp::CleanUp ");
     fflush(stdout);


@@ -961,19 +965,20 @@ bool wxApp::ProcessMessage(
     return FALSE;
 } // end of wxApp::ProcessMessage
 
     return FALSE;
 } // end of wxApp::ProcessMessage
 

+bool                                gbInOnIdle = FALSE;
+

 void wxApp::OnIdle(
   wxIdleEvent&                      rEvent
 )
 {
 void wxApp::OnIdle(
   wxIdleEvent&                      rEvent
 )
 {

-    static bool                     sbInOnIdle = FALSE;

 
     //
     // Avoid recursion (via ProcessEvent default case)
     //
 
     //
     // Avoid recursion (via ProcessEvent default case)
     //

-    if (sbInOnIdle)
+    if (gbInOnIdle)

         return;
 
         return;
 

-    sbInOnIdle = TRUE;
+    gbInOnIdle = TRUE;

 
     //
     // If there are pending events, we must process them: pending events
 
     //
     // If there are pending events, we must process them: pending events


@@ -1015,7 +1020,7 @@ void wxApp::OnIdle(
         //
         rEvent.RequestMore(TRUE);
     }
         //
         rEvent.RequestMore(TRUE);
     }

-    sbInOnIdle = FALSE;
+    gbInOnIdle = FALSE;

 } // end of wxApp::OnIdle
 
 // Send idle event to all top-level windows
 } // end of wxApp::OnIdle
 
 // Send idle event to all top-level windows