OS/2 fix

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

diff --git a/include/wx/mgl/app.h b/include/wx/mgl/app.h
index 48faef9010074737215df8711ae746388017c62f..d0bedefdf4776b93d88be5328edc6b83aecbd6f5 100644 (file)
--- a/include/wx/mgl/app.h
+++ b/include/wx/mgl/app.h
@@ -3,14 +3,14 @@
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$

-// Copyright:   (c) 2001 Vaclav Slavik
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)

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

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "app.h"
 #endif
 
 #pragma interface "app.h"
 #endif
 


@@ -21,8 +21,9 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class wxApp;
-class wxLog;
+class WXDLLEXPORT wxApp;
+class WXDLLEXPORT wxLog;
+class WXDLLEXPORT wxEventLoop;

 
 //-----------------------------------------------------------------------------
 // wxApp
 
 //-----------------------------------------------------------------------------
 // wxApp


@@ -31,59 +32,32 @@ class wxLog;
 class WXDLLEXPORT wxApp: public wxAppBase
 {
 public:
 class WXDLLEXPORT wxApp: public wxAppBase
 {
 public:

-    wxApp() {}
-    ~wxApp() {}
+    wxApp();
+    ~wxApp();

 
     /* override for altering the way wxGTK intializes the GUI
      * (palette/visual/colorcube). under wxMSW, OnInitGui() does nothing by
      * default. when overriding this method, the code in it is likely to be
      * platform dependent, otherwise use OnInit(). */
 
     /* override for altering the way wxGTK intializes the GUI
      * (palette/visual/colorcube). under wxMSW, OnInitGui() does nothing by
      * default. when overriding this method, the code in it is likely to be
      * platform dependent, otherwise use OnInit(). */

-    virtual bool OnInitGui() {return 0;}
+    virtual bool OnInitGui();

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

-    virtual int MainLoop() {return 0;}
-    virtual void ExitMainLoop() {}
-    virtual bool Initialized() {return 0;}
-    virtual bool Pending() {return 0;}
-    virtual void Dispatch() {}
+    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual void CleanUp();
+    
+    virtual void Exit();
+    virtual void WakeUpIdle();
+    virtual bool Yield(bool onlyIfNeeded = FALSE);

 
 

-    virtual wxIcon GetStdIcon(int which) const {return wxNullIcon;}
-
-    // implementation only from now on
-    void OnIdle( wxIdleEvent &event ) {}
-    bool SendIdleEvents() {return 0;}
-    bool SendIdleEvents( wxWindow* win ) {return 0;}
-
-    static bool Initialize() {return 0;}
-    static bool InitialzeVisual() {return 0;}
-    static void CleanUp() {}
-
-    bool ProcessIdle() {return 0;}
-    void DeletePendingObjects() {}
-
-    // This can be used to suppress the generation of Idle events.
-    void SuppressIdleEvents(bool arg = TRUE) { m_suppressIdleEvents = arg; }
-    bool GetSuppressIdleEvents() const { return m_suppressIdleEvents; }
-
-#if 0 //FIXME MGL
-    bool            m_initialized;
-
-    gint            m_idleTag;
-#if wxUSE_THREADS
-    gint            m_wakeUpTimerTag;
-#endif
-    unsigned char  *m_colorCube;
-#endif
-
-private:
-    /// Set to TRUE while we are in wxYield().
-    bool m_suppressIdleEvents;
+    virtual wxVideoMode GetDisplayMode() const { return m_displayMode; }
+    virtual bool SetDisplayMode(const wxVideoMode& mode);

 
 private:
     DECLARE_DYNAMIC_CLASS(wxApp)
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_DYNAMIC_CLASS(wxApp)
     DECLARE_EVENT_TABLE()

-};

 
 

-int WXDLLEXPORT wxEntry( int argc, char *argv[] );
+    wxVideoMode m_displayMode;
+};

 
 #endif // __WX_APP_H__
 
 #endif // __WX_APP_H__

+