X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6ba7c06eeeda47b88783025428ca0f290e3bf236..cba5a276e4821a0ae7d1e7a435d6aab38baa0a9f:/include/wx/app.h diff --git a/include/wx/app.h b/include/wx/app.h index 4c9f5b8b9d..f9474bed5b 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 // ---------------------------------------------------------------------------- @@ -432,8 +425,6 @@ protected: #include "wx/mac/app.h" #elif defined(__WXPM__) #include "wx/os2/app.h" - #elif defined(__WXSTUBS__) - #include "wx/stubs/app.h" #endif #else // !GUI // can't use typedef because wxApp forward declared as a class