X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ac9a3c615a1d8eec589d2d0de7286f6d676f1693..3cb99894576612e347480d43c5f2e2550b6151cf:/include/wx/app.h diff --git a/include/wx/app.h b/include/wx/app.h index a2e3d03c59..f172a41422 100644 --- a/include/wx/app.h +++ b/include/wx/app.h @@ -21,6 +21,8 @@ #if wxUSE_GUI #include "wx/window.h" // for wxTopLevelWindows + + #include "wx/vidmode.h" #endif // wxUSE_GUI #include "wx/build.h" @@ -32,6 +34,16 @@ class WXDLLIMPEXP_BASE wxCmdLineParser; class WXDLLIMPEXP_BASE wxLog; class WXDLLIMPEXP_BASE wxMessageOutput; +// wxUSE_EVTLOOP_IN_APP is a temporary hack needed until all ports are updated +// to use wxEventLoop, otherwise we get linking errors on wxMac, it's going to +// disappear a.s.a.p. +#ifdef __WXMAC__ + #define wxUSE_EVTLOOP_IN_APP 0 +#else + #define wxUSE_EVTLOOP_IN_APP 1 + class WXDLLEXPORT wxEventLoop; +#endif + // ---------------------------------------------------------------------------- // typedefs // ---------------------------------------------------------------------------- @@ -49,33 +61,6 @@ enum wxPRINT_POSTSCRIPT = 2 }; -// ---------------------------------------------------------------------------- -// support for framebuffer ports -// ---------------------------------------------------------------------------- - -#if wxUSE_GUI -// VS: Fullscreen/framebuffer application needs to choose display mode prior -// to wxWindows initialization. This class holds information about display -// mode. It is used by wxApp::Set/GetDisplayMode. -class WXDLLIMPEXP_CORE wxDisplayModeInfo -{ -public: - wxDisplayModeInfo() : m_ok(FALSE) {} - wxDisplayModeInfo(unsigned width, unsigned height, unsigned depth) - : m_width(width), m_height(height), m_depth(depth), m_ok(TRUE) {} - - unsigned GetWidth() const { return m_width; } - unsigned GetHeight() const { return m_height; } - unsigned GetDepth() const { return m_depth; } - bool IsOk() const { return m_ok; } - -private: - unsigned m_width, m_height, m_depth; - bool m_ok; -}; -#endif // wxUSE_GUI - - // ---------------------------------------------------------------------------- // wxAppConsole: wxApp for non-GUI applications // ---------------------------------------------------------------------------- @@ -131,6 +116,14 @@ public: // crash. virtual void OnFatalException() { } +#if wxUSE_EXCEPTIONS + // Called when an unhandled C++ exception occurs inside OnRun(): note that + // the exception type is lost by now, so if you really want to handle the + // exception you should override OnRun() and put a try/catch around + // MainLoop() call there + virtual void OnUnhandledException() { } +#endif // wxUSE_EXCEPTIONS + // Called from wxExit() function, should terminate the application a.s.a.p. virtual void Exit(); @@ -229,6 +222,17 @@ public: // had been already processed or won't be processed at all, respectively virtual int FilterEvent(wxEvent& event); +#if wxUSE_EXCEPTIONS + // call the specified handler on the given object with the given event + // + // this method only exists to allow catching the exceptions thrown by any + // event handler, it would lead to an extra (useless) virtual function call + // if the exceptions were not used, so it doesn't even exist in that case + virtual void HandleEvent(wxEvtHandler *handler, + wxEventFunction func, + wxEvent& event) const; +#endif // wxUSE_EXCEPTIONS + // process all events in the wxPendingEvents list -- it is necessary to // call this function to process posted events. This happens during each // event loop iteration in GUI mode but if there is no main loop, it may be @@ -257,12 +261,18 @@ public: const wxChar *cond, const wxChar *msg); #endif // __WXDEBUG__ - + // check that the wxBuildOptions object (constructed in the application // itself, usually the one from IMPLEMENT_APP() macro) matches the build // options of the library and abort if it doesn't static bool CheckBuildOptions(const char *optionsSignature, const char *componentName); +#if WXWIN_COMPATIBILITY_2_4 + static bool CheckBuildOptions(const wxBuildOptions& buildOptions) + { + return CheckBuildOptions(buildOptions.m_signature, "your program"); + } +#endif // implementation only from now on // ------------------------------- @@ -361,24 +371,23 @@ public: // ----------------------------------------------------------------- // execute the main GUI loop, the function returns when the loop ends - virtual int MainLoop() = 0; + virtual int MainLoop(); // exit the main loop thus terminating the application virtual void Exit(); // exit the main GUI loop during the next iteration (i.e. it does not // stop the program immediately!) - virtual void ExitMainLoop() = 0; - - // returns TRUE if the program is initialized - virtual bool Initialized() = 0; + virtual void ExitMainLoop(); // returns TRUE if there are unprocessed events in the event queue - virtual bool Pending() = 0; + virtual bool Pending(); // process the first event in the event queue (blocks until an event - // apperas if there are none currently) - virtual void Dispatch() = 0; + // appears if there are none currently, use Pending() if this is not + // wanted), returns false if the event loop should stop and true + // otherwise + virtual bool Dispatch(); // process all currently pending events right now // @@ -396,7 +405,7 @@ public: // parties // // it should return TRUE if more idle events are needed, FALSE if not - virtual bool ProcessIdle() ; + virtual bool ProcessIdle(); // Send idle event to window and all subwindows // Returns TRUE if more idle time is requested. @@ -444,11 +453,11 @@ public: // Get display mode that is used use. This is only used in framebuffer // wxWin ports (such as wxMGL). - virtual wxDisplayModeInfo GetDisplayMode() const { return wxDisplayModeInfo(); } + virtual wxVideoMode GetDisplayMode() const { return wxVideoMode(); } // Set display mode to use. This is only used in framebuffer wxWin // ports (such as wxMGL). This method should be called from // wxApp::OnInitGui - virtual bool SetDisplayMode(const wxDisplayModeInfo& WXUNUSED(info)) { return TRUE; } + virtual bool SetDisplayMode(const wxVideoMode& WXUNUSED(info)) { return TRUE; } // set use of best visual flag (see below) void SetUseBestVisual( bool flag ) { m_useBestVisual = flag; } @@ -465,9 +474,10 @@ public: // command line parsing (GUI-specific) // ------------------------------------------------------------------------ +#if wxUSE_CMDLINE_PARSER virtual bool OnCmdLineParsed(wxCmdLineParser& parser); virtual void OnInitCmdLine(wxCmdLineParser& parser); - +#endif // miscellaneous other stuff // ------------------------------------------------------------------------ @@ -477,6 +487,11 @@ public: // deactivated virtual void SetActive(bool isActive, wxWindow *lastFocus); + // OBSOLETE: don't use, always returns true + // + // returns true if the program is successfully initialized + bool Initialized() { return true; } + protected: // delete all objects in wxPendingDelete list @@ -486,6 +501,12 @@ protected: virtual wxAppTraits *CreateTraits(); +#if wxUSE_EVTLOOP_IN_APP + // the main event loop of the application (may be NULL if the loop hasn't + // been started yet or has already terminated) + wxEventLoop *m_mainLoop; +#endif // wxUSE_EVTLOOP_IN_APP + // the main top level window (may be NULL) wxWindow *m_topWindow; @@ -590,18 +611,27 @@ public: // be in your main program (e.g. hello.cpp). Now IMPLEMENT_APP should add this // code if required. +#define IMPLEMENT_WXWIN_MAIN_CONSOLE \ + int main(int argc, char **argv) { return wxEntry(argc, argv); } + #if !wxUSE_GUI || !defined(__WXMSW__) #define IMPLEMENT_WXWIN_MAIN \ - int main(int argc, char **argv) { return wxEntry(argc, argv); } + IMPLEMENT_WXWIN_MAIN_CONSOLE #elif defined(__WXMSW__) // we need HINSTANCE declaration to define WinMain() #include "wx/msw/wrapwin.h" + #ifdef SW_SHOWNORMAL + #define wxSW_SHOWNORMAL SW_SHOWNORMAL + #else + #define wxSW_SHOWNORMAL 0 + #endif + #define IMPLEMENT_WXWIN_MAIN \ extern int wxEntry(HINSTANCE hInstance, \ HINSTANCE hPrevInstance = NULL, \ char *pCmdLine = NULL, \ - int nCmdShow = SW_NORMAL); \ + int nCmdShow = wxSW_SHOWNORMAL); \ extern "C" int WINAPI WinMain(HINSTANCE hInstance, \ HINSTANCE hPrevInstance, \ char *lpCmdLine, \ @@ -648,6 +678,11 @@ public: IMPLEMENT_APP_NO_THEMES(appname) \ IMPLEMENT_WX_THEME_SUPPORT +// Same as IMPLEMENT_APP(), but for console applications. +#define IMPLEMENT_APP_CONSOLE(appname) \ + IMPLEMENT_APP_NO_MAIN(appname) \ + IMPLEMENT_WXWIN_MAIN_CONSOLE + // this macro can be used multiple times and just allows you to use wxGetApp() // function #define DECLARE_APP(appname) extern appname& wxGetApp();