fix wxBitmapComboBox Gtk-CRITICAL assertion `GTK_IS_ENTRY (entry)' failed

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

diff --git a/include/wx/os2/app.h b/include/wx/os2/app.h
index 1a202d9937329abf6c244e59fe17a0f21d96c61f..cf33821234c76f3f5b8ea0a62df05110f5b9ae7d 100644 (file)
--- a/include/wx/os2/app.h
+++ b/include/wx/os2/app.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        app.h
+// Name:        wx/os2/app.h

 // Purpose:     wxApp class
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxApp class
 // Author:      David Webster
 // Modified by:


@@ -12,27 +12,56 @@
 #ifndef _WX_APP_H_
 #define _WX_APP_H_
 
 #ifndef _WX_APP_H_
 #define _WX_APP_H_
 

+#ifdef __WATCOMC__
+
+#include <types.h>
+#include <sys/ioctl.h>
+#include <sys/select.h>
+
+#else
+
+#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
+
+#endif
+

 #include "wx/event.h"
 #include "wx/icon.h"
 
 #include "wx/event.h"
 #include "wx/icon.h"
 

-class WXDLLEXPORT wxFrame;
-class WXDLLEXPORT wxWindow;
-class WXDLLEXPORT wxApp ;
-class WXDLLEXPORT wxKeyEvent;
-class WXDLLEXPORT wxLog;
+class WXDLLIMPEXP_FWD_CORE wxFrame;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxApp;
+class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
+class WXDLLIMPEXP_FWD_BASE wxLog;

 
 

-WXDLLEXPORT_DATA(extern wxApp*) wxTheApp;
-WXDLLEXPORT_DATA(extern HAB)    vHabmain;
+WXDLLIMPEXP_DATA_CORE(extern wxApp*) wxTheApp;
+WXDLLIMPEXP_DATA_CORE(extern HAB)    vHabmain;

 
 // Force an exit from main loop
 
 // Force an exit from main loop

-void WXDLLEXPORT wxExit(void);
+void WXDLLIMPEXP_CORE wxExit(void);

 
 // Yield to other apps/messages
 
 // Yield to other apps/messages

-bool WXDLLEXPORT wxYield(void);
+bool WXDLLIMPEXP_CORE wxYield(void);
+
+extern MRESULT EXPENTRY wxWndProc( HWND
+                                  ,ULONG
+                                  ,MPARAM
+                                  ,MPARAM
+                                 );
+

 
 // Represents the application. Derive OnInit and declare
 // a new App object to start application
 
 // Represents the application. Derive OnInit and declare
 // a new App object to start application

-class WXDLLEXPORT wxApp : public wxAppBase
+class WXDLLIMPEXP_CORE wxApp : public wxAppBase

 {
     DECLARE_DYNAMIC_CLASS(wxApp)
 
 {
     DECLARE_DYNAMIC_CLASS(wxApp)
 


@@ -40,16 +69,13 @@ public:
     wxApp();
     virtual ~wxApp();
 
     wxApp();
     virtual ~wxApp();
 

-    virtual bool OnInitGui(void);
-

     // override base class (pure) virtuals
     // override base class (pure) virtuals

-    virtual int  MainLoop(void);
-    virtual void ExitMainLoop(void);
-    virtual bool Initialized(void);
-    virtual bool Pending(void) ;
-    virtual void Dispatch(void);
+    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual void CleanUp(void);

 
 

-    virtual wxIcon GetStdIcon(int which) const;
+    virtual bool OnInitGui(void);
+
+    virtual void WakeUpIdle(void);

 
     virtual void SetPrintMode(int mode) { m_nPrintMode = mode; }
     virtual int  GetPrintMode(void) const { return m_nPrintMode; }
 
     virtual void SetPrintMode(int mode) { m_nPrintMode = mode; }
     virtual int  GetPrintMode(void) const { return m_nPrintMode; }


@@ -59,50 +85,38 @@ public:
     void OnEndSession(wxCloseEvent& rEvent);
     void OnQueryEndSession(wxCloseEvent& rEvent);
 
     void OnEndSession(wxCloseEvent& rEvent);
     void OnQueryEndSession(wxCloseEvent& rEvent);
 

-    // Send idle event to all top-level windows.
-    // Returns TRUE if more idle time is requested.
-    bool SendIdleEvents(void);
-
-    // Send idle event to window and all subwindows
-    // Returns TRUE if more idle time is requested.
-    bool SendIdleEvents(wxWindow* pWin);
-
-    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

-    bool                            m_bAuto3D ;   // Always use 3D controls, except where overriden

 
     //
     // 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

-    static bool  Initialize(HAB vHab);
-    static void  CleanUp(void);
-

     static bool  RegisterWindowClasses(HAB vHab);
     static bool  RegisterWindowClasses(HAB vHab);

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

 
 public:
     int                             m_nCmdShow;
 
 public:
     int                             m_nCmdShow;

+    HMQ                             m_hMq;

 
 protected:
 
 protected:

-    bool                            m_bKeepGoing ;
-

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

-private:
-    HMQ                             m_hMq;
-    QMSG                            m_vMsg;
+    wxDECLARE_NO_COPY_CLASS(wxApp);

 };
 };

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

 #endif
     // _WX_APP_H_
 #endif
     // _WX_APP_H_

-