mac fixes

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

diff --git a/include/wx/os2/app.h b/include/wx/os2/app.h
index 66504eacbe2eb13e2aa6171879c27b0e02e5c8fb..35a8cc9440bf386fbd053a3c40ef4d11627147fd 100644 (file)
--- a/include/wx/os2/app.h
+++ b/include/wx/os2/app.h
@@ -14,7 +14,15 @@
 
 #include <sys/time.h>
 #include <sys/types.h>
 
 #include <sys/time.h>
 #include <sys/types.h>

+
+#ifdef __EMX__

 #include <unistd.h>
 #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"
 
 #include "wx/event.h"
 #include "wx/icon.h"


@@ -95,11 +103,12 @@ protected:
     // PM-specific wxApp definitions */
     //
 private:
     // PM-specific wxApp definitions */
     //
 private:

-    int m_maxSocketHandles;
-    int m_maxSocketNr;
-    int m_lastUsedHandle;
-    fd_set m_readfds, m_writefds;
-    void *m_sockCallbackInfo;
+    int                             m_maxSocketHandles;
+    int                             m_maxSocketNr;
+    int                             m_lastUsedHandle;
+    fd_set                          m_readfds;
+    fd_set                          m_writefds;
+    void*                           m_sockCallbackInfo;

 
 public:
 
 
 public:
 


@@ -108,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);