X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6b4296f7fbee294dea1e5d8256378afea201cd9c..bb2212e6c46d1a661d937450255ede09aff19ede:/include/wx/msw/app.h diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h index c9703b11d8..a83d52ead8 100644 --- a/include/wx/msw/app.h +++ b/include/wx/msw/app.h @@ -23,10 +23,8 @@ 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) - public: wxApp(); virtual ~wxApp(); @@ -35,7 +33,6 @@ public: virtual bool Initialize(int& argc, wxChar **argv); virtual void CleanUp(); - virtual bool Yield(bool onlyIfNeeded = false); virtual void WakeUpIdle(); virtual void SetPrintMode(int mode) { m_printMode = mode; } @@ -50,13 +47,40 @@ public: virtual bool OnExceptionInMainLoop(); #endif // wxUSE_EXCEPTIONS + // MSW-specific from now on + // ------------------------ + + // this suffix should be appended to all our Win32 class names to obtain a + // variant registered without CS_[HV]REDRAW styles + static const wxChar *GetNoRedrawClassSuffix() { return _T("NR"); } + + // get the name of the registered Win32 class with the given (unique) base + // name: this function constructs the unique class name using this name as + // prefix, checks if the class is already registered and registers it if it + // isn't and returns the name it was registered under (or NULL if it failed) + // + // the registered class will always have CS_[HV]REDRAW and CS_DBLCLKS + // styles as well as any additional styles specified as arguments here; and + // there will be also a companion registered class identical to this one + // but without CS_[HV]REDRAW whose name will be the same one but with + // GetNoRedrawClassSuffix() + // + // the background brush argument must be either a COLOR_XXX standard value + // or (default) -1 meaning that the class paints its background itself + static const wxChar *GetRegisteredClassName(const wxChar *name, + int bgBrushCol = -1, + int extraStyles = 0); + + // return true if this name corresponds to one of the classes we registered + // in the previous GetRegisteredClassName() calls + static bool IsRegisteredClassName(const wxString& name); + protected: int m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT public: - // Implementation - static bool RegisterWindowClasses(); - static bool UnregisterWindowClasses(); + // unregister any window classes registered by GetRegisteredClassName() + static void UnregisterWindowClasses(); #if wxUSE_RICHEDIT // initialize the richedit DLL of (at least) given version, return true if @@ -78,7 +102,8 @@ public: protected: DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxApp) + wxDECLARE_NO_COPY_CLASS(wxApp); + DECLARE_DYNAMIC_CLASS(wxApp) }; #ifdef __WXWINCE__ @@ -122,26 +147,56 @@ inline int wxApp::GetShell32Version() // 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); +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 lpCmdLine, \ - int nCmdShow) \ - { \ - return wxEntry(hInstance, hPrevInstance, lpCmdLine, nCmdShow); \ - } + 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_