compilation fix

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

diff --git a/include/wx/os2/app.h b/include/wx/os2/app.h
index fba1c3f2416568306bf94aaad9ab8fbd07c62311..db41f62a49ddd93140a18bc26f8dc8bd6f288f0f 100644 (file)
--- a/include/wx/os2/app.h
+++ b/include/wx/os2/app.h
@@ -1,156 +1,151 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        app.h
 // Purpose:     wxApp class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        app.h
 // Purpose:     wxApp class

-// Author:      AUTHOR
+// Author:      David Webster

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     10/13/99

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) David Webster

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_APP_H_
 #define _WX_APP_H_
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_APP_H_
 #define _WX_APP_H_
 

-#ifdef __GNUG__
-#pragma interface "app.h"
+#ifdef __WATCOMC__
+
+#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
 
 #endif
 

-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/gdicmn.h"

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

+#include "wx/icon.h"

 
 class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxWindow;
 
 class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxWindow;

-class WXDLLEXPORT wxApp ;
+class WXDLLEXPORT wxApp;

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

-#define wxPRINT_WINDOWS         1
-#define wxPRINT_POSTSCRIPT      2
-

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

+WXDLLEXPORT_DATA(extern HAB)    vHabmain;

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

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

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

-bool WXDLLEXPORT wxYield();
+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
 
 // Represents the application. Derive OnInit and declare
 // a new App object to start application

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

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxApp)
-  wxApp();
-  inline ~wxApp() {}
-
-  static void SetInitializerFunction(wxAppInitializerFunction fn) { m_appInitFn = fn; }
-  static wxAppInitializerFunction GetInitializerFunction() { return m_appInitFn; }
+    DECLARE_DYNAMIC_CLASS(wxApp)

 
 

-  virtual int MainLoop();
-  void ExitMainLoop();
-  bool Initialized();
-  virtual bool Pending() ;
-  virtual void Dispatch() ;
-
-  void OnIdle(wxIdleEvent& event);
-
-// Generic
-  virtual bool OnInit() { return FALSE; };
-
-  // No specific tasks to do here.
-  virtual bool OnInitGui() { return TRUE; }
-
-  // Called to set off the main loop
-  virtual int OnRun() { return MainLoop(); };
-  virtual int OnExit() { return 0; }
-
-  /** Returns the standard icons for the msg dialogs, implemented in 
-      src/generic/msgdlgg.cpp and src/gtk/app.cpp. */
-  virtual wxIcon GetStdIcon(int which) const;
-
-  inline void SetPrintMode(int mode) { m_printMode = mode; }
-  inline int GetPrintMode() const { return m_printMode; }
+public:
+    wxApp();
+    virtual ~wxApp();

 
 

-  inline void SetExitOnFrameDelete(bool flag) { m_exitOnFrameDelete = flag; }
-  inline bool GetExitOnFrameDelete() const { return m_exitOnFrameDelete; }
+    virtual bool OnInitGui(void);

 
 

-  inline wxString GetAppName() const {
-      if (m_appName != "")
-        return m_appName;
-      else return m_className;
-    }
+    // 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);

 
 

-  inline void SetAppName(const wxString& name) { m_appName = name; };
-  inline wxString GetClassName() const { return m_className; }
-  inline void SetClassName(const wxString& name) { m_className = name; }
+    virtual void Exit();

 
 

-  void SetVendorName(const wxString& vendorName) { m_vendorName = vendorName; }
-  const wxString& GetVendorName() const { return m_vendorName; }
+    virtual bool Yield(bool onlyIfNeeded = FALSE);
+    virtual bool ProcessIdle(void);
+    virtual void WakeUpIdle(void);

 
 

-  wxWindow *GetTopWindow() const ;
-  inline void SetTopWindow(wxWindow *win) { m_topWindow = win; }
+    virtual void SetPrintMode(int mode) { m_nPrintMode = mode; }
+    virtual int  GetPrintMode(void) const { return m_nPrintMode; }

 
 

-  inline void SetWantDebugOutput(bool flag) { m_wantDebugOutput = flag; }
-  inline bool GetWantDebugOutput() { return m_wantDebugOutput; }
+    // implementation only
+    void OnIdle(wxIdleEvent& 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();
+    // 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* win);
+    // Send idle event to window and all subwindows
+    // Returns TRUE if more idle time is requested.
+    bool SendIdleEvents(wxWindow* pWin);

 
 

-  // Windows only, but for compatibility...
-  inline void SetAuto3D(bool flag) { m_auto3D = flag; }
-  inline bool GetAuto3D() const { return m_auto3D; }
+    void SetAuto3D(bool bFlag) { m_bAuto3D = bFlag; }
+    bool GetAuto3D(void) const { return m_bAuto3D; }

 
 

-  // Creates a log object
-  virtual wxLog* CreateLogTarget();
-
-public:
-  // Will always be set to the appropriate, main-style values.
-  int                   argc;
-  char **               argv;
+    int AddSocketHandler(int handle, int mask,
+                         void (*callback)(void*), void * gsock);
+    void RemoveSocketHandler(int handle);
+    void HandleSockets();

 
 protected:
 
 protected:

-  bool                  m_wantDebugOutput ;
-  wxString              m_className;
-  wxString              m_appName,
-                        m_vendorName;
-  wxWindow *            m_topWindow;
-  bool                  m_exitOnFrameDelete;
-  bool                  m_showOnInit;
-  int                   m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
-  bool                  m_auto3D ;   // Always use 3D controls, except
-                                 // where overriden
-  static wxAppInitializerFunction      m_appInitFn;
+    bool                            m_bShowOnInit;
+    int                             m_nPrintMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
+    bool                            m_bAuto3D ;   // Always use 3D controls, except where overriden
+
+    //
+    // 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:
 
 
 public:
 

-  // Implementation
-  static bool Initialize();
-  static void CleanUp();
+    // Implementation
+    static bool  Initialize(HAB vHab);
+    static void  CleanUp(void);

 
 

-  void DeletePendingObjects();
-  bool ProcessIdle();
+    static bool  RegisterWindowClasses(HAB vHab);
+    virtual void DoMessage(WXMSG *pMsg);
+    virtual bool DoMessage(void);
+    virtual bool ProcessMessage(WXMSG* pMsg);
+    void         DeletePendingObjects(void);

 
 public:
 
 public:

-  static long           sm_lastMessageTime;
-  int                   m_nCmdShow;
+    int                             m_nCmdShow;
+    HMQ                             m_hMq;

 
 protected:
 
 protected:

-  bool                  m_keepGoing ;
+    bool                            m_bKeepGoing ;

 
 

-DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()

 };
 
 };
 

-// TODO: add platform-specific arguments

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

-

 #endif
     // _WX_APP_H_
 
 #endif
     // _WX_APP_H_