App declarations modified; cursor was corrupt; needed to add PostScript-related variable.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/app.h b/include/wx/app.h
index 043856718e305e5608c3ddd6ad5f88b677f9cc9b..4b586b74ad30337576e0fd7b0db72a6e4b938c21 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -46,14 +46,22 @@ 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(AIX4) /* || defined(____HPUX__) */
+#define IMPLEMENT_WXWIN_MAIN 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; } \
 #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) ;
 
 #define DECLARE_APP(appname) \
        extern appname& wxGetApp(void) ;

diff --git a/src/msw/data.cpp b/src/msw/data.cpp
index dfc8022216e46a895414dd2dda5a25e63e9607fc..fbde5890ccde224a00195e95fc4dc198436621a8 100644 (file)
--- a/src/msw/data.cpp
+++ b/src/msw/data.cpp
@@ -152,6 +152,9 @@ const char *wxDoubleToStringStr = "%.2f";
 const char *wxUserResourceStr = "TEXT";
 #endif
 
 const char *wxUserResourceStr = "TEXT";
 #endif
 

+#if USE_POSTSCRIPT
+wxPrintPaperDatabase* wxThePrintPaperDatabase = NULL;
+#endif

 
 #if USE_SHARED_LIBRARY
 /*
 
 #if USE_SHARED_LIBRARY
 /*