added missing #include <wx/defs.h> (parts of patch 649438)

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

diff --git a/include/wx/motif/app.h b/include/wx/motif/app.h
index d3bc19d40b8441bc48959658c1024291854fdb3f..79674e4f89527f16f0dc6a0a87a45bd9b5a4c21e 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 wxPerDisplayDataMap;

 
 // ----------------------------------------------------------------------------
 // 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
     // -----------------------------------


@@ -53,79 +55,52 @@ public:
     virtual bool Initialized();
     virtual bool Pending();
     virtual void Dispatch();
     virtual bool Initialized();
     virtual bool Pending();
     virtual void Dispatch();

+
+    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();
     
     
     virtual bool OnInitGui();
     

-    virtual wxIcon GetStdIcon(int which) const;
-    

     // implementation from now on
     // --------------------------
     
     void OnIdle(wxIdleEvent& event);
     
     // 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);
-    
-    // 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;
     
 public:
     // Implementation
 protected:
     bool                  m_showOnInit;
     
 public:
     // Implementation

-    static bool Initialize();
-    static void CleanUp();
-    
-    void DeletePendingObjects();
-    bool ProcessIdle();
+    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual void CleanUp();

     
     // Motif-specific
     WXAppContext   GetAppContext() const { return m_appContext; }
     
     // Motif-specific
     WXAppContext   GetAppContext() const { return m_appContext; }

-    WXWidget       GetTopLevelWidget() const { return m_topLevelWidget; }
+    WXWidget       GetTopLevelWidget();

     WXColormap     GetMainColormap(WXDisplay* display);
     WXDisplay*     GetInitialDisplay() const { return m_initialDisplay; }
     WXColormap     GetMainColormap(WXDisplay* display);
     WXDisplay*     GetInitialDisplay() const { return m_initialDisplay; }

-    long           GetMaxRequestSize() const { return m_maxRequestSize; }
-    
+
+    void           SetTopLevelWidget(WXDisplay* display, WXWidget widget);
+

     // 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:
-    static long    sm_lastMessageTime;
-    int            m_nCmdShow;
-    
-protected:
-    bool                  m_keepGoing;
+
+    wxXVisualInfo* GetVisualInfo(WXDisplay* display);
+
+private:
+    wxEventLoop*    m_eventLoop;

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

-    WXWidget              m_topLevelWidget;

     WXColormap            m_mainColormap;
     WXDisplay*            m_initialDisplay;
     WXColormap            m_mainColormap;
     WXDisplay*            m_initialDisplay;

-    long                  m_maxRequestSize;
-    
+    wxPerDisplayDataMap*  m_perDisplayData;
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

-int WXDLLEXPORT wxEntry( int argc, char *argv[] );
-

 #endif
 // _WX_APP_H_
 
 #endif
 // _WX_APP_H_