X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3c7fc996a73e9f6a83067bc28a3c5581a3fee65..092ee46f03b0af02dd8129e0e3e4619ed33c2032:/include/wx/x11/app.h diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h index 416a3e2ae3..b78e4abae9 100644 --- a/include/wx/x11/app.h +++ b/include/wx/x11/app.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: app.h +// Name: wx/x11/app.h // Purpose: wxApp class // Author: Julian Smart // Modified by: @@ -9,8 +9,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef _WX_APP_H_ -#define _WX_APP_H_ +#ifndef _WX_X11_APP_H_ +#define _WX_X11_APP_H_ // ---------------------------------------------------------------------------- // headers @@ -36,8 +36,6 @@ class WXDLLEXPORT wxXVisualInfo; class WXDLLEXPORT wxApp : public wxAppBase { - DECLARE_DYNAMIC_CLASS(wxApp) - public: wxApp(); virtual ~wxApp(); @@ -62,9 +60,6 @@ public: virtual void OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg); #endif // __WXDEBUG__ -protected: - bool m_showOnInit; - public: // Implementation virtual bool Initialize(int& argc, wxChar **argv); @@ -96,10 +91,6 @@ public: return m_visualInfo; } - // We need this before creating the app - static WXDisplay* GetDisplay() { return ms_display; } - static WXDisplay* ms_display; - public: static long sm_lastMessageTime; bool m_showIconic; @@ -110,14 +101,13 @@ public: #endif protected: - bool m_keepGoing; - WXWindow m_topLevelWidget; WXColormap m_mainColormap; long m_maxRequestSize; + DECLARE_DYNAMIC_CLASS(wxApp) DECLARE_EVENT_TABLE() }; -#endif // _WX_APP_H_ +#endif // _WX_X11_APP_H_