always declare wxAppInitializerFunction() as returning wxApp, whether we use gcc...

[wxWidgets.git] / include / wx / toplevel.h

diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index 84ac5bffeb70f827c8d8f47da0213d6b6062e4e2..d7a8fddd7af904cf0efa0d47ce447223cc076d98 100644 (file)
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -14,14 +14,14 @@
 #ifndef _WX_TOPLEVEL_BASE_H_
 #define _WX_TOPLEVEL_BASE_H_
 
 #ifndef _WX_TOPLEVEL_BASE_H_
 #define _WX_TOPLEVEL_BASE_H_
 

+#if defined(__GNUG__) && !defined(__APPLE__)
+    #pragma interface "toplevelbase.h"
+#endif
+

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma interface "toplevelbase.h"
-#endif
-

 #include "wx/window.h"
 #include "wx/iconbndl.h"
 
 #include "wx/window.h"
 #include "wx/iconbndl.h"
 


@@ -140,9 +140,9 @@ protected:
     virtual bool IsOneOfBars(const wxWindow *WXUNUSED(win)) const
         { return FALSE; }
 
     virtual bool IsOneOfBars(const wxWindow *WXUNUSED(win)) const
         { return FALSE; }
 

-    // check if we should exit the program after deleting another top level
+    // check if we should exit the program after deleting this top level

     // window (this is used in common dtor and wxMSW code)
     // window (this is used in common dtor and wxMSW code)

-    static bool IsLastBeforeExit();
+    bool IsLastBeforeExit() const;

 
     // send the iconize event, return TRUE if processed
     bool SendIconizeEvent(bool iconized = TRUE);
 
     // send the iconize event, return TRUE if processed
     bool SendIconizeEvent(bool iconized = TRUE);