Theme fix for Mac

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

diff --git a/include/wx/mgl/app.h b/include/wx/mgl/app.h
index b3b0b6ca67a522bc4916c78e5ad45215651c88b0..7a5e0b0f1f629d1112f7c3741050fe3db715d7a4 100644 (file)
--- a/include/wx/mgl/app.h
+++ b/include/wx/mgl/app.h
@@ -1,21 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$

-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// 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__
-#pragma interface "app.h"
-#endif
-

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

+#include "wx/vidmode.h"

 
 //-----------------------------------------------------------------------------
 // classes
 
 //-----------------------------------------------------------------------------
 // classes


@@ -33,7 +30,7 @@ class WXDLLEXPORT wxApp: public wxAppBase
 {
 public:
     wxApp();
 {
 public:
     wxApp();

-    ~wxApp();
+    virtual ~wxApp();

 
     /* override for altering the way wxGTK intializes the GUI
      * (palette/visual/colorcube). under wxMSW, OnInitGui() does nothing by
 
     /* override for altering the way wxGTK intializes the GUI
      * (palette/visual/colorcube). under wxMSW, OnInitGui() does nothing by


@@ -42,32 +39,21 @@ public:
     virtual bool OnInitGui();
 
     // override base class (pure) virtuals
     virtual bool OnInitGui();
 
     // override base class (pure) virtuals

-    virtual int MainLoop();
-    virtual void ExitMainLoop();
-    virtual bool Initialized();
-    virtual bool Pending();
-    virtual void Dispatch();
-
-    virtual wxIcon GetStdIcon(int which) const;
-
-    // implementation only from now on
-    void OnIdle(wxIdleEvent &event);
-    bool SendIdleEvents();
-    bool SendIdleEvents(wxWindow* win);
+    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual void CleanUp();

 
 

-    static bool Initialize();
-    static void CleanUp();
+    virtual void Exit();
+    virtual void WakeUpIdle();
+    virtual bool Yield(bool onlyIfNeeded = FALSE);

 
 

-    bool ProcessIdle();
-    void DeletePendingObjects();
+    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()

-    
-    wxEventLoop *m_mainLoop;
-};

 
 

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

 
 #endif // __WX_APP_H__
 
 #endif // __WX_APP_H__