From 53c9228ead0c7c0955bdc882fc2ccc9aae8342ba Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 7 Dec 2002 23:58:13 +0000 Subject: [PATCH] always declare wxAppInitializerFunction() as returning wxApp, whether we use gcc or not git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/app.h | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/include/wx/app.h b/include/wx/app.h index 4c9f5b8b9d..04ad7f198a 100644 --- a/include/wx/app.h +++ b/include/wx/app.h @@ -17,22 +17,6 @@ #pragma interface "appbase.h" #endif -// ---------------------------------------------------------------------------- -// typedefs -// ---------------------------------------------------------------------------- - -#if (defined(__WXMSW__) && !defined(__WXMICROWIN__)) || defined (__WXPM__) - class WXDLLEXPORT wxApp; - typedef wxApp* (*wxAppInitializerFunction)(); -#else - // returning wxApp* won't work with gcc - #include "wx/object.h" - - typedef wxObject* (*wxAppInitializerFunction)(); -#endif - -class WXDLLEXPORT wxCmdLineParser; - // ---------------------------------------------------------------------------- // headers we have to include here // ---------------------------------------------------------------------------- @@ -49,9 +33,18 @@ class WXDLLEXPORT wxCmdLineParser; #include "wx/build.h" +class WXDLLEXPORT wxApp; +class WXDLLEXPORT wxCmdLineParser; class WXDLLEXPORT wxLog; class WXDLLEXPORT wxMessageOutput; +// ---------------------------------------------------------------------------- +// typedefs +// ---------------------------------------------------------------------------- + +// the type of the function used to create a wxApp object on program start up +typedef wxApp* (*wxAppInitializerFunction)(); + // ---------------------------------------------------------------------------- // constants // ----------------------------------------------------------------------------