X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd435a79ed2c79e20621fbe6b1013a86a9e05fed..f01a77c7954ff4b7ee9f74af8df5a16f239d3537:/include/wx/msw/app.h diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h index 058849b80f..e45caf78a3 100644 --- a/include/wx/msw/app.h +++ b/include/wx/msw/app.h @@ -12,22 +12,18 @@ #ifndef _WX_APP_H_ #define _WX_APP_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "app.h" -#endif - #include "wx/event.h" #include "wx/icon.h" -class WXDLLEXPORT wxFrame; -class WXDLLEXPORT wxWindow; -class WXDLLEXPORT wxApp ; -class WXDLLEXPORT wxKeyEvent; -class WXDLLEXPORT wxLog; +class WXDLLIMPEXP_FWD_CORE wxFrame; +class WXDLLIMPEXP_FWD_CORE wxWindow; +class WXDLLIMPEXP_FWD_CORE wxApp; +class WXDLLIMPEXP_FWD_CORE wxKeyEvent; +class WXDLLIMPEXP_FWD_BASE wxLog; // Represents the application. Derive OnInit and declare // a new App object to start application -class WXDLLEXPORT wxApp : public wxAppBase +class WXDLLIMPEXP_CORE wxApp : public wxAppBase { DECLARE_DYNAMIC_CLASS(wxApp) @@ -39,7 +35,7 @@ public: virtual bool Initialize(int& argc, wxChar **argv); virtual void CleanUp(); - virtual bool Yield(bool onlyIfNeeded = FALSE); + virtual bool Yield(bool onlyIfNeeded = false); virtual void WakeUpIdle(); virtual void SetPrintMode(int mode) { m_printMode = mode; } @@ -50,22 +46,20 @@ public: void OnEndSession(wxCloseEvent& event); void OnQueryEndSession(wxCloseEvent& event); +#if wxUSE_EXCEPTIONS + virtual bool OnExceptionInMainLoop(); +#endif // wxUSE_EXCEPTIONS + protected: int m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT - /* Windows-specific wxApp definitions */ - public: - // Implementation static bool RegisterWindowClasses(); static bool UnregisterWindowClasses(); - // idle processing - // --------------- - #if wxUSE_RICHEDIT - // initialize the richedit DLL of (at least) given version, return TRUE if + // initialize the richedit DLL of (at least) given version, return true if // ok (Win95 has version 1, Win98/NT4 has 1 and 2, W2K has 3) static bool InitRichEdit(int version = 2); #endif // wxUSE_RICHEDIT @@ -74,7 +68,10 @@ public: // wasn't found at all static int GetComCtl32Version(); -public: + // the same for shell32.dll: returns 400, 471, 500, 600, ... (4.70 not + // currently detected) + static int GetShell32Version(); + // the SW_XXX value to be used for the frames opened by the application // (currently seems unused which is a bug -- TODO) static int m_nCmdShow; @@ -84,8 +81,97 @@ protected: DECLARE_NO_COPY_CLASS(wxApp) }; -int WXDLLEXPORT wxEntry(WXHINSTANCE hInstance, WXHINSTANCE hPrevInstance, - char *lpszCmdLine, int nCmdShow); +#ifdef __WXWINCE__ + +// under CE provide a dummy implementation of GetComCtl32Version() returning +// the value passing all ">= 470" tests (which are the only ones used in our +// code currently) as commctrl.dll under CE 2.0 and later support comctl32.dll +// functionality +inline int wxApp::GetComCtl32Version() +{ + return 471; +} + +// this is not currently used at all under CE so it's not really clear what do +// we need to return from here +inline int wxApp::GetShell32Version() +{ + return 0; +} + +#endif // __WXWINCE__ + +// ---------------------------------------------------------------------------- +// MSW-specific wxEntry() overload and IMPLEMENT_WXWIN_MAIN definition +// ---------------------------------------------------------------------------- + +// we need HINSTANCE declaration to define WinMain() +#include "wx/msw/wrapwin.h" + +#ifndef SW_SHOWNORMAL + #define SW_SHOWNORMAL 1 +#endif + +// WinMain() is always ANSI, even in Unicode build, under normal Windows +// but is always Unicode under CE +#ifdef __WXWINCE__ + typedef wchar_t *wxCmdLineArgType; +#else + typedef char *wxCmdLineArgType; +#endif + +// wxMSW-only overloads of wxEntry() and wxEntryStart() which take the +// parameters passed to WinMain() instead of those passed to main() +extern WXDLLIMPEXP_CORE bool + wxEntryStart(HINSTANCE hInstance, + HINSTANCE hPrevInstance = NULL, + wxCmdLineArgType pCmdLine = NULL, + int nCmdShow = SW_SHOWNORMAL); + +extern WXDLLIMPEXP_CORE int + wxEntry(HINSTANCE hInstance, + HINSTANCE hPrevInstance = NULL, + wxCmdLineArgType pCmdLine = NULL, + int nCmdShow = SW_SHOWNORMAL); + +#if defined(__BORLANDC__) && wxUSE_UNICODE + // Borland C++ has the following nonstandard behaviour: when the -WU + // command line flag is used, the linker expects to find wWinMain instead + // of WinMain. This flag causes the compiler to define _UNICODE and + // UNICODE symbols and there's no way to detect its use, so we have to + // define both WinMain and wWinMain so that IMPLEMENT_WXWIN_MAIN works + // for both code compiled with and without -WU. + // See http://sourceforge.net/tracker/?func=detail&atid=309863&aid=1935997&group_id=9863 + // for more details. + #define IMPLEMENT_WXWIN_MAIN_BORLAND_NONSTANDARD \ + extern "C" int WINAPI wWinMain(HINSTANCE hInstance, \ + HINSTANCE hPrevInstance, \ + wchar_t * WXUNUSED(lpCmdLine), \ + int nCmdShow) \ + { \ + /* NB: wxEntry expects lpCmdLine argument to be char*, not */ \ + /* wchar_t*, but fortunately it's not used anywhere */ \ + /* and we can simply pass NULL in: */ \ + return wxEntry(hInstance, hPrevInstance, NULL, nCmdShow); \ + } +#else + #define IMPLEMENT_WXWIN_MAIN_BORLAND_NONSTANDARD +#endif // defined(__BORLANDC__) && wxUSE_UNICODE + +#define IMPLEMENT_WXWIN_MAIN \ + extern "C" int WINAPI WinMain(HINSTANCE hInstance, \ + HINSTANCE hPrevInstance, \ + wxCmdLineArgType WXUNUSED(lpCmdLine), \ + int nCmdShow) \ + { \ + /* NB: We pass NULL in place of lpCmdLine to behave the same as */ \ + /* Borland-specific wWinMain() above. If it becomes needed */ \ + /* to pass lpCmdLine to wxEntry() here, you'll have to fix */ \ + /* wWinMain() above too. */ \ + return wxEntry(hInstance, hPrevInstance, NULL, nCmdShow); \ + } \ + IMPLEMENT_WXWIN_MAIN_BORLAND_NONSTANDARD + #endif // _WX_APP_H_