gtkfeatures.h does not exist under gtk+ 1.3.1, #ifndef it out

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

diff --git a/include/wx/os2/app.h b/include/wx/os2/app.h
index 69974b6c55360406049b2a3dece9f6c8ce74c66c..4a5422a4df83e3b905f388b6258af85ad078de01 100644 (file)
--- a/include/wx/os2/app.h
+++ b/include/wx/os2/app.h
@@ -22,6 +22,7 @@ class WXDLLEXPORT wxKeyEvent;
 class WXDLLEXPORT wxLog;
 
 WXDLLEXPORT_DATA(extern wxApp*) wxTheApp;
 class WXDLLEXPORT wxLog;
 
 WXDLLEXPORT_DATA(extern wxApp*) wxTheApp;

+WXDLLEXPORT_DATA(extern HAB)    vHabmain;

 
 // Force an exit from main loop
 void WXDLLEXPORT wxExit(void);
 
 // Force an exit from main loop
 void WXDLLEXPORT wxExit(void);


@@ -29,6 +30,12 @@ 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


@@ -88,9 +95,6 @@ public:
     virtual bool ProcessMessage(WXMSG* pMsg);
     void         DeletePendingObjects(void);
     bool         ProcessIdle(void);
     virtual bool ProcessMessage(WXMSG* pMsg);
     void         DeletePendingObjects(void);
     bool         ProcessIdle(void);

-#if wxUSE_THREADS
-    void         ProcessPendingEvents(void);
-#endif

 
 public:
     int                             m_nCmdShow;
 
 public:
     int                             m_nCmdShow;


@@ -100,9 +104,7 @@ protected:
 
     DECLARE_EVENT_TABLE()
 private:
 
     DECLARE_EVENT_TABLE()
 private:

-    HAB                             m_vHab;

     HMQ                             m_hMq;
     HMQ                             m_hMq;

-    QMSG                            m_vMsg;

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