Fix a couple of export declarations

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

diff --git a/include/wx/app.h b/include/wx/app.h
index 334c4d7c206ca3ab54e3518cfe0ea70308b63ab0..4508ef1bca30d156a784b015cda2b5a148538e4f 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -433,12 +433,6 @@ public:
         // Perform standard OnIdle behaviour: call from port's OnIdle
     void OnIdle(wxIdleEvent& event);
 
         // Perform standard OnIdle behaviour: call from port's OnIdle
     void OnIdle(wxIdleEvent& event);
 

-#if wxUSE_EXCEPTIONS
-    virtual void HandleEvent(wxEvtHandler *handler,
-                             wxEventFunction func,
-                             wxEvent& event) const;
-#endif // wxUSE_EXCEPTIONS
-

 
     // top level window functions
     // --------------------------
 
     // top level window functions
     // --------------------------


@@ -667,6 +661,7 @@ public:
     }                                                                       \
     wxAppInitializer                                                        \
         wxTheAppInitializer((wxAppInitializerFunction) wxCreateApp);        \
     }                                                                       \
     wxAppInitializer                                                        \
         wxTheAppInitializer((wxAppInitializerFunction) wxCreateApp);        \

+    DECLARE_APP(appname)                                                    \

     appname& wxGetApp() { return *(appname *)wxTheApp; }
 
 // Same as IMPLEMENT_APP() normally but doesn't include themes support in
     appname& wxGetApp() { return *(appname *)wxTheApp; }
 
 // Same as IMPLEMENT_APP() normally but doesn't include themes support in


@@ -690,5 +685,13 @@ public:
 // function
 #define DECLARE_APP(appname) extern appname& wxGetApp();
 
 // function
 #define DECLARE_APP(appname) extern appname& wxGetApp();
 

+
+// declare the stuff defined by IMPLEMENT_APP() macro, it's not really needed
+// anywhere else but at the very least it suppresses icc warnings about
+// defining extern symbols without prior declaration, and it shouldn't do any
+// harm
+extern wxAppConsole *wxCreateApp();
+extern wxAppInitializer wxTheAppInitializer;
+

 #endif // _WX_APP_H_BASE_
 
 #endif // _WX_APP_H_BASE_