X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/55176f44e2a86c3e894c7e17b1becdcfcacad054..9fe4c99cc5e3cb63ae2fecfdb9e892781732cad6:/include/wx/app.h diff --git a/include/wx/app.h b/include/wx/app.h index fde92485c3..9c76ed5d7e 100644 --- a/include/wx/app.h +++ b/include/wx/app.h @@ -66,16 +66,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 @@ -88,6 +88,7 @@ class WXDLLEXPORT wxAppBase : public wxEvtHandler { public: wxAppBase(); + virtual ~wxAppBase(); // the virtual functions which may/must be overridden in the derived class // ----------------------------------------------------------------------- @@ -326,11 +327,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();