compilation fix for builds when WXWIN_COMPATIBILITY_2 is not defined

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

diff --git a/include/wx/motif/app.h b/include/wx/motif/app.h
index 1c7035aa08f99d1ceba0fae1f112d0b065abe2da..f262298f2f0f6f58c299a2f86919b1bafae5a877 100644 (file)
--- a/include/wx/motif/app.h
+++ b/include/wx/motif/app.h
@@ -13,150 +13,114 @@
 #define _WX_APP_H_
 
 #ifdef __GNUG__
 #define _WX_APP_H_
 
 #ifdef __GNUG__

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

 #endif
 
 #endif
 

-#include "wx/defs.h"
-#include "wx/object.h"
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

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

+// ----------------------------------------------------------------------------
+// forward declarations
+// ----------------------------------------------------------------------------
+

 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;
 

-#define wxPRINT_WINDOWS         1
-#define wxPRINT_POSTSCRIPT      2
-
-WXDLLEXPORT_DATA(extern wxApp*) wxTheApp;
+// ----------------------------------------------------------------------------
+// the wxApp class for Motif - see wxAppBase for more details
+// ----------------------------------------------------------------------------

 
 

-// Force an exit from main loop
-void WXDLLEXPORT wxExit();
-
-// Yield to other apps/messages
-bool WXDLLEXPORT wxYield();
-
-// 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; }
+DECLARE_DYNAMIC_CLASS(wxApp)

 
 

-  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();
+public:
+    wxApp();
+    ~wxApp() {}

 
 

-  // Called to set off the main loop
-  virtual int OnRun() { return MainLoop(); };
-  virtual int OnExit() { return 0; }
+    // override base class (pure) virtuals
+    // -----------------------------------

 
 

-  inline void SetPrintMode(int mode) { m_printMode = mode; }
-  inline int GetPrintMode() const { return m_printMode; }
+    virtual int MainLoop();
+    virtual void ExitMainLoop();
+    virtual bool Initialized();
+    virtual bool Pending();
+    virtual void Dispatch();

 
 

-  inline void SetExitOnFrameDelete(bool flag) { m_exitOnFrameDelete = flag; }
-  inline bool GetExitOnFrameDelete() const { return m_exitOnFrameDelete; }
+    virtual bool OnInitGui();

 
 

-  inline wxString GetAppName() const {
-      if (m_appName != "")
-        return m_appName;
-      else return m_className;
-    }
+    virtual wxIcon GetStdIcon(int which) const;

 
 

-  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; }
+    // implementation from now on
+    // --------------------------

 
 

-  void SetVendorName(const wxString& vendorName) { m_vendorName = vendorName; }
-  const wxString& GetVendorName() const { return m_vendorName; }
+    void OnIdle(wxIdleEvent& event);

 
 

-  wxWindow *GetTopWindow() const ;
-  inline void SetTopWindow(wxWindow *win) { m_topWindow = win; }
+    // Send idle event to all top-level windows.
+    // Returns TRUE if more idle time is requested.
+    bool SendIdleEvents();

 
 

-  inline void SetWantDebugOutput(bool flag) { m_wantDebugOutput = flag; }
-  inline bool GetWantDebugOutput() { return m_wantDebugOutput; }
+    // Send idle event to window and all subwindows
+    // Returns TRUE if more idle time is requested.
+    bool SendIdleEvents(wxWindow* win);

 
 

-  // Send idle event to all top-level windows.
-  // Returns TRUE if more idle time is requested.
-  bool SendIdleEvents();
+    // Motif implementation.

 
 

-  // Send idle event to window and all subwindows
-  // Returns TRUE if more idle time is requested.
-  bool SendIdleEvents(wxWindow* win);
+    // Processes an X event.
+    virtual void ProcessXEvent(WXEvent* event);

 
 

-  // Windows only, but for compatibility...
-  inline void SetAuto3D(bool flag) { m_auto3D = flag; }
-  inline bool GetAuto3D() const { return m_auto3D; }
+    // Returns TRUE if an accelerator has been processed
+    virtual bool CheckForAccelerator(WXEvent* event);

 
 

-  // Creates a log object
-  virtual wxLog* CreateLogTarget();
+    // Returns TRUE if a key down event has been processed
+    virtual bool CheckForKeyDown(WXEvent* event);

 
 

-public:
-  // Will always be set to the appropriate, main-style values.
-  int                   argc;
-  char **               argv;
+    // Returns TRUE if a key up event has been processed
+    virtual bool CheckForKeyUp(WXEvent* event);

 
 protected:
 
 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;
+    bool                  m_showOnInit;

 
 public:
 
 public:

+    // Implementation
+    static bool Initialize();
+    static void CleanUp();

 
 

-  // Implementation
-  static bool Initialize();
-  static void CleanUp();
-
-  void DeletePendingObjects();
-  bool ProcessIdle();
+    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; }
+    // Motif-specific
+    WXAppContext   GetAppContext() const { return m_appContext; }
+    WXWidget       GetTopLevelWidget() const { return m_topLevelWidget; }
+    WXColormap     GetMainColormap(WXDisplay* display);
+    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:
 
 public:

-  static long           sm_lastMessageTime;
-  int                   m_nCmdShow;
+    static long    sm_lastMessageTime;
+    int            m_nCmdShow;

 
 protected:
 
 protected:

-  bool                  m_keepGoing ;
+    bool                  m_keepGoing;

 
 

-// Motif-specific
-  WXAppContext          m_appContext;
-  WXWidget              m_topLevelWidget;
-  WXColormap            m_mainColormap;
-  long                  m_maxRequestSize;
+    // Motif-specific
+    WXAppContext          m_appContext;
+    WXWidget              m_topLevelWidget;
+    WXColormap            m_mainColormap;
+    WXDisplay*            m_initialDisplay;
+    long                  m_maxRequestSize;

 
 

-DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()

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