Added support for building wxCocoa

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

diff --git a/include/wx/motif/app.h b/include/wx/motif/app.h
index 7787929380e2ab97cdf36484a48e1818b5a7cf1a..b8e43947c4cf631ce095ea077b88c3f87c93586c 100644 (file)
--- a/include/wx/motif/app.h
+++ b/include/wx/motif/app.h
@@ -13,14 +13,13 @@
 #define _WX_APP_H_
 
 #ifdef __GNUG__
 #define _WX_APP_H_
 
 #ifdef __GNUG__

-    #pragma interface "app.h"
+#pragma interface "app.h"

 #endif
 
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 
 #endif
 
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 

-#include "wx/gdicmn.h"

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


@@ -29,9 +28,10 @@
 
 class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxWindow;
 
 class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxWindow;

-class WXDLLEXPORT wxApp ;
+class WXDLLEXPORT wxApp;

 class WXDLLEXPORT wxKeyEvent;
 class WXDLLEXPORT wxLog;
 class WXDLLEXPORT wxKeyEvent;
 class WXDLLEXPORT wxLog;

+class WXDLLEXPORT wxEventLoop;

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


@@ -39,92 +39,76 @@ class WXDLLEXPORT wxLog;
 
 class WXDLLEXPORT wxApp : public wxAppBase
 {
 
 class WXDLLEXPORT wxApp : public wxAppBase
 {

-DECLARE_DYNAMIC_CLASS(wxApp)
-
+    DECLARE_DYNAMIC_CLASS(wxApp)
+        

 public:
     wxApp();
 public:
     wxApp();

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

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

-
+    

     virtual int MainLoop();
     virtual void ExitMainLoop();
     virtual bool Initialized();
     virtual int MainLoop();
     virtual void ExitMainLoop();
     virtual bool Initialized();

-    virtual bool Pending() ;
-    virtual void Dispatch() ;
-
+    virtual bool Pending();
+    virtual void Dispatch();
+    virtual bool Yield(bool onlyIfNeeded = FALSE);
+    virtual bool ProcessIdle();
+    

     virtual bool OnInitGui();
     virtual bool OnInitGui();

-
-    virtual wxIcon GetStdIcon(int which) const;
-
+    

     // implementation from now on
     // --------------------------
     // implementation from now on
     // --------------------------

-
+    

     void OnIdle(wxIdleEvent& event);
     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 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);
     // 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);
-
+    

 protected:
     bool                  m_showOnInit;
 protected:
     bool                  m_showOnInit;

-
+    

 public:
     // Implementation
     static bool Initialize();
     static void CleanUp();
 public:
     // Implementation
     static bool Initialize();
     static void CleanUp();

-
+    

     void DeletePendingObjects();
     void DeletePendingObjects();

-    bool ProcessIdle();
-#if wxUSE_THREADS
-    void ProcessPendingEvents();
-#endif
-
+    

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

-    WXColormap     GetMainColormap(WXDisplay* display) ;
+    WXColormap     GetMainColormap(WXDisplay* display);

     WXDisplay*     GetInitialDisplay() const { return m_initialDisplay; }
     long           GetMaxRequestSize() const { return m_maxRequestSize; }
     WXDisplay*     GetInitialDisplay() const { return m_initialDisplay; }
     long           GetMaxRequestSize() const { return m_maxRequestSize; }

-
+    

     // 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:
+    
+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;
     WXWidget              m_topLevelWidget;
     WXColormap            m_mainColormap;
     WXDisplay*            m_initialDisplay;
     long                  m_maxRequestSize;
     // Motif-specific
     WXAppContext          m_appContext;
     WXWidget              m_topLevelWidget;
     WXColormap            m_mainColormap;
     WXDisplay*            m_initialDisplay;
     long                  m_maxRequestSize;

-
+    

     DECLARE_EVENT_TABLE()
 };
 
 int WXDLLEXPORT wxEntry( int argc, char *argv[] );
 
 #endif
     DECLARE_EVENT_TABLE()
 };
 
 int WXDLLEXPORT wxEntry( int argc, char *argv[] );
 
 #endif

-    // _WX_APP_H_
+// _WX_APP_H_