wxUSE_NEW_GRID is no longer used

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

diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h
index 2681dea2537e0eaf12f54f33bdfa71e27e34d1d9..fc603dafb7d6d2a65f7de1ac40adc3107038480d 100644 (file)
--- a/include/wx/gtk/app.h
+++ b/include/wx/gtk/app.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        app.h
+// Name:        wx/gtk/app.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -10,7 +10,7 @@
 #ifndef __GTKAPPH__
 #define __GTKAPPH__
 
 #ifndef __GTKAPPH__
 #define __GTKAPPH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 


@@ -47,22 +47,18 @@ public:
     virtual bool Pending();
     virtual void Dispatch();
 
     virtual bool Pending();
     virtual void Dispatch();
 

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

 
 

-    // implementation only from now on
-    void OnIdle( wxIdleEvent &event );
-    bool SendIdleEvents();
-    bool SendIdleEvents( wxWindow* win );
+    virtual bool Yield(bool onlyIfNeeded = FALSE);
+    virtual void WakeUpIdle();

 
 

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

 
 

-    bool ProcessIdle();
-    void DeletePendingObjects();
+    static bool InitialzeVisual();

 
 #ifdef __WXDEBUG__
 
 #ifdef __WXDEBUG__

-    virtual void OnAssert(const wxChar *file, int line, const wxChar *msg);
+    virtual void OnAssert(const wxChar *file, int line, const wxChar *cond, const wxChar *msg);

 
     bool IsInAssert() const { return m_isInAssert; }
 #endif // __WXDEBUG__
 
     bool IsInAssert() const { return m_isInAssert; }
 #endif // __WXDEBUG__


@@ -75,10 +71,13 @@ public:
 #endif
     unsigned char  *m_colorCube;
 
 #endif
     unsigned char  *m_colorCube;
 

-    // used by the the wxGLApp and wxGLCanvas class for GL-based X visual 
+    // Used by the the wxGLApp and wxGLCanvas class for GL-based X visual

     // selection; this is actually an XVisualInfo*
     void           *m_glVisualInfo;
     // selection; this is actually an XVisualInfo*
     void           *m_glVisualInfo;

-    
+    // This returns the current visual: either that used by wxRootWindow
+    // or the XVisualInfo* for SGI.
+    GdkVisual      *GetGdkVisual();
+

 private:
     // true if we're inside an assert modal dialog
 #ifdef __WXDEBUG__
 private:
     // true if we're inside an assert modal dialog
 #ifdef __WXDEBUG__


@@ -89,6 +88,4 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

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

 #endif // __GTKAPPH__
 #endif // __GTKAPPH__