fixed a memory leak and an initialization problem

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

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index 6ef2a2253d6e1220891dd821d2ab0e8d04d5440d..96d1531b5fc472820697ad4c07f2a51e0c918620 100644 (file)
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -39,26 +39,26 @@
 
 #ifdef __EMX__
 
 
 #ifdef __EMX__
 

-#include <sys\ioctl.h>
-#include <sys\select.h>
+#include <sys/ioctl.h>
+#include <sys/select.h>

 
 #else
 
 #include <nerrno.h>
 
 #else
 
 #include <nerrno.h>

-#include <ioctl.h>
-#include <select.h>
+#include <sys/ioctl.h>
+#include <sys/select.h>
+#include <sys/time.h>

 
 

-#endif // ndef for __EMX__
+#endif //

 
 #ifndef __EMX__
 
 #define select(a,b,c,d,e) bsdselect(a,b,c,d,e)
 
 #ifndef __EMX__
 
 #define select(a,b,c,d,e) bsdselect(a,b,c,d,e)

-int _System bsdselect(int,
-                      struct fd_set *,
-                      struct fd_set *,
-                      struct fd_set *,
-                      struct timeval *);
-
+extern "C" int _System bsdselect(int,
+                                 struct fd_set *,
+                                 struct fd_set *,
+                                 struct fd_set *,
+                                 struct timeval *);

 #endif
 
 #if wxUSE_THREADS
 #endif
 
 #if wxUSE_THREADS


@@ -326,14 +326,13 @@ bool wxApp::RegisterWindowClasses(
   HAB                               vHab
 )
 {
   HAB                               vHab
 )
 {

-    APIRET                          rc;

     ERRORID                         vError = 0L;
     wxString                        sError;
 
     if (!::WinRegisterClass( vHab
                             ,wxFrameClassName
                             ,wxFrameWndProc
     ERRORID                         vError = 0L;
     wxString                        sError;
 
     if (!::WinRegisterClass( vHab
                             ,wxFrameClassName
                             ,wxFrameWndProc

-                            ,CS_SIZEREDRAW | CS_MOVENOTIFY | CS_SYNCPAINT  | CS_CLIPCHILDREN
+                            ,CS_SIZEREDRAW | CS_SYNCPAINT  | CS_CLIPCHILDREN

                             ,sizeof(ULONG)
                            ))
     {
                             ,sizeof(ULONG)
                            ))
     {


@@ -424,7 +423,7 @@ bool wxApp::RegisterWindowClasses(
     if (!::WinRegisterClass( vHab
                             ,wxCanvasClassName
                             ,wxWndProc
     if (!::WinRegisterClass( vHab
                             ,wxCanvasClassName
                             ,wxWndProc

-                            ,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT | CS_CLIPCHILDREN
+                            ,CS_SIZEREDRAW | CS_HITTEST | CS_SYNCPAINT | CS_CLIPCHILDREN

                             ,sizeof(ULONG)
                            ))
     {
                             ,sizeof(ULONG)
                            ))
     {


@@ -654,6 +653,9 @@ bool wxApp::OnInitGui()
     ERRORID                         vError;
     wxString                        sError;
 
     ERRORID                         vError;
     wxString                        sError;
 

+    if (!wxAppBase::OnInitGui())
+        return FALSE;
+

     m_hMq = ::WinCreateMsgQueue(vHabmain, 0);
     if (!m_hMq)
     {
     m_hMq = ::WinCreateMsgQueue(vHabmain, 0);
     if (!m_hMq)
     {


@@ -662,6 +664,7 @@ bool wxApp::OnInitGui()
         wxLogDebug(sError);
         return FALSE;
     }
         wxLogDebug(sError);
         return FALSE;
     }

+

     return TRUE;
 } // end of wxApp::OnInitGui
 
     return TRUE;
 } // end of wxApp::OnInitGui
 


@@ -998,9 +1001,9 @@ void wxApp::OnIdle(
     // automated DC cache management: clear the cached DCs and bitmap
     // if it's likely that the app has finished with them, that is, we
     // get an idle event and we're not dragging anything.
     // automated DC cache management: clear the cached DCs and bitmap
     // if it's likely that the app has finished with them, that is, we
     // get an idle event and we're not dragging anything.

-    if (!::WinGetKeyState(MK_LBUTTON) &&
-        !::WinGetKeyState(MK_MBUTTON) &&
-        !::WinGetKeyState(MK_RBUTTON))
+    if (!::WinGetKeyState(HWND_DESKTOP, VK_BUTTON1) &&
+        !::WinGetKeyState(HWND_DESKTOP, VK_BUTTON3) &&
+        !::WinGetKeyState(HWND_DESKTOP, VK_BUTTON2))

         wxDC::ClearCache();
 #endif // wxUSE_DC_CACHEING
 
         wxDC::ClearCache();
 #endif // wxUSE_DC_CACHEING
 


@@ -1114,13 +1117,23 @@ void wxExit()
     wxApp::CleanUp();
 } // end of wxExit
 
     wxApp::CleanUp();
 } // end of wxExit
 

-static bool gs_inYield = FALSE;
-

 //
 // Yield to incoming messages
 //
 //
 // Yield to incoming messages
 //

-bool wxYield()
+bool wxApp::Yield(bool onlyIfNeeded)

 {
 {

+    static bool s_inYield = FALSE;
+
+    if ( s_inYield )
+    {
+        if ( !onlyIfNeeded )
+        {
+            wxFAIL_MSG( _T("wxYield() called recursively") );
+        }
+
+        return FALSE;
+    }
+

     HAB                             vHab = 0;
     QMSG                            vMsg;
 
     HAB                             vHab = 0;
     QMSG                            vMsg;
 


@@ -1130,7 +1143,7 @@ bool wxYield()
     //
     wxLog::Suspend();
 
     //
     wxLog::Suspend();
 

-    gs_inYield = TRUE;
+    s_inYield = TRUE;

 
     //
     // We want to go back to the main message loop
 
     //
     // We want to go back to the main message loop


@@ -1154,19 +1167,10 @@ bool wxYield()
     // Let the logs be flashed again
     //
     wxLog::Resume();
     // Let the logs be flashed again
     //
     wxLog::Resume();

-    gs_inYield = FALSE;
+    s_inYield = FALSE;

     return TRUE;
 } // end of wxYield
 
     return TRUE;
 } // end of wxYield
 

-// Yield to incoming messages; but fail silently if recursion is detected.
-bool wxYieldIfNeeded()
-{
-    if (gs_inYield)
-        return FALSE;
-
-    return wxYield();
-}
-

 wxIcon wxApp::GetStdIcon(
   int                               nWhich
 ) const
 wxIcon wxApp::GetStdIcon(
   int                               nWhich
 ) const