From 26a87b69a0686db5700ae66e17c64c1bfe14d557 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 21 May 1998 19:39:05 +0000 Subject: [PATCH] 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 --- include/wx/app.h | 16 ++++++++++++---- src/msw/data.cpp | 3 +++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/include/wx/app.h b/include/wx/app.h index 043856718e..4b586b74ad 100644 --- 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; } \ -\ - 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) ; diff --git a/src/msw/data.cpp b/src/msw/data.cpp index dfc8022216..fbde5890cc 100644 --- a/src/msw/data.cpp +++ b/src/msw/data.cpp @@ -152,6 +152,9 @@ const char *wxDoubleToStringStr = "%.2f"; const char *wxUserResourceStr = "TEXT"; #endif +#if USE_POSTSCRIPT +wxPrintPaperDatabase* wxThePrintPaperDatabase = NULL; +#endif #if USE_SHARED_LIBRARY /* -- 2.45.2