make wxVarVScrollLegacyAdaptor::OnGetLineHeight() non-pure virtual to fix compilation...

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

diff --git a/include/wx/mgl/app.h b/include/wx/mgl/app.h
index fa98fc1e935dad011176227a21ba06d411dcf6aa..7a5e0b0f1f629d1112f7c3741050fe3db715d7a4 100644 (file)
--- a/include/wx/mgl/app.h
+++ b/include/wx/mgl/app.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        app.h
+// Name:        wx/mgl/app.h
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
@@ -10,12 +10,9 @@
 #ifndef __WX_APP_H__
 #define __WX_APP_H__
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "app.h"
-#endif
-
 #include "wx/frame.h"
 #include "wx/icon.h"
+#include "wx/vidmode.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -33,7 +30,7 @@ class WXDLLEXPORT wxApp: public wxAppBase
 {
 public:
     wxApp();
-    ~wxApp();
+    virtual ~wxApp();
 
     /* override for altering the way wxGTK intializes the GUI
      * (palette/visual/colorcube). under wxMSW, OnInitGui() does nothing by
@@ -42,24 +39,21 @@ public:
     virtual bool OnInitGui();
 
     // override base class (pure) virtuals
-    virtual bool Initialized();
-
     virtual bool Initialize(int& argc, wxChar **argv);
     virtual void CleanUp();
-    
+
     virtual void Exit();
     virtual void WakeUpIdle();
     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()
 
-    wxDisplayModeInfo m_displayMode;
+    wxVideoMode m_displayMode;
 };
 
 #endif // __WX_APP_H__
-