X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b6dbb09746f8f5ee0549a2ff39ae0ac4c725898..bd3e8827dd468030e34df0bde66fc6c38c4fa9b4:/include/wx/motif/app.h

diff --git a/include/wx/motif/app.h b/include/wx/motif/app.h
index 1c7035aa08..9a2526a1f1 100644
--- a/include/wx/motif/app.h
+++ b/include/wx/motif/app.h
@@ -16,151 +16,89 @@
 #pragma interface "app.h"
 #endif
 
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/gdicmn.h"
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
 #include "wx/event.h"
 
+// ----------------------------------------------------------------------------
+// forward declarations
+// ----------------------------------------------------------------------------
+
 class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxWindow;
-class WXDLLEXPORT wxApp ;
+class WXDLLEXPORT wxApp;
 class WXDLLEXPORT wxKeyEvent;
 class WXDLLEXPORT wxLog;
+class WXDLLEXPORT wxEventLoop;
+class WXDLLEXPORT wxXVisualInfo;
+class wxPerDisplayDataMap;
 
-#define wxPRINT_WINDOWS         1
-#define wxPRINT_POSTSCRIPT      2
-
-WXDLLEXPORT_DATA(extern wxApp*) wxTheApp;
-
-// Force an exit from main loop
-void WXDLLEXPORT wxExit();
-
-// Yield to other apps/messages
-bool WXDLLEXPORT wxYield();
+// ----------------------------------------------------------------------------
+// the wxApp class for Motif - see wxAppBase for more details
+// ----------------------------------------------------------------------------
 
-// Represents the application. Derive OnInit and declare
-// a new App object to start application
-class WXDLLEXPORT wxApp: public wxEvtHandler
+class WXDLLEXPORT wxApp : public wxAppBase
 {
-  DECLARE_DYNAMIC_CLASS(wxApp)
-  wxApp();
-  inline ~wxApp() {}
-
-  static void SetInitializerFunction(wxAppInitializerFunction fn) { m_appInitFn = fn; }
-  static wxAppInitializerFunction GetInitializerFunction() { return m_appInitFn; }
-
-  virtual int MainLoop();
-  void ExitMainLoop();
-  bool Initialized();
-  virtual bool Pending() ;
-  virtual void Dispatch() ;
-
-  void OnIdle(wxIdleEvent& event);
-
-// Generic
-  virtual bool OnInit() { return FALSE; };
-
-  // Create an application context
-  virtual bool OnInitGui();
-
-  // Called to set off the main loop
-  virtual int OnRun() { return MainLoop(); };
-  virtual int OnExit() { return 0; }
-
-  inline void SetPrintMode(int mode) { m_printMode = mode; }
-  inline int GetPrintMode() const { return m_printMode; }
-
-  inline void SetExitOnFrameDelete(bool flag) { m_exitOnFrameDelete = flag; }
-  inline bool GetExitOnFrameDelete() const { return m_exitOnFrameDelete; }
-
-  inline wxString GetAppName() const {
-      if (m_appName != "")
-        return m_appName;
-      else return m_className;
-    }
-
-  inline void SetAppName(const wxString& name) { m_appName = name; };
-  inline wxString GetClassName() const { return m_className; }
-  inline void SetClassName(const wxString& name) { m_className = name; }
-
-  void SetVendorName(const wxString& vendorName) { m_vendorName = vendorName; }
-  const wxString& GetVendorName() const { return m_vendorName; }
-
-  wxWindow *GetTopWindow() const ;
-  inline void SetTopWindow(wxWindow *win) { m_topWindow = win; }
-
-  inline void SetWantDebugOutput(bool flag) { m_wantDebugOutput = flag; }
-  inline bool GetWantDebugOutput() { return m_wantDebugOutput; }
-
-  // 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);
-
-  // Windows only, but for compatibility...
-  inline void SetAuto3D(bool flag) { m_auto3D = flag; }
-  inline bool GetAuto3D() const { return m_auto3D; }
-
-  // Creates a log object
-  virtual wxLog* CreateLogTarget();
-
+    DECLARE_DYNAMIC_CLASS(wxApp)
+        
 public:
-  // Will always be set to the appropriate, main-style values.
-  int                   argc;
-  char **               argv;
-
+    wxApp();
+    virtual ~wxApp();
+    
+    // override base class (pure) virtuals
+    // -----------------------------------
+    
+    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 void WakeUpIdle(); // implemented in motif/evtloop.cpp
+    
+    virtual bool OnInitGui();
+    
+    // implementation from now on
+    // --------------------------
+    
 protected:
-  bool                  m_wantDebugOutput ;
-  wxString              m_className;
-  wxString              m_appName,
-                        m_vendorName;
-  wxWindow *            m_topWindow;
-  bool                  m_exitOnFrameDelete;
-  bool                  m_showOnInit;
-  int                   m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
-  bool                  m_auto3D ;   // Always use 3D controls, except
-                                 // where overriden
-  static wxAppInitializerFunction	m_appInitFn;
-
-public:
-
-  // Implementation
-  static bool Initialize();
-  static void CleanUp();
-
-  void DeletePendingObjects();
-  bool ProcessIdle();
-
-  // Motif-specific
-  inline WXAppContext   GetAppContext() const { return m_appContext; }
-  inline WXWidget       GetTopLevelWidget() const { return m_topLevelWidget; }
-  WXColormap            GetMainColormap(WXDisplay* display) ;
-  inline long           GetMaxRequestSize() const { return m_maxRequestSize; }
-
-  // This handler is called when a property change event occurs
-  virtual void          HandlePropertyChange(WXEvent *event);
-
+    bool                  m_showOnInit;
+    
 public:
-  static long           sm_lastMessageTime;
-  int                   m_nCmdShow;
-
-protected:
-  bool                  m_keepGoing ;
-
-// Motif-specific
-  WXAppContext          m_appContext;
-  WXWidget              m_topLevelWidget;
-  WXColormap            m_mainColormap;
-  long                  m_maxRequestSize;
-
-DECLARE_EVENT_TABLE()
+    // Implementation
+    virtual bool Initialize(int& argc, wxChar **argv);
+    virtual void CleanUp();
+    
+    // Motif-specific
+    WXAppContext   GetAppContext() const { return m_appContext; }
+    WXWidget       GetTopLevelWidget();
+    WXColormap     GetMainColormap(WXDisplay* display);
+    WXDisplay*     GetInitialDisplay() const { return m_initialDisplay; }
+
+    void           SetTopLevelWidget(WXDisplay* display, WXWidget widget);
+
+    // This handler is called when a property change event occurs
+    virtual void   HandlePropertyChange(WXEvent *event);
+
+    wxXVisualInfo* GetVisualInfo(WXDisplay* display);
+
+private:
+    wxEventLoop*    m_eventLoop;
+    
+    // Motif-specific
+    WXAppContext          m_appContext;
+    WXColormap            m_mainColormap;
+    WXDisplay*            m_initialDisplay;
+    wxPerDisplayDataMap*  m_perDisplayData;
+
+    DECLARE_EVENT_TABLE()
 };
 
-int WXDLLEXPORT wxEntry( int argc, char *argv[] );
-
 #endif
-    // _WX_APP_H_
+// _WX_APP_H_