X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd435a79ed2c79e20621fbe6b1013a86a9e05fed..472eec8a0391538e4dcf7f7c6c4f4d44c8383616:/include/wx/msw/app.h diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h index 058849b80f..ba8a192543 100644 --- a/include/wx/msw/app.h +++ b/include/wx/msw/app.h @@ -12,18 +12,14 @@ #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 @@ -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,6 @@ public: // wasn't found at all static int GetComCtl32Version(); -public: // 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 +77,47 @@ protected: DECLARE_NO_COPY_CLASS(wxApp) }; -int WXDLLEXPORT wxEntry(WXHINSTANCE hInstance, WXHINSTANCE hPrevInstance, - char *lpszCmdLine, int nCmdShow); +// ---------------------------------------------------------------------------- +// 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 bool WXDLLEXPORT +wxEntryStart(HINSTANCE hInstance, + HINSTANCE hPrevInstance = NULL, + wxCmdLineArgType pCmdLine = NULL, + int nCmdShow = SW_SHOWNORMAL); + +extern int WXDLLEXPORT +wxEntry(HINSTANCE hInstance, + HINSTANCE hPrevInstance = NULL, + wxCmdLineArgType pCmdLine = NULL, + int nCmdShow = SW_SHOWNORMAL); + +#define IMPLEMENT_WXWIN_MAIN \ + extern "C" int WINAPI WinMain(HINSTANCE hInstance, \ + HINSTANCE hPrevInstance, \ + wxCmdLineArgType lpCmdLine, \ + int nCmdShow) \ + { \ + return wxEntry(hInstance, hPrevInstance, lpCmdLine, nCmdShow); \ + } #endif // _WX_APP_H_