Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

always declare wxAppInitializerFunction() as returning wxApp, whether we use gcc or not

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-07 23:58:13 +00:00
parent 3ddcf967d6
commit 53c9228ead
1 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
include/wx/app.h
View File

@@ -17,22 +17,6 @@
#pragma interface "appbase.h" #pragma interface "appbase.h"
#endif #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 // headers we have to include here
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -49,9 +33,18 @@ class WXDLLEXPORT wxCmdLineParser;
#include "wx/build.h" #include "wx/build.h"
class WXDLLEXPORT wxApp;
class WXDLLEXPORT wxCmdLineParser;
class WXDLLEXPORT wxLog; class WXDLLEXPORT wxLog;
class WXDLLEXPORT wxMessageOutput; class WXDLLEXPORT wxMessageOutput;
// ----------------------------------------------------------------------------
// typedefs
// ----------------------------------------------------------------------------
// the type of the function used to create a wxApp object on program start up
typedef wxApp* (*wxAppInitializerFunction)();
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// constants // constants
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------