X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/55176f44e2a86c3e894c7e17b1becdcfcacad054..f41bc3e3f3fda37fba548440b230288c5eed0953:/include/wx/app.h diff --git a/include/wx/app.h b/include/wx/app.h index fde92485c3..8324651d60 100644 --- a/include/wx/app.h +++ b/include/wx/app.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: app.h +// Name: wx/app.h // Purpose: wxAppBase class and macros used for declaration of wxApp // derived class in the user code // Author: Julian Smart @@ -47,6 +47,12 @@ class WXDLLEXPORT wxCmdLineParser; #include "wx/log.h" #endif +#if WXWIN_COMPATIBILITY_2_2 + #include "wx/icon.h" +#endif + +#include "wx/build.h" + // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- @@ -66,16 +72,16 @@ class WXDLLEXPORT wxDisplayModeInfo { public: wxDisplayModeInfo() : m_ok(FALSE) {} - wxDisplayModeInfo(const wxSize& size, unsigned depth) - : m_size(size), m_depth(depth), m_ok(TRUE) {} + wxDisplayModeInfo(unsigned width, unsigned height, unsigned depth) + : m_width(width), m_height(height), m_depth(depth), m_ok(TRUE) {} - const wxSize& GetScreenSize() const { return m_size; } + 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: - wxSize m_size; - unsigned m_depth; + unsigned m_width, m_height, m_depth; bool m_ok; }; #endif @@ -86,8 +92,11 @@ private: class WXDLLEXPORT wxAppBase : public wxEvtHandler { + DECLARE_NO_COPY_CLASS(wxAppBase) + public: wxAppBase(); + virtual ~wxAppBase(); // the virtual functions which may/must be overridden in the derived class // ----------------------------------------------------------------------- @@ -99,6 +108,10 @@ public: // Override: always in GUI application, rarely in console ones. virtual bool OnInit(); + // initializes wxMessageOutput; other responsibilities + // may be added later + virtual void DoInit(); + #if wxUSE_GUI // a platform-dependent version of OnInit(): the code here is likely to // depend on the toolkit. default version does nothing. @@ -138,6 +151,8 @@ public: // Override: rarely. virtual void OnFatalException() { } + virtual bool ProcessIdle() = 0; + // the worker functions - usually not used directly by the user code // ----------------------------------------------------------------- @@ -274,10 +289,13 @@ public: #endif // wxUSE_LOG #if wxUSE_GUI + + #if WXWIN_COMPATIBILITY_2_2 // get the standard icon used by wxWin dialogs - this allows the user // to customize the standard dialogs. The 'which' parameter is one of // wxICON_XXX values - virtual wxIcon GetStdIcon(int which) const = 0; + virtual wxIcon GetStdIcon(int WXUNUSED(which)) const { return wxNullIcon; } + #endif // Get display mode that is used use. This is only used in framebuffer wxWin ports // (such as wxMGL). @@ -286,10 +304,6 @@ public: // (such as wxMGL). This method should be called from wxApp:OnInitGui virtual bool SetDisplayMode(const wxDisplayModeInfo& WXUNUSED(info)) { return TRUE; } - // VZ: what does this do exactly? - void SetWantDebugOutput( bool flag ) { m_wantDebugOutput = flag; } - bool GetWantDebugOutput() const { return m_wantDebugOutput; } - // set use of best visual flag (see below) void SetUseBestVisual( bool flag ) { m_useBestVisual = flag; } bool GetUseBestVisual() const { return m_useBestVisual; } @@ -307,16 +321,48 @@ public: virtual void SetActive(bool isActive, wxWindow *lastFocus); #endif // wxUSE_GUI + // this method allows to filter all the events processed by the program, so + // you should try to return quickly from it to avoid slowing down the + // program to the crawl + // + // return value should be -1 to continue with the normal event processing, + // or TRUE or FALSE to stop further processing and pretend that the event + // had been already processed or won't be processed at all, respectively + virtual int FilterEvent(wxEvent& event); + // debugging support // ----------------- // this function is called when an assert failure occurs, the base class // version does the normal processing (i.e. shows the usual assert failure // dialog box) + // + // the arguments are the place where the assert occured, the text of the + // assert itself and the user-specified message #ifdef __WXDEBUG__ - virtual void OnAssert(const wxChar *file, int line, const wxChar *msg); + virtual void OnAssert(const wxChar *file, + int line, + 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 wxBuildOptions& buildOptions); + + // deprecated functions, please updae your code to not use them! + // ------------------------------------------------------------- + +#if WXWIN_COMPATIBILITY_2_2 + // used by obsolete wxDebugMsg only + void SetWantDebugOutput( bool flag ) { m_wantDebugOutput = flag; } + bool GetWantDebugOutput() const { return m_wantDebugOutput; } + + // TRUE if the application wants to get debug output + bool m_wantDebugOutput; +#endif // WXWIN_COMPATIBILITY_2_2 + // implementation only from now on // ------------------------------- @@ -326,11 +372,6 @@ public: static wxAppInitializerFunction GetInitializerFunction() { return m_appInitFn; } - // needed to avoid link errors -#ifdef __DARWIN__ - virtual ~wxAppBase() { } -#endif - // process all events in the wxPendingEvents list virtual void ProcessPendingEvents(); @@ -347,9 +388,6 @@ protected: m_appName, // app name m_className; // class name - // TRUE if the application wants to get debug output - bool m_wantDebugOutput; - #if wxUSE_GUI // the main top level window - may be NULL wxWindow *m_topWindow; @@ -379,6 +417,8 @@ protected: #include "wx/mgl/app.h" #elif defined(__WXGTK__) #include "wx/gtk/app.h" + #elif defined(__WXX11__) + #include "wx/x11/app.h" #elif defined(__WXMAC__) #include "wx/mac/app.h" #elif defined(__WXPM__) @@ -532,7 +572,11 @@ public: // Use this macro if you want to define your own main() or WinMain() function // and call wxEntry() from there. #define IMPLEMENT_APP_NO_MAIN(appname) \ - wxApp *wxCreateApp() { return new appname; } \ + wxApp *wxCreateApp() \ + { \ + wxApp::CheckBuildOptions(wxBuildOptions()); \ + return new appname; \ + } \ wxAppInitializer wxTheAppInitializer((wxAppInitializerFunction) wxCreateApp); \ appname& wxGetApp() { return *(appname *)wxTheApp; }