minor fix to wxFileName::MakeRelativeTo(), removed broken and misleading IsWild(...

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

diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h
index a0e96cdc1077dc7778ed29c12e9cb3f0125fb524..a3b842add32c6674f8b4992a2ce06393de683261 100644 (file)
--- a/include/wx/gtk/toplevel.h
+++ b/include/wx/gtk/toplevel.h
@@ -54,6 +54,7 @@ public:
     virtual void Iconize(bool iconize = TRUE);
     virtual bool IsIconized() const;
     virtual void SetIcon(const wxIcon& icon);
+    virtual void SetIcons(const wxIconBundle& icons);
     virtual void Restore();
 
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
@@ -71,6 +72,9 @@ public:
     // from both DoSetSize() and DoSetClientSize()
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
+    // set the icon for this window
+    void DoSetIcon( const wxIcon& icon );
+
     // GTK callbacks
     virtual void GtkOnSize( int x, int y, int width, int height );
     virtual void OnInternalIdle();
@@ -85,7 +89,7 @@ public:
     bool          m_insertInClientArea;  /* not from within OnCreateXXX */
 
     bool          m_fsIsShowing;         /* full screen */
-    long          m_fsSaveStyle;
+    long          m_fsSaveGdkFunc, m_fsSaveGdkDecor;
     long          m_fsSaveFlag;
     wxRect        m_fsSaveFrame;