A number of focus handling improvements:

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

diff --git a/include/wx/os2/app.h b/include/wx/os2/app.h
index 8aa43dda8c78b47d9fc4af2f0f5303cdfacdf2eb..13d3911521e297feae7fff51573587290eca9ce3 100644 (file)
--- a/include/wx/os2/app.h
+++ b/include/wx/os2/app.h
@@ -12,14 +12,36 @@
 #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_CORE wxLog;

 
 WXDLLEXPORT_DATA(extern wxApp*) wxTheApp;
 WXDLLEXPORT_DATA(extern HAB)    vHabmain;
 
 WXDLLEXPORT_DATA(extern wxApp*) wxTheApp;
 WXDLLEXPORT_DATA(extern HAB)    vHabmain;


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


@@ -40,16 +69,14 @@ 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 bool Yield(bool onlyIfNeeded = false);
+    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,49 +86,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;
+    DECLARE_NO_COPY_CLASS(wxApp)

 };
 };

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

 #endif
     // _WX_APP_H_
 #endif
     // _WX_APP_H_

-