X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/955a919785b76a1826e6b8d55f696a0dfb62a318..c5ce3dfb1efd5346682809f3d2702fd9c4edd52d:/include/wx/x11/app.h diff --git a/include/wx/x11/app.h b/include/wx/x11/app.h index d1de31870d..0ad9c3e79e 100644 --- a/include/wx/x11/app.h +++ b/include/wx/x11/app.h @@ -12,10 +12,6 @@ #ifndef _WX_APP_H_ #define _WX_APP_H_ -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface "app.h" -#endif - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- @@ -32,7 +28,6 @@ class WXDLLEXPORT wxWindow; class WXDLLEXPORT wxApp; class WXDLLEXPORT wxKeyEvent; class WXDLLEXPORT wxLog; -class WXDLLEXPORT wxEventLoop; class WXDLLEXPORT wxXVisualInfo; // ---------------------------------------------------------------------------- @@ -42,63 +37,57 @@ class WXDLLEXPORT wxXVisualInfo; class WXDLLEXPORT wxApp : public wxAppBase { DECLARE_DYNAMIC_CLASS(wxApp) - + public: wxApp(); ~wxApp(); - + // override base class (pure) virtuals // ----------------------------------- - - virtual int MainLoop(); - virtual void ExitMainLoop(); - virtual bool Initialized(); - virtual bool Pending(); - virtual void Dispatch(); virtual void Exit(); virtual bool Yield(bool onlyIfNeeded = FALSE); virtual void WakeUpIdle(); - + virtual bool OnInitGui(); - + // implementation from now on // -------------------------- - + // Processes an X event. virtual bool ProcessXEvent(WXEvent* event); - + #ifdef __WXDEBUG__ 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); virtual void CleanUp(); - + WXWindow GetTopLevelWidget() const { return m_topLevelWidget; } WXColormap GetMainColormap(WXDisplay* display); long GetMaxRequestSize() const { return m_maxRequestSize; } - + // This handler is called when a property change event occurs virtual bool HandlePropertyChange(WXEvent *event); - + // Values that can be passed on the command line. // Returns -1, -1 if none specified. const wxSize& GetInitialSize() const { return m_initialSize; } bool GetShowIconic() const { return m_showIconic; } - + #if wxUSE_UNICODE // Global context for Pango layout. Either use X11 // or use Xft rendering according to GDK_USE_XFT // environment variable PangoContext* GetPangoContext(); -#endif +#endif wxXVisualInfo* GetVisualInfo(WXDisplay* display) { @@ -113,21 +102,20 @@ public: public: static long sm_lastMessageTime; - bool m_showIconic; + bool m_showIconic; wxSize m_initialSize; #if !wxUSE_NANOX wxXVisualInfo* m_visualInfo; #endif - + protected: bool m_keepGoing; - + WXWindow m_topLevelWidget; WXColormap m_mainColormap; long m_maxRequestSize; - wxEventLoop* m_mainLoop; - + DECLARE_EVENT_TABLE() };