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 43bec77767d13ac76a7cba940e079a96c2c3b956..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__
 
 #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
 


@@ -47,17 +47,9 @@ public:
     virtual bool Initialized();
     virtual bool Pending();
     virtual void Dispatch();
     virtual bool Initialized();
     virtual bool Pending();
     virtual void Dispatch();

-    virtual bool ProcessIdle();

 
 

-    // implementation only from now on
-    void OnIdle(wxIdleEvent &event);
-    bool SendIdleEvents();
-    bool SendIdleEvents(wxWindow* win);
-
-    static bool Initialize();
-    static void CleanUp();
-
-    void DeletePendingObjects();
+    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual void CleanUp();

 
     virtual bool Yield(bool onlyIfNeeded = FALSE);
 
 
     virtual bool Yield(bool onlyIfNeeded = FALSE);
 


@@ -72,6 +64,5 @@ private:
     wxDisplayModeInfo m_displayMode;
 };
 
     wxDisplayModeInfo m_displayMode;
 };
 

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

 #endif // __WX_APP_H__
 #endif // __WX_APP_H__

+