fixes to previous commit

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

diff --git a/include/wx/mgl/app.h b/include/wx/mgl/app.h
index 526328c674388b2f03a0ac6ed0b9849bd82a6ca5..43bec77767d13ac76a7cba940e079a96c2c3b956 100644 (file)
--- a/include/wx/mgl/app.h
+++ b/include/wx/mgl/app.h
@@ -3,7 +3,7 @@
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
@@ -24,7 +24,6 @@
 class WXDLLEXPORT wxApp;
 class WXDLLEXPORT wxLog;
 class WXDLLEXPORT wxEventLoop;
-class WXDLLEXPORT wxDesktopWindow;
 
 //-----------------------------------------------------------------------------
 // wxApp
@@ -48,8 +47,7 @@ public:
     virtual bool Initialized();
     virtual bool Pending();
     virtual void Dispatch();
-
-    virtual wxIcon GetStdIcon(int which) const;
+    virtual bool ProcessIdle();
 
     // implementation only from now on
     void OnIdle(wxIdleEvent &event);
@@ -59,16 +57,19 @@ public:
     static bool Initialize();
     static void CleanUp();
 
-    bool ProcessIdle();
     void DeletePendingObjects();
 
     virtual bool Yield(bool onlyIfNeeded = FALSE);
 
+    virtual wxDisplayModeInfo GetDisplayMode() const { return m_displayMode; }
+    virtual bool SetDisplayMode(const wxDisplayModeInfo& mode);
+
 private:
     DECLARE_DYNAMIC_CLASS(wxApp)
     DECLARE_EVENT_TABLE()
     
     wxEventLoop *m_mainLoop;
+    wxDisplayModeInfo m_displayMode;
 };
 
 int WXDLLEXPORT wxEntry(int argc, char *argv[]);