avoid a bug in Carbon headers

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

diff --git a/include/wx/mgl/app.h b/include/wx/mgl/app.h
index 0afeceeb9761e92d2624f64eefcbdb1d075729ae..c400519cfbed0994a6eb6a15e411576df7a7f5b0 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__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "app.h"
 #endif
 
@@ -48,18 +48,8 @@ public:
     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 bool Yield(bool onlyIfNeeded = FALSE);
 
@@ -74,6 +64,5 @@ private:
     wxDisplayModeInfo m_displayMode;
 };
 
-int WXDLLEXPORT wxEntry(int argc, char *argv[]);
-
 #endif // __WX_APP_H__
+