oops, removed duplicate SetIcons[s]() added in last commit

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h
index 08ba0abef2182b3ea5bda3c627ea29db7f48c35f..e261ea8d08ef71477ab16ddb589de7c27e15f6a5 100644 (file)
--- a/include/wx/gtk/mdi.h
+++ b/include/wx/gtk/mdi.h
@@ -152,7 +152,7 @@ public:
                                int WXUNUSED(incH) = -1) {}
 
 #if wxUSE_TOOLBAR
                                int WXUNUSED(incH) = -1) {}
 
 #if wxUSE_TOOLBAR

-    // no toolbar bars
+    // no toolbar

     virtual wxToolBar* CreateToolBar( long WXUNUSED(style),
                                        wxWindowID WXUNUSED(id),
                                        const wxString& WXUNUSED(name) )
     virtual wxToolBar* CreateToolBar( long WXUNUSED(style),
                                        wxWindowID WXUNUSED(id),
                                        const wxString& WXUNUSED(name) )


@@ -161,8 +161,10 @@ public:
 #endif // wxUSE_TOOLBAR
 
     // no icon
 #endif // wxUSE_TOOLBAR
 
     // no icon

-    void SetIcon( const wxIcon &icon ) { m_icons = wxIconBundle( icon ); }
-    void SetIcons( const wxIconBundle &icons ) { m_icons = icons; }
+    virtual void SetIcon(const wxIcon& icon)
+        { wxTopLevelWindowBase::SetIcon(icon); }
+    virtual void SetIcons(const wxIconBundle& icons )
+        { wxTopLevelWindowBase::SetIcons(icons); }

 
     // no title
     void SetTitle( const wxString &title );
 
     // no title
     void SetTitle( const wxString &title );


@@ -173,8 +175,6 @@ public:
     virtual bool IsMaximized() const { return true; }
     virtual void Iconize(bool WXUNUSED(iconize) = true) { }
     virtual bool IsIconized() const { return false; }
     virtual bool IsMaximized() const { return true; }
     virtual void Iconize(bool WXUNUSED(iconize) = true) { }
     virtual bool IsIconized() const { return false; }

-    virtual void SetIcon(const wxIcon& WXUNUSED(icon)) { }
-    virtual void SetIcons(const wxIconBundle& WXUNUSED(icons)) { }

     virtual void Restore() {}
 
     virtual bool IsTopLevel() const { return false; }
     virtual void Restore() {}
 
     virtual bool IsTopLevel() const { return false; }

diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h
index 08ba0abef2182b3ea5bda3c627ea29db7f48c35f..e261ea8d08ef71477ab16ddb589de7c27e15f6a5 100644 (file)
--- a/include/wx/gtk1/mdi.h
+++ b/include/wx/gtk1/mdi.h
@@ -152,7 +152,7 @@ public:
                                int WXUNUSED(incH) = -1) {}
 
 #if wxUSE_TOOLBAR
                                int WXUNUSED(incH) = -1) {}
 
 #if wxUSE_TOOLBAR

-    // no toolbar bars
+    // no toolbar

     virtual wxToolBar* CreateToolBar( long WXUNUSED(style),
                                        wxWindowID WXUNUSED(id),
                                        const wxString& WXUNUSED(name) )
     virtual wxToolBar* CreateToolBar( long WXUNUSED(style),
                                        wxWindowID WXUNUSED(id),
                                        const wxString& WXUNUSED(name) )


@@ -161,8 +161,10 @@ public:
 #endif // wxUSE_TOOLBAR
 
     // no icon
 #endif // wxUSE_TOOLBAR
 
     // no icon

-    void SetIcon( const wxIcon &icon ) { m_icons = wxIconBundle( icon ); }
-    void SetIcons( const wxIconBundle &icons ) { m_icons = icons; }
+    virtual void SetIcon(const wxIcon& icon)
+        { wxTopLevelWindowBase::SetIcon(icon); }
+    virtual void SetIcons(const wxIconBundle& icons )
+        { wxTopLevelWindowBase::SetIcons(icons); }

 
     // no title
     void SetTitle( const wxString &title );
 
     // no title
     void SetTitle( const wxString &title );


@@ -173,8 +175,6 @@ public:
     virtual bool IsMaximized() const { return true; }
     virtual void Iconize(bool WXUNUSED(iconize) = true) { }
     virtual bool IsIconized() const { return false; }
     virtual bool IsMaximized() const { return true; }
     virtual void Iconize(bool WXUNUSED(iconize) = true) { }
     virtual bool IsIconized() const { return false; }

-    virtual void SetIcon(const wxIcon& WXUNUSED(icon)) { }
-    virtual void SetIcons(const wxIconBundle& WXUNUSED(icons)) { }

     virtual void Restore() {}
 
     virtual bool IsTopLevel() const { return false; }
     virtual void Restore() {}
 
     virtual bool IsTopLevel() const { return false; }