Lots of wxMotif fixes

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

diff --git a/include/wx/gtk1/app.h b/include/wx/gtk1/app.h
index 11af9c490344bfce010ff60bfec03aed79b9249c..c69720797268ed6985dc59839469ed63a94fcde9 100644 (file)
--- a/include/wx/gtk1/app.h
+++ b/include/wx/gtk1/app.h
@@ -2,10 +2,9 @@
 // Name:        app.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        app.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling, Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKAPPH__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __GTKAPPH__


@@ -15,6 +14,7 @@
 #pragma interface
 #endif
 
 #pragma interface
 #endif
 

+#include "wx/defs.h"

 #include "wx/window.h"
 #include "wx/frame.h"
 
 #include "wx/window.h"
 #include "wx/frame.h"
 


@@ -54,18 +54,18 @@ class wxApp: public wxEvtHandler
   DECLARE_DYNAMIC_CLASS(wxApp)
 
   public:
   DECLARE_DYNAMIC_CLASS(wxApp)
 
   public:

-  
+

     wxApp(void);
     ~wxApp(void);
     wxApp(void);
     ~wxApp(void);

-    
+

     static void SetInitializerFunction(wxAppInitializerFunction fn) { m_appInitFn = fn; }
     static wxAppInitializerFunction GetInitializerFunction(void) { return m_appInitFn; }
     static void SetInitializerFunction(wxAppInitializerFunction fn) { m_appInitFn = fn; }
     static wxAppInitializerFunction GetInitializerFunction(void) { return m_appInitFn; }

+

     virtual bool OnInit(void);
     virtual bool OnInitGui(void);
     virtual int OnRun(void);
     virtual bool OnInit(void);
     virtual bool OnInitGui(void);
     virtual int OnRun(void);

-    virtual bool OnIdle(void);

     virtual int OnExit(void);
     virtual int OnExit(void);

-    
+

     wxWindow *GetTopWindow(void);
     void SetTopWindow( wxWindow *win );
     virtual int MainLoop(void);
     wxWindow *GetTopWindow(void);
     void SetTopWindow( wxWindow *win );
     virtual int MainLoop(void);


@@ -73,8 +73,14 @@ class wxApp: public wxEvtHandler
     bool Initialized(void);
     virtual bool Pending(void);
     virtual void Dispatch(void);
     bool Initialized(void);
     virtual bool Pending(void);
     virtual void Dispatch(void);

-    void DeletePendingObjects(void);
-    
+
+    inline void SetWantDebugOutput(bool flag) { m_wantDebugOutput = flag; }
+    inline bool GetWantDebugOutput(void) { return m_wantDebugOutput; }
+
+    void OnIdle( wxIdleEvent &event );
+    bool SendIdleEvents(void);
+    bool SendIdleEvents( wxWindow* win );
+

     inline wxString GetAppName(void) const {
       if (m_appName != "")
         return m_appName;
     inline wxString GetAppName(void) const {
       if (m_appName != "")
         return m_appName;


@@ -83,31 +89,45 @@ class wxApp: public wxEvtHandler
     inline void SetAppName(const wxString& name) { m_appName = name; };
     inline wxString GetClassName(void) const { return m_className; }
     inline void SetClassName(const wxString& name) { m_className = name; }
     inline void SetAppName(const wxString& name) { m_appName = name; };
     inline wxString GetClassName(void) const { return m_className; }
     inline void SetClassName(const wxString& name) { m_className = name; }

+    const wxString& GetVendorName() const { return m_vendorName; }
+    void SetVendorName(const wxString& name) { m_vendorName = name; }

 
     inline void SetExitOnFrameDelete(bool flag) { m_exitOnFrameDelete = flag; }
     inline bool GetExitOnFrameDelete(void) const { return m_exitOnFrameDelete; }
 
     inline void SetExitOnFrameDelete(bool flag) { m_exitOnFrameDelete = flag; }
     inline bool GetExitOnFrameDelete(void) const { return m_exitOnFrameDelete; }

-  
-    void SetPrintMode(int WXUNUSED(mode) ) {}; 
+
+    void SetPrintMode(int WXUNUSED(mode) ) {};

     int GetPrintMode(void) const { return wxPRINT_POSTSCRIPT; };
     int GetPrintMode(void) const { return wxPRINT_POSTSCRIPT; };

-  
-    static void CommonInit(void);
-    static void CommonCleanUp(void);    
-    
+

     // override this function to create default log target of arbitrary
     // user-defined classv (default implementation creates a wxLogGui object)
     virtual wxLog *CreateLogTarget();
     // override this function to create default log target of arbitrary
     // user-defined classv (default implementation creates a wxLogGui object)
     virtual wxLog *CreateLogTarget();

-    
+
+  // GTK implementation
+
+    static void CommonInit(void);
+    static void CommonCleanUp(void);
+
+    bool ProcessIdle(void);
+    void DeletePendingObjects(void);
+

     bool          m_initialized;
     bool          m_exitOnFrameDelete;
     bool          m_initialized;
     bool          m_exitOnFrameDelete;

-    gint          m_idleTag;
+    bool          m_wantDebugOutput;

     wxWindow     *m_topWindow;
     wxWindow     *m_topWindow;

-    wxString      m_appName;
-    wxString      m_className;

     
     

+    gint          m_idleTag;
+

     int         argc;
     char      **argv;
     int         argc;
     char      **argv;

-    
+

     static wxAppInitializerFunction m_appInitFn;
     static wxAppInitializerFunction m_appInitFn;

+    
+private:
+  wxString m_vendorName,
+           m_appName,
+           m_className;
+
+  DECLARE_EVENT_TABLE()

 };
 
 #endif // __GTKAPPH__
 };
 
 #endif // __GTKAPPH__