- Moved wxApp::SendIdleEvents and wxApp::ProcessIdle into common code.

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

diff --git a/include/wx/mgl/app.h b/include/wx/mgl/app.h
index 526328c674388b2f03a0ac6ed0b9849bd82a6ca5..27cf02da751113623e1bde8e33ef4e8d833f3219 100644 (file)
--- a/include/wx/mgl/app.h
+++ b/include/wx/mgl/app.h
@@ -3,7 +3,7 @@
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -24,7 +24,6 @@
 class WXDLLEXPORT wxApp;
 class WXDLLEXPORT wxLog;
 class WXDLLEXPORT wxEventLoop;
 class WXDLLEXPORT wxApp;
 class WXDLLEXPORT wxLog;
 class WXDLLEXPORT wxEventLoop;

-class WXDLLEXPORT wxDesktopWindow;

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


@@ -49,28 +48,24 @@ public:
     virtual bool Pending();
     virtual void Dispatch();
 
     virtual bool Pending();
     virtual void Dispatch();
 

-    virtual wxIcon GetStdIcon(int which) const;
-

     // implementation only from now on
     void OnIdle(wxIdleEvent &event);
     // implementation only from now on
     void OnIdle(wxIdleEvent &event);

-    bool SendIdleEvents();
-    bool SendIdleEvents(wxWindow* win);
-
-    static bool Initialize();
-    static void CleanUp();

 
 

-    bool ProcessIdle();
-    void DeletePendingObjects();
+    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual void CleanUp();

 
     virtual bool Yield(bool onlyIfNeeded = FALSE);
 
 
     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;
 private:
     DECLARE_DYNAMIC_CLASS(wxApp)
     DECLARE_EVENT_TABLE()
     
     wxEventLoop *m_mainLoop;

+    wxDisplayModeInfo m_displayMode;

 };
 
 };
 

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

 #endif // __WX_APP_H__
 #endif // __WX_APP_H__

+