X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bdcade0a101893a5030ac2e91dabc79e1388b0a3..a4f6fe43c33bd7933645d110ad2719871dab043d:/include/wx/motif/app.h?ds=sidebyside diff --git a/include/wx/motif/app.h b/include/wx/motif/app.h index 65dbc0c1b8..f021442498 100644 --- a/include/wx/motif/app.h +++ b/include/wx/motif/app.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: app.h +// Name: wx/motif/app.h // Purpose: wxApp class // Author: Julian Smart // Modified by: @@ -12,10 +12,6 @@ #ifndef _WX_APP_H_ #define _WX_APP_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "app.h" -#endif - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- @@ -27,14 +23,14 @@ // forward declarations // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxFrame; -class WXDLLEXPORT wxWindow; -class WXDLLEXPORT wxApp; -class WXDLLEXPORT wxKeyEvent; -class WXDLLEXPORT wxLog; -class WXDLLEXPORT wxEventLoop; -class WXDLLEXPORT wxXVisualInfo; -class WXDLLEXPORT wxPerDisplayData; +class WXDLLIMPEXP_FWD_CORE wxFrame; +class WXDLLIMPEXP_FWD_CORE wxWindow; +class WXDLLIMPEXP_FWD_CORE wxApp; +class WXDLLIMPEXP_FWD_CORE wxKeyEvent; +class WXDLLIMPEXP_FWD_BASE wxLog; +class WXDLLIMPEXP_FWD_CORE wxEventLoop; +class WXDLLIMPEXP_FWD_CORE wxXVisualInfo; +class WXDLLIMPEXP_FWD_CORE wxPerDisplayData; // ---------------------------------------------------------------------------- // the wxApp class for Motif - see wxAppBase for more details @@ -42,44 +38,44 @@ class WXDLLEXPORT wxPerDisplayData; WX_DECLARE_VOIDPTR_HASH_MAP( wxPerDisplayData*, wxPerDisplayDataMap ); -class WXDLLEXPORT wxApp : public wxAppBase +class WXDLLIMPEXP_CORE wxApp : public wxAppBase { DECLARE_DYNAMIC_CLASS(wxApp) - + public: wxApp(); virtual ~wxApp(); - + // override base class (pure) virtuals // ----------------------------------- - + virtual int MainLoop(); virtual void Exit(); - virtual bool Yield(bool onlyIfNeeded = FALSE); virtual void WakeUpIdle(); // implemented in motif/evtloop.cpp - - virtual bool OnInitGui(); - + // implementation from now on // -------------------------- - + protected: bool m_showOnInit; - + public: // Implementation virtual bool Initialize(int& argc, wxChar **argv); virtual void CleanUp(); - + // Motif-specific WXAppContext GetAppContext() const { return m_appContext; } WXWidget GetTopLevelWidget(); + WXWidget GetTopLevelRealizedWidget(); WXColormap GetMainColormap(WXDisplay* display); WXDisplay* GetInitialDisplay() const { return m_initialDisplay; } void SetTopLevelWidget(WXDisplay* display, WXWidget widget); + void SetTopLevelRealizedWidget(WXDisplay* display, + WXWidget widget); // This handler is called when a property change event occurs virtual void HandlePropertyChange(WXEvent *event); @@ -92,10 +88,7 @@ private: WXColormap m_mainColormap; WXDisplay* m_initialDisplay; wxPerDisplayDataMap* m_perDisplayData; - - DECLARE_EVENT_TABLE() }; #endif // _WX_APP_H_ -