Updated for new library and DLL names on MSW

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

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index 8a5b65436cb4085804ed6df35c0e1d6dc21db26f..81d2ccbc1b4002397ae7db8d624c50a720b761f9 100644 (file)
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -37,22 +37,28 @@
 
 #include "wx/os2/private.h"
 
 
 #include "wx/os2/private.h"
 

-#if defined(__VISAGECPP__) && __IBMCPP__ < 400
-#include <machine\endian.h>
-#include <ioctl.h>
-#include <select.h>
-#include <unistd.h>
+#ifdef __EMX__
+
+#include <sys/ioctl.h>
+#include <sys/select.h>
+

 #else
 #else

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

 #ifndef __EMX__
 #ifndef __EMX__

+

 #define select(a,b,c,d,e) bsdselect(a,b,c,d,e)
 #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 *);
-#endif
+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


@@ -133,22 +139,34 @@ struct GsocketCallbackInfo{
 #define wxSockReadMask  0x01
 #define wxSockWriteMask 0x02
 
 #define wxSockReadMask  0x01
 #define wxSockWriteMask 0x02
 

+#ifdef __EMX__

 extern "C"
 int wxAppAddSocketHandler(int handle, int mask,
 extern "C"
 int wxAppAddSocketHandler(int handle, int mask,

-                          void (*callback)(void*), void * gsock)
+                           void (*callback)(void*), void * gsock)

 {
     return wxTheApp->AddSocketHandler(handle, mask, callback, gsock);
 }
 {
     return wxTheApp->AddSocketHandler(handle, mask, callback, gsock);
 }

-

 extern "C"
 void wxAppRemoveSocketHandler(int handle)
 {
     wxTheApp->RemoveSocketHandler(handle);
 }
 extern "C"
 void wxAppRemoveSocketHandler(int handle)
 {
     wxTheApp->RemoveSocketHandler(handle);
 }

+#else
+//  Linkage mode problems using callbacks with extern C in a .cpp module
+int wxAppAddSocketHandler(int handle, int mask,
+                           void (*callback)(void*), void * gsock)
+{
+    return wxTheApp->AddSocketHandler(handle, mask, callback, gsock);
+}
+void wxAppRemoveSocketHandler(int handle)
+{
+    wxTheApp->RemoveSocketHandler(handle);
+}
+#endif

 
 void wxApp::HandleSockets()
 {
 
 void wxApp::HandleSockets()
 {

-    bool pendingEvent = false;
+    bool pendingEvent = FALSE;

 
     // Check whether it's time for Gsocket operation
     if (m_maxSocketHandles > 0 && m_maxSocketNr > 0)
 
     // Check whether it's time for Gsocket operation
     if (m_maxSocketHandles > 0 && m_maxSocketNr > 0)


@@ -179,7 +197,7 @@ void wxApp::HandleSockets()
                     if (r < m_maxSocketHandles)
                     {
                         CallbackInfo[r].proc(CallbackInfo[r].gsock);
                     if (r < m_maxSocketHandles)
                     {
                         CallbackInfo[r].proc(CallbackInfo[r].gsock);

-                        pendingEvent = true;
+                        pendingEvent = TRUE;

                         wxYield();
                     }
                 }
                         wxYield();
                     }
                 }


@@ -193,7 +211,7 @@ void wxApp::HandleSockets()
                     if (r < m_maxSocketHandles)
                     {
                         CallbackInfo[r].proc(CallbackInfo[r].gsock);
                     if (r < m_maxSocketHandles)
                     {
                         CallbackInfo[r].proc(CallbackInfo[r].gsock);

-                        pendingEvent = true;
+                        pendingEvent = TRUE;

                         wxYield();
                     }
                 }
                         wxYield();
                     }
                 }


@@ -308,7 +326,6 @@ bool wxApp::RegisterWindowClasses(
   HAB                               vHab
 )
 {
   HAB                               vHab
 )
 {

-    APIRET                          rc;

     ERRORID                         vError = 0L;
     wxString                        sError;
 
     ERRORID                         vError = 0L;
     wxString                        sError;
 


@@ -636,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)
     {


@@ -644,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
 


@@ -769,15 +790,24 @@ bool wxApp::DoMessage()
         }
 #endif // wxUSE_THREADS
 
         }
 #endif // wxUSE_THREADS
 

+        //

         // Process the message
         // Process the message

-        if (!ProcessMessage((WXMSG *)&svCurrentMsg))
-        {
-            ::WinDispatchMsg(vHabmain, (PQMSG)&svCurrentMsg);
-        }
+        //
+        DoMessage((WXMSG *)&svCurrentMsg);

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

+void wxApp::DoMessage(
+  WXMSG*                            pMsg
+)
+{
+    if (!ProcessMessage((WXMSG *)&svCurrentMsg))
+    {
+        ::WinDispatchMsg(vHabmain, (PQMSG)&svCurrentMsg);
+    }
+} // end of wxApp::DoMessage
+

 //////////////////////////////////////////////////////////////////////////////
 //
 // Keep trying to process messages until WM_QUIT
 //////////////////////////////////////////////////////////////////////////////
 //
 // Keep trying to process messages until WM_QUIT


@@ -967,6 +997,16 @@ void wxApp::OnIdle(
     wxLog::FlushActive();
 #endif // wxUSE_LOG
 
     wxLog::FlushActive();
 #endif // wxUSE_LOG
 

+#if wxUSE_DC_CACHEING
+    // 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(HWND_DESKTOP, VK_BUTTON1) &&
+        !::WinGetKeyState(HWND_DESKTOP, VK_BUTTON3) &&
+        !::WinGetKeyState(HWND_DESKTOP, VK_BUTTON2))
+        wxDC::ClearCache();
+#endif // wxUSE_DC_CACHEING
+

     //
     // Send OnIdle events to all windows
     //
     //
     // Send OnIdle events to all windows
     //


@@ -1077,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;
 


@@ -1093,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


@@ -1117,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