renamed GlobalHandle class to GlobalPtr to avoid conflict with the Win32 function

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

diff --git a/include/wx/motif/app.h b/include/wx/motif/app.h
index 650736e9c3ce7e6d9664650f441f58aae54b3d6e..a0d914b1dfd22c91932a795895e0409e3848a546 100644 (file)
--- a/include/wx/motif/app.h
+++ b/include/wx/motif/app.h
@@ -20,7 +20,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#include "wx/gdicmn.h"

 #include "wx/event.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/event.h"
 
 // ----------------------------------------------------------------------------


@@ -32,6 +31,9 @@ class WXDLLEXPORT wxWindow;
 class WXDLLEXPORT wxApp;
 class WXDLLEXPORT wxKeyEvent;
 class WXDLLEXPORT wxLog;
 class WXDLLEXPORT wxApp;
 class WXDLLEXPORT wxKeyEvent;
 class WXDLLEXPORT wxLog;

+class WXDLLEXPORT wxEventLoop;
+class WXDLLEXPORT wxXVisualInfo;
+class wxXVisualInfoMap;

 
 // ----------------------------------------------------------------------------
 // the wxApp class for Motif - see wxAppBase for more details
 
 // ----------------------------------------------------------------------------
 // the wxApp class for Motif - see wxAppBase for more details


@@ -43,7 +45,7 @@ class WXDLLEXPORT wxApp : public wxAppBase
         
 public:
     wxApp();
         
 public:
     wxApp();

-    ~wxApp() {}
+    virtual ~wxApp();

     
     // override base class (pure) virtuals
     // -----------------------------------
     
     // override base class (pure) virtuals
     // -----------------------------------


@@ -71,20 +73,6 @@ public:
     // Returns TRUE if more idle time is requested.
     bool SendIdleEvents(wxWindow* win);
     
     // Returns TRUE if more idle time is requested.
     bool SendIdleEvents(wxWindow* win);
     

-    // Motif implementation.
-    
-    // Processes an X event.
-    virtual void ProcessXEvent(WXEvent* event);
-    
-    // Returns TRUE if an accelerator has been processed
-    virtual bool CheckForAccelerator(WXEvent* event);
-    
-    // Returns TRUE if a key down event has been processed
-    virtual bool CheckForKeyDown(WXEvent* event);
-    
-    // Returns TRUE if a key up event has been processed
-    virtual bool CheckForKeyUp(WXEvent* event);
-    

 protected:
     bool                  m_showOnInit;
     
 protected:
     bool                  m_showOnInit;
     


@@ -104,13 +92,14 @@ public:
     
     // This handler is called when a property change event occurs
     virtual void   HandlePropertyChange(WXEvent *event);
     
     // This handler is called when a property change event occurs
     virtual void   HandlePropertyChange(WXEvent *event);

-    
-public:
+
+    wxXVisualInfo* GetVisualInfo(WXDisplay* display);
+
+private:

     static long    sm_lastMessageTime;
     int            m_nCmdShow;
     static long    sm_lastMessageTime;
     int            m_nCmdShow;

-    
-protected:
-    bool                  m_keepGoing;
+
+    wxEventLoop*    m_eventLoop;

     
     // Motif-specific
     WXAppContext          m_appContext;
     
     // Motif-specific
     WXAppContext          m_appContext;


@@ -118,7 +107,8 @@ protected:
     WXColormap            m_mainColormap;
     WXDisplay*            m_initialDisplay;
     long                  m_maxRequestSize;
     WXColormap            m_mainColormap;
     WXDisplay*            m_initialDisplay;
     long                  m_maxRequestSize;

-    
+    wxXVisualInfoMap*     m_visualInfoMap;
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };