added more HP-UX charset names

[wxWidgets.git] / include / wx / motif / app.h

diff --git a/include/wx/motif/app.h b/include/wx/motif/app.h
index c33deb99dfa10514ca11575f01071c32719885f1..41b0532808058927b873d564a61d28bdd56b8a30 100644 (file)
--- a/include/wx/motif/app.h
+++ b/include/wx/motif/app.h
@@ -12,15 +12,12 @@
 #ifndef _WX_APP_H_
 #define _WX_APP_H_
 
-#ifdef __GNUG__
-#pragma interface "app.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 
 #include "wx/event.h"
+#include "wx/hashmap.h"
 
 // ----------------------------------------------------------------------------
 // forward declarations
@@ -33,12 +30,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 +53,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 +72,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 +86,6 @@ public:
     wxXVisualInfo* GetVisualInfo(WXDisplay* display);
 
 private:
-    wxEventLoop*    m_eventLoop;
-    
     // Motif-specific
     WXAppContext          m_appContext;
     WXColormap            m_mainColormap;