added #if USE_WXCONFIG check (TODO: add configure switch for it)

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

diff --git a/include/wx/app.h b/include/wx/app.h
index 043856718e305e5608c3ddd6ad5f88b677f9cc9b..349bac1acf1f4e27865fea4d89b906b400238795 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -19,7 +19,7 @@ typedef wxApp* (*wxAppInitializerFunction) (void);
 
 #include "wx/object.h"
 
-#ifdef __GTK
+#ifdef __GTK__
 typedef wxObject* (*wxAppInitializerFunction) (void);  // returning wxApp* won't work with gcc
 #endif
 
@@ -46,14 +46,24 @@ public:
        }
 };
 
+// Here's a macro you can use if your compiler
+// really, really wants main() to be in your main program
+// (e.g. hello.cpp).
+// Now IMPLEMENT_APP should add this code if required.
+
+#if defined(__AIX__) || defined(__SUN__) || defined(__HPUX__)
+#define IMPLEMENT_WXWIN_MAIN \
+extern int wxEntry( int argc, char *argv[] ); \
+int main(int argc, char *argv[]) { return wxEntry(argc, argv); }
+#else
+#define IMPLEMENT_WXWIN_MAIN
+#endif
+
 #define IMPLEMENT_APP(appname)                          \
         wxApp *wxCreateApp(void) { return new appname; }      \
                wxAppInitializer wxTheAppInitializer((wxAppInitializerFunction) wxCreateApp); \
         appname& wxGetApp(void) { return *(appname *)wxTheApp; } \
-\
-        extern int wxEntry( int argc, char *argv[] ); \
-        int main(int argc, char *argv[]) { return wxEntry(argc, argv); }
-
+        IMPLEMENT_WXWIN_MAIN
 
 #define DECLARE_APP(appname) \
        extern appname& wxGetApp(void) ;