X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd435a79ed2c79e20621fbe6b1013a86a9e05fed..707c4418929f09dfd8f5fb0f0d5aec3bb0775bd8:/include/wx/motif/app.h diff --git a/include/wx/motif/app.h b/include/wx/motif/app.h index c33deb99df..c5a30c70fe 100644 --- a/include/wx/motif/app.h +++ b/include/wx/motif/app.h @@ -12,7 +12,7 @@ #ifndef _WX_APP_H_ #define _WX_APP_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "app.h" #endif @@ -21,6 +21,7 @@ // ---------------------------------------------------------------------------- #include "wx/event.h" +#include "wx/hashmap.h" // ---------------------------------------------------------------------------- // forward declarations @@ -33,12 +34,14 @@ class WXDLLEXPORT wxKeyEvent; class WXDLLEXPORT wxLog; class WXDLLEXPORT wxEventLoop; class WXDLLEXPORT wxXVisualInfo; -class wxPerDisplayDataMap; +class WXDLLEXPORT wxPerDisplayData; // ---------------------------------------------------------------------------- // the wxApp class for Motif - see wxAppBase for more details // ---------------------------------------------------------------------------- +WX_DECLARE_VOIDPTR_HASH_MAP( wxPerDisplayData*, wxPerDisplayDataMap ); + class WXDLLEXPORT wxApp : public wxAppBase { DECLARE_DYNAMIC_CLASS(wxApp) @@ -54,7 +57,7 @@ public: virtual void Exit(); - virtual bool Yield(bool onlyIfNeeded = FALSE); + virtual bool Yield(bool onlyIfNeeded = false); virtual void WakeUpIdle(); // implemented in motif/evtloop.cpp virtual bool OnInitGui(); @@ -73,10 +76,13 @@ public: // 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); @@ -84,8 +90,6 @@ public: wxXVisualInfo* GetVisualInfo(WXDisplay* display); private: - wxEventLoop* m_eventLoop; - // Motif-specific WXAppContext m_appContext; WXColormap m_mainColormap;