Updated version to 2.5.5

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

diff --git a/include/wx/mgl/app.h b/include/wx/mgl/app.h
index 0afeceeb9761e92d2624f64eefcbdb1d075729ae..d0bedefdf4776b93d88be5328edc6b83aecbd6f5 100644 (file)
--- a/include/wx/mgl/app.h
+++ b/include/wx/mgl/app.h
@@ -10,7 +10,7 @@
 #ifndef __WX_APP_H__
 #define __WX_APP_H__
 
 #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
 


@@ -42,38 +42,22 @@ 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);
-
-    static bool Initialize();
-    static void CleanUp();
-
-    bool ProcessIdle();
-    void DeletePendingObjects();
-
+    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual void CleanUp();
+    
+    virtual void Exit();
+    virtual void WakeUpIdle();

     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);
+    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;
-    wxDisplayModeInfo m_displayMode;
-};

 
 

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

 
 #endif // __WX_APP_H__
 
 #endif // __WX_APP_H__

+