X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eb6fa4b4257897e4e9655b05e4105e8b47f67476..9f8845289521c7f53e95b6dfd8275daab8b05639:/include/wx/motif/app.h?ds=sidebyside diff --git a/include/wx/motif/app.h b/include/wx/motif/app.h index 95c087af98..1007941b48 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) @@ -51,45 +54,35 @@ public: // ----------------------------------- 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 bool ProcessIdle(); + virtual void WakeUpIdle(); // implemented in motif/evtloop.cpp virtual bool OnInitGui(); // implementation from now on // -------------------------- - void OnIdle(wxIdleEvent& event); - - // Send idle event to all top-level windows. - // Returns TRUE if more idle time is requested. - bool SendIdleEvents(); - - // Send idle event to window and all subwindows - // Returns TRUE if more idle time is requested. - bool SendIdleEvents(wxWindow* win); - protected: bool m_showOnInit; public: // Implementation - static bool Initialize(); - static void CleanUp(); - - void DeletePendingObjects(); + 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); @@ -97,8 +90,6 @@ public: wxXVisualInfo* GetVisualInfo(WXDisplay* display); private: - wxEventLoop* m_eventLoop; - // Motif-specific WXAppContext m_appContext; WXColormap m_mainColormap; @@ -108,8 +99,6 @@ private: DECLARE_EVENT_TABLE() }; -int WXDLLEXPORT wxEntry( int argc, char *argv[] ); - #endif // _WX_APP_H_