Merge in from trunk r67662 to r64801

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

diff --git a/include/wx/mgl/app.h b/include/wx/mgl/app.h
index d0bedefdf4776b93d88be5328edc6b83aecbd6f5..40b6e0bf68028a174f4a9f00b2b05a3472911cd5 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,30 +10,27 @@
 #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
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxApp;
-class WXDLLEXPORT wxLog;
-class WXDLLEXPORT wxEventLoop;
+class WXDLLIMPEXP_FWD_CORE wxApp;
+class WXDLLIMPEXP_FWD_BASE wxLog;
+class WXDLLIMPEXP_FWD_CORE wxEventLoop;
 
 //-----------------------------------------------------------------------------
 // wxApp
 //-----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxApp: public wxAppBase
+class WXDLLIMPEXP_CORE 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
@@ -44,20 +41,17 @@ public:
     // override base class (pure) virtuals
     virtual bool Initialize(int& argc, wxChar **argv);
     virtual void CleanUp();
-    
+
     virtual void Exit();
     virtual void WakeUpIdle();
-    virtual bool Yield(bool onlyIfNeeded = FALSE);
 
     virtual wxVideoMode GetDisplayMode() const { return m_displayMode; }
     virtual bool SetDisplayMode(const wxVideoMode& mode);
 
 private:
     DECLARE_DYNAMIC_CLASS(wxApp)
-    DECLARE_EVENT_TABLE()
 
     wxVideoMode m_displayMode;
 };
 
 #endif // __WX_APP_H__
-