wxNativeFontInfo changes

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

diff --git a/include/wx/os2/app.h b/include/wx/os2/app.h
index d919cdc63a621773f825fdfa17dbdcf24d60113f..4a5422a4df83e3b905f388b6258af85ad078de01 100644 (file)
--- a/include/wx/os2/app.h
+++ b/include/wx/os2/app.h
@@ -22,12 +22,19 @@ 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
 
 // 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


@@ -39,68 +46,68 @@ public:
     wxApp();
     virtual ~wxApp();
 
     wxApp();
     virtual ~wxApp();
 

+    virtual bool OnInitGui(void);
+

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

-    virtual int MainLoop();
-    virtual void ExitMainLoop();
-    virtual bool Initialized();
-    virtual bool Pending() ;
-    virtual void Dispatch() ;
+    virtual int  MainLoop(void);
+    virtual void ExitMainLoop(void);
+    virtual bool Initialized(void);
+    virtual bool Pending(void) ;
+    virtual void Dispatch(void);

 
     virtual wxIcon GetStdIcon(int which) const;
 
 
     virtual wxIcon GetStdIcon(int which) const;
 

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

 
     // implementation only
 
     // implementation only

-    void OnIdle(wxIdleEvent& event);
-    void OnEndSession(wxCloseEvent& event);
-    void OnQueryEndSession(wxCloseEvent& event);
+    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.
 
     // Send idle event to all top-level windows.
     // Returns TRUE if more idle time is requested.

-    bool SendIdleEvents();
+    bool SendIdleEvents(void);

 
     // Send idle event to window and all subwindows
     // Returns TRUE if more idle time is requested.
 
     // Send idle event to window and all subwindows
     // Returns TRUE if more idle time is requested.

-    bool SendIdleEvents(wxWindow* win);
+    bool SendIdleEvents(wxWindow* pWin);

 
 

-    void SetAuto3D(bool flag) { m_auto3D = flag; }
-    bool GetAuto3D() const { return m_auto3D; }
+    void SetAuto3D(bool bFlag) { m_bAuto3D = bFlag; }
+    bool GetAuto3D(void) const { return m_bAuto3D; }

 
 protected:
 
 protected:

-    bool              m_showOnInit;
-    int               m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
-    bool              m_auto3D ;   // Always use 3D controls, except where overriden
-
-    /* Windows-specific wxApp definitions */
+    bool                            m_bShowOnInit;
+    int                             m_nPrintMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
+    bool                            m_bAuto3D ;   // Always use 3D controls, except where overriden

 
 

+    //
+    // PM-specific wxApp definitions */
+    //

 public:
 
     // Implementation
 public:
 
     // Implementation

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

 
 

-    static bool RegisterWindowClasses();
-    // Convert Windows to argc, argv style
-    void ConvertToStandardCommandArgs(char* p);
-    virtual bool DoMessage();
+    static bool  RegisterWindowClasses(HAB vHab);
+    virtual bool DoMessage(void);

     virtual bool ProcessMessage(WXMSG* pMsg);
     virtual bool ProcessMessage(WXMSG* pMsg);

-    void DeletePendingObjects();
-    bool ProcessIdle();
-#if wxUSE_THREADS
-    void ProcessPendingEvents();
-#endif
-    int GetComCtl32Version() const;
+    void         DeletePendingObjects(void);
+    bool         ProcessIdle(void);

 
 public:
 
 public:

-    int               m_nCmdShow;
+    int                             m_nCmdShow;

 
 protected:
 
 protected:

-    bool              m_keepGoing ;
+    bool                            m_bKeepGoing ;

 
     DECLARE_EVENT_TABLE()
 
     DECLARE_EVENT_TABLE()

+private:
+    HMQ                             m_hMq;

 };
 
 };
 

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

 #endif
     // _WX_APP_H_
 
 #endif
     // _WX_APP_H_