mac fixes

[wxWidgets.git] / include / wx / os2 / app.h

diff --git a/include/wx/os2/app.h b/include/wx/os2/app.h
index 8aa43dda8c78b47d9fc4af2f0f5303cdfacdf2eb..35a8cc9440bf386fbd053a3c40ef4d11627147fd 100644 (file)
--- a/include/wx/os2/app.h
+++ b/include/wx/os2/app.h
@@ -12,12 +12,24 @@
 #ifndef _WX_APP_H_
 #define _WX_APP_H_
 
 #ifndef _WX_APP_H_
 #define _WX_APP_H_
 

+#include <sys/time.h>
+#include <sys/types.h>
+
+#ifdef __EMX__
+#include <unistd.h>
+#else
+#include <utils.h>
+#undef BYTE_ORDER
+#include <types.h>
+#define INCL_ORDERS
+#endif
+

 #include "wx/event.h"
 #include "wx/icon.h"
 
 class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxWindow;
 #include "wx/event.h"
 #include "wx/icon.h"
 
 class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxWindow;

-class WXDLLEXPORT wxApp ;
+class WXDLLEXPORT wxApp;

 class WXDLLEXPORT wxKeyEvent;
 class WXDLLEXPORT wxLog;
 
 class WXDLLEXPORT wxKeyEvent;
 class WXDLLEXPORT wxLog;
 


@@ -30,6 +42,13 @@ void WXDLLEXPORT wxExit(void);
 // Yield to other apps/messages
 bool WXDLLEXPORT wxYield(void);
 
 // Yield to other apps/messages
 bool WXDLLEXPORT wxYield(void);
 

+extern MRESULT EXPENTRY wxWndProc( HWND
+                                  ,ULONG
+                                  ,MPARAM
+                                  ,MPARAM
+                                 );
+
+

 // Represents the application. Derive OnInit and declare
 // a new App object to start application
 class WXDLLEXPORT wxApp : public wxAppBase
 // Represents the application. Derive OnInit and declare
 // a new App object to start application
 class WXDLLEXPORT wxApp : public wxAppBase


@@ -70,6 +89,11 @@ public:
     void SetAuto3D(bool bFlag) { m_bAuto3D = bFlag; }
     bool GetAuto3D(void) const { return m_bAuto3D; }
 
     void SetAuto3D(bool bFlag) { m_bAuto3D = bFlag; }
     bool GetAuto3D(void) const { return m_bAuto3D; }
 

+    int AddSocketHandler(int handle, int mask,
+                         void (*callback)(void*), void * gsock);
+    void RemoveSocketHandler(int handle);
+    void HandleSockets();
+

 protected:
     bool                            m_bShowOnInit;
     int                             m_nPrintMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
 protected:
     bool                            m_bShowOnInit;
     int                             m_nPrintMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT


@@ -78,6 +102,14 @@ protected:
     //
     // PM-specific wxApp definitions */
     //
     //
     // PM-specific wxApp definitions */
     //

+private:
+    int                             m_maxSocketHandles;
+    int                             m_maxSocketNr;
+    int                             m_lastUsedHandle;
+    fd_set                          m_readfds;
+    fd_set                          m_writefds;
+    void*                           m_sockCallbackInfo;
+

 public:
 
     // Implementation
 public:
 
     // Implementation


@@ -85,6 +117,7 @@ public:
     static void  CleanUp(void);
 
     static bool  RegisterWindowClasses(HAB vHab);
     static void  CleanUp(void);
 
     static bool  RegisterWindowClasses(HAB vHab);

+    virtual void DoMessage(WXMSG *pMsg);

     virtual bool DoMessage(void);
     virtual bool ProcessMessage(WXMSG* pMsg);
     void         DeletePendingObjects(void);
     virtual bool DoMessage(void);
     virtual bool ProcessMessage(WXMSG* pMsg);
     void         DeletePendingObjects(void);


@@ -92,13 +125,12 @@ public:
 
 public:
     int                             m_nCmdShow;
 
 public:
     int                             m_nCmdShow;

+    HMQ                             m_hMq;

 
 protected:
     bool                            m_bKeepGoing ;
 
     DECLARE_EVENT_TABLE()
 
 protected:
     bool                            m_bKeepGoing ;
 
     DECLARE_EVENT_TABLE()

-private:
-    HMQ                             m_hMq;

 };
 
 int WXDLLEXPORT wxEntry( int argc, char *argv[] );
 };
 
 int WXDLLEXPORT wxEntry( int argc, char *argv[] );