made wxTLW::SetIcon() non-virtual, it was already implemented in terms of

SetIcons() in most of the ports, now do it in all of them

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

diff --git a/include/wx/cocoa/toplevel.h b/include/wx/cocoa/toplevel.h
index 5ac33f1a7730171442ad62a5ac2abdc533539ecf..775c8db9c94198296baece96bf8f02a2c18526fd 100644 (file)
--- a/include/wx/cocoa/toplevel.h
+++ b/include/wx/cocoa/toplevel.h
@@ -108,8 +108,7 @@ public:
 
 
 // Things I may/may not do
-//    virtual void SetIcon(const wxIcon& icon);
-//    virtual void SetIcons(const wxIconBundle& icons) { SetIcon( icons.GetIcon( -1 ) ); }
+//    virtual void SetIcons(const wxIconBundle& icons);
 //    virtual void Clear() ;
 //    virtual void Raise();
 //    virtual void Lower();

diff --git a/include/wx/generic/mdig.h b/include/wx/generic/mdig.h
index 4ca3ba2625be5e8dac396087399ad77f53e685c3..bd0f0a39f004d3854e0e999cbdb1264e4e51e607 100644 (file)
--- a/include/wx/generic/mdig.h
+++ b/include/wx/generic/mdig.h
@@ -170,8 +170,7 @@ public:
 #endif
 
     // no icon
-    void SetIcon( const wxIcon& WXUNUSED(icon) ) { }
-    void SetIcons( const wxIconBundle& WXUNUSED(icons) ) { }
+    virtual void SetIcons( const wxIconBundle& WXUNUSED(icons) ) { }
 
     // no maximize etc
     virtual void Maximize( bool WXUNUSED(maximize) = true) { /* Has no effect */ }

diff --git a/include/wx/gtk/mdi.h b/include/wx/gtk/mdi.h
index 051987ad7e81d73e203192783ef879edf6f504b3..5ce91c006ead8aba9612d38f33bf0c0b7bea5620 100644 (file)
--- a/include/wx/gtk/mdi.h
+++ b/include/wx/gtk/mdi.h
@@ -133,8 +133,6 @@ public:
 #endif // wxUSE_TOOLBAR
 
     // no icon
-    virtual void SetIcon(const wxIcon& icon)
-        { wxTopLevelWindowBase::SetIcon(icon); }
     virtual void SetIcons(const wxIconBundle& icons )
         { wxTopLevelWindowBase::SetIcons(icons); }
 

diff --git a/include/wx/gtk/toplevel.h b/include/wx/gtk/toplevel.h
index 7e0a51d9813c219a17b8361f9175309ca875946f..fcc7ff98719a8bb289230ffffa58f9204d0cdc7e 100644 (file)
--- a/include/wx/gtk/toplevel.h
+++ b/include/wx/gtk/toplevel.h
@@ -47,7 +47,6 @@ public:
     virtual bool IsMaximized() const;
     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();
 

diff --git a/include/wx/gtk1/mdi.h b/include/wx/gtk1/mdi.h
index 3ccf1b4d7fa71949c2b0fcac1ab15072c41a8d36..cec5798babcf7b0ef765fe72f13172498b7837f6 100644 (file)
--- a/include/wx/gtk1/mdi.h
+++ b/include/wx/gtk1/mdi.h
@@ -155,8 +155,6 @@ public:
 #endif // wxUSE_TOOLBAR
 
     // no icon
-    virtual void SetIcon(const wxIcon& icon)
-        { wxTopLevelWindowBase::SetIcon(icon); }
     virtual void SetIcons(const wxIconBundle& icons )
         { wxTopLevelWindowBase::SetIcons(icons); }
 

diff --git a/include/wx/gtk1/toplevel.h b/include/wx/gtk1/toplevel.h
index beeb8635f72c0449af9c9d1ad1370f65bc6fe65b..3a3042dc97ddf9d7506b4792c45281a67ba034ce 100644 (file)
--- a/include/wx/gtk1/toplevel.h
+++ b/include/wx/gtk1/toplevel.h
@@ -47,7 +47,6 @@ public:
     virtual bool IsMaximized() const;
     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();
 

diff --git a/include/wx/mac/carbon/toplevel.h b/include/wx/mac/carbon/toplevel.h
index b50b7160b649d7595d57a66c07fb0bbab0a78e66..f66ada90009f60da5282535044ada15d5cb8da55 100644 (file)
--- a/include/wx/mac/carbon/toplevel.h
+++ b/include/wx/mac/carbon/toplevel.h
@@ -60,8 +60,6 @@ public:
     virtual bool IsMaximized() const;
     virtual void Iconize(bool iconize = true);
     virtual bool IsIconized() const;
-    virtual void SetIcon(const wxIcon& icon);
-    virtual void SetIcons(const wxIconBundle& icons) { SetIcon( icons.GetIcon( -1 ) ); }
     virtual void Restore();
 
     virtual bool SetShape(const wxRegion& region);

diff --git a/include/wx/motif/frame.h b/include/wx/motif/frame.h
index a5cf1996377e8b360de9026a3f97f60d87ab2de4..7e52ecd46752aaed4013684d1f79969f6913f32c 100644 (file)
--- a/include/wx/motif/frame.h
+++ b/include/wx/motif/frame.h
@@ -48,7 +48,6 @@ public:
     void SetTitle(const wxString& title);
 
     // Set icon
-    virtual void SetIcon(const wxIcon& icon);
     virtual void SetIcons(const wxIconBundle& icons);
 
 #if wxUSE_STATUSBAR

diff --git a/include/wx/msw/toplevel.h b/include/wx/msw/toplevel.h
index fdca302814771ed213059b165c923b2394a2cbe0..48e7e512e4cda6450a498440d66e350768f5b410 100644 (file)
--- a/include/wx/msw/toplevel.h
+++ b/include/wx/msw/toplevel.h
@@ -52,7 +52,6 @@ public:
     virtual bool IsMaximized() const;
     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();
 

diff --git a/include/wx/os2/toplevel.h b/include/wx/os2/toplevel.h
index a251addfe7ef84c5750f8649e6a7c87e79e7bfa7..e5fa3c0723cee59513f27ad80fe18309fa57c5f4 100644 (file)
--- a/include/wx/os2/toplevel.h
+++ b/include/wx/os2/toplevel.h
@@ -67,7 +67,6 @@ public:
     virtual void Maximize(bool bMaximize = true);
     virtual void Restore(void);
     virtual void SendSizeEvent(void);
-    virtual void SetIcon(const wxIcon& rIcon);
     virtual void SetIcons(const wxIconBundle& rIcons);
 
     virtual bool Show(bool bShow = true);

diff --git a/include/wx/palmos/toplevel.h b/include/wx/palmos/toplevel.h
index 08954715afd4489916335e24b25bc76de519c22d..a931c9e3b9bd9058ad96565fc8a306b232f17bb1 100644 (file)
--- a/include/wx/palmos/toplevel.h
+++ b/include/wx/palmos/toplevel.h
@@ -54,8 +54,7 @@ public:
     virtual bool IsMaximized() const;
     virtual void Iconize(bool iconize = true);
     virtual bool IsIconized() const;
-    virtual void SetIcon(const wxIcon& icon);
-    virtual void SetIcons(const wxIconBundle& icons );
+    virtual void SetIcons(const wxIconBundle& icons);
     virtual void Restore();
 
 #ifndef __WXWINCE__

diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index 381467833702ef7886739fb26b8fd70800063005..268ecbd4ad121a04f5c3501f4c59c0f3b375e4fb 100644 (file)
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -145,16 +145,16 @@ public:
     virtual bool IsIconized() const = 0;
 
     // get the frame icon
-    wxIcon GetIcon() const { return m_icons.GetIcon( -1 ); }
+    wxIcon GetIcon() const;
 
     // get the frame icons
     const wxIconBundle& GetIcons() const { return m_icons; }
 
-    // set the frame icon
-    virtual void SetIcon(const wxIcon& icon) { m_icons = wxIconBundle( icon ); }
+    // set the frame icon: implemented in terms of SetIcons()
+    void SetIcon(const wxIcon& icon);
 
     // set the frame icons
-    virtual void SetIcons(const wxIconBundle& icons ) { m_icons = icons; }
+    virtual void SetIcons(const wxIconBundle& icons) { m_icons = icons; }
 
     // maximize the window to cover entire screen
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) = 0;

diff --git a/include/wx/univ/toplevel.h b/include/wx/univ/toplevel.h
index 3ab4c58d322914ae6e6e1ade85b6aacc3c03a8c8..aace185fbded88b9a0d1f18ca9e4956557679c71 100644 (file)
--- a/include/wx/univ/toplevel.h
+++ b/include/wx/univ/toplevel.h
@@ -130,7 +130,6 @@ public:
     // implement base class pure virtuals
     virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
     virtual wxPoint GetClientAreaOrigin() const;
-    virtual void SetIcon(const wxIcon& icon) { SetIcons( wxIconBundle( icon ) ); }
     virtual void SetIcons(const wxIconBundle& icons);
 
     // implementation from now on

diff --git a/include/wx/x11/toplevel.h b/include/wx/x11/toplevel.h
index 675fc4ad082befb36feaa21f6dc88659d8cd3f6d..ae820864c24de279e02b0b25b8eb9b34220f1d0d 100644 (file)
--- a/include/wx/x11/toplevel.h
+++ b/include/wx/x11/toplevel.h
@@ -50,7 +50,6 @@ public:
     virtual bool IsMaximized() const;
     virtual void Iconize(bool iconize = true);
     virtual bool IsIconized() const;
-    virtual void SetIcon(const wxIcon& icon) { SetIcons( wxIconBundle( icon ) ); }
     virtual void SetIcons(const wxIconBundle& icons);
     virtual void Restore();
 

diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp
index 433e3a6aae7b2e7fec5560771a20ac7264b5197c..c1645bd9bec209455765167e66d79a5568965fa6 100644 (file)
--- a/src/common/toplvcmn.cpp
+++ b/src/common/toplvcmn.cpp
@@ -315,6 +315,26 @@ bool wxTopLevelWindowBase::IsAlwaysMaximized() const
 #endif
 }
 
+// ----------------------------------------------------------------------------
+// icons
+// ----------------------------------------------------------------------------
+
+wxIcon wxTopLevelWindowBase::GetIcon() const
+{
+    return m_icons.IsEmpty() ? wxIcon() : m_icons.GetIcon( -1 );
+}
+
+void wxTopLevelWindowBase::SetIcon(const wxIcon& icon)
+{
+    // passing wxNullIcon to SetIcon() is possible (it means that we shouldn't
+    // have any icon), but adding an invalid icon to wxIconBundle is not
+    wxIconBundle icons;
+    if ( icon.Ok() )
+        icons.AddIcon(icon);
+
+    SetIcons(icons);
+}
+
 // ----------------------------------------------------------------------------
 // event handlers
 // ----------------------------------------------------------------------------

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index b53b2b681ad951197255d88662ffce5418a6cc47..66c6dfa43662b080f5f97a0bb0d6cd58741fa6ed 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -1173,17 +1173,6 @@ void wxTopLevelWindowGTK::SetTitle( const wxString &title )
     gtk_window_set_title( GTK_WINDOW(m_widget), wxGTK_CONV( title ) );
 }
 
-void wxTopLevelWindowGTK::SetIcon( const wxIcon &icon )
-{
-    // passing wxNullIcon to SetIcon() is possible (it means that we shouldn't
-    // have any icon), but adding an invalid icon to wxIconBundle is not
-    wxIconBundle icons;
-    if ( icon.Ok() )
-        icons.AddIcon(icon);
-
-    SetIcons(icons);
-}
-
 void wxTopLevelWindowGTK::SetIcons( const wxIconBundle &icons )
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );

diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index 97c4fc09c6f13cea15bb3dac70314072c991de64..ba996a4a9db47e5a6ad11d1e02b5cb78e73457a9 100644 (file)
--- a/src/gtk1/toplevel.cpp
+++ b/src/gtk1/toplevel.cpp
@@ -1086,17 +1086,6 @@ void wxTopLevelWindowGTK::SetTitle( const wxString &title )
     gtk_window_set_title( GTK_WINDOW(m_widget), wxGTK_CONV( title ) );
 }
 
-void wxTopLevelWindowGTK::SetIcon( const wxIcon &icon )
-{
-    // passing wxNullIcon to SetIcon() is possible (it means that we shouldn't
-    // have any icon), but adding an invalid icon to wxIconBundle is not
-    wxIconBundle icons;
-    if ( icon.Ok() )
-        icons.AddIcon(icon);
-
-    SetIcons(icons);
-}
-
 void wxTopLevelWindowGTK::SetIcons( const wxIconBundle &icons )
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );

diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index d29746a500e26513e56857e0124aa9628bb044d3..f3f0878937276a0325c739b9e80f5c81951ac2f4 100644 (file)
--- a/src/mac/carbon/toplevel.cpp
+++ b/src/mac/carbon/toplevel.cpp
@@ -1031,12 +1031,6 @@ wxPoint wxTopLevelWindowMac::GetClientAreaOrigin() const
     return wxPoint(0, 0) ;
 }
 
-void wxTopLevelWindowMac::SetIcon(const wxIcon& icon)
-{
-    // this sets m_icon
-    wxTopLevelWindowBase::SetIcon(icon);
-}
-
 void  wxTopLevelWindowMac::MacSetBackgroundBrush( const wxBrush &brush )
 {
     wxTopLevelWindowBase::MacSetBackgroundBrush( brush ) ;

diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp
index 6870ed2bc2b527a88b50d453bc78594839dc7cae..c4555bb1500fc20fa595fe633ac9bf07b73e7201 100644 (file)
--- a/src/motif/frame.cpp
+++ b/src/motif/frame.cpp
@@ -470,11 +470,6 @@ void wxFrame::DoSetIcon(const wxIcon& icon)
                   NULL);
 }
 
-void wxFrame::SetIcon(const wxIcon& icon)
-{
-    SetIcons( wxIconBundle( icon ) );
-}
-
 void wxFrame::SetIcons(const wxIconBundle& icons)
 {
     wxFrameBase::SetIcons( icons );

diff --git a/src/motif/toplevel.cpp b/src/motif/toplevel.cpp
index aaa53556dab1b635d529f029d4786b77ee5f34aa..35af4ecfe61116e6ec113a463218c326f6897365 100644 (file)
--- a/src/motif/toplevel.cpp
+++ b/src/motif/toplevel.cpp
@@ -72,8 +72,6 @@ void wxTopLevelWindowMotif::PreDestroy()
 {
     wxModelessWindows.DeleteObject(this);
 
-    m_icons.m_icons.Empty();
-
     DestroyChildren();
 
     // MessageDialog and FileDialog do not have a client widget

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index fae5b35149717fe90883e6c671690395543b4bd3..3704dcf8a8890524c8e8e46abbe0cea2a1ad3dfd 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -977,24 +977,19 @@ wxString wxTopLevelWindowMSW::GetTitle() const
     return GetLabel();
 }
 
-void wxTopLevelWindowMSW::SetIcon(const wxIcon& icon)
-{
-    SetIcons( wxIconBundle( icon ) );
-}
-
 void wxTopLevelWindowMSW::SetIcons(const wxIconBundle& icons)
 {
     wxTopLevelWindowBase::SetIcons(icons);
 
 #if !defined(__WXMICROWIN__)
-    const wxIcon& sml = icons.GetIcon( wxSize( 16, 16 ) );
+    const wxIcon& sml = icons.GetIcon(16);
     if( sml.Ok() && sml.GetWidth() == 16 && sml.GetHeight() == 16 )
     {
         ::SendMessage( GetHwndOf( this ), WM_SETICON, ICON_SMALL,
                        (LPARAM)GetHiconOf(sml) );
     }
 
-    const wxIcon& big = icons.GetIcon( wxSize( 32, 32 ) );
+    const wxIcon& big = icons.GetIcon(32);
     if( big.Ok() && big.GetWidth() == 32 && big.GetHeight() == 32 )
     {
         ::SendMessage( GetHwndOf( this ), WM_SETICON, ICON_BIG,

diff --git a/src/os2/toplevel.cpp b/src/os2/toplevel.cpp
index 8b467cc7c7e3b349c9813163b767f66df2b34eac..b231df5bff132b39f6ae596b0771ebd517478302 100644 (file)
--- a/src/os2/toplevel.cpp
+++ b/src/os2/toplevel.cpp
@@ -995,13 +995,6 @@ bool wxTopLevelWindowOS2::ShowFullScreen( bool bShow,
 // wxTopLevelWindowOS2 misc
 // ----------------------------------------------------------------------------
 
-void wxTopLevelWindowOS2::SetIcon(
-  const wxIcon&                     rIcon
-)
-{
-    SetIcons(wxIconBundle(rIcon));
-} // end of wxTopLevelWindowOS2::SetIcon
-
 void wxTopLevelWindowOS2::SetIcons(
   const wxIconBundle&               rIcons
 )
@@ -1011,7 +1004,7 @@ void wxTopLevelWindowOS2::SetIcons(
     //
     wxTopLevelWindowBase::SetIcons(rIcons);
 
-    const wxIcon&                   vIcon = rIcons.GetIcon(wxSize(32, 32));
+    const wxIcon& vIcon = rIcons.GetIcon(32);
 
     if (vIcon.Ok() && vIcon.GetWidth() == 32 && vIcon.GetHeight() == 32)
     {

diff --git a/src/palmos/toplevel.cpp b/src/palmos/toplevel.cpp
index 0b1105aafce67e97ddaf1dcd255d2c0e78b56ef7..2093565f33e28d4756f5c8d3f9410560081286d4 100644 (file)
--- a/src/palmos/toplevel.cpp
+++ b/src/palmos/toplevel.cpp
@@ -234,10 +234,6 @@ wxString wxTopLevelWindowPalm::GetTitle() const
     return wxEmptyString;
 }
 
-void wxTopLevelWindowPalm::SetIcon(const wxIcon& icon)
-{
-}
-
 void wxTopLevelWindowPalm::SetIcons(const wxIconBundle& icons)
 {
 }

diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index 58248bf16fd686b373b5423ec6f571cea0e18eba..0f7e4a9b4d304e5aa6f85f7dfd308842d6e55a1d 100644 (file)
--- a/src/x11/toplevel.cpp
+++ b/src/x11/toplevel.cpp
@@ -373,8 +373,7 @@ void wxTopLevelWindowX11::DoSetIcon(const wxIcon& icon)
 {
     if (icon.Ok() && GetMainWindow())
     {
-#if wxUSE_NANOX
-#else
+#if !wxUSE_NANOX
         XWMHints *wmHints = XAllocWMHints();
         wmHints->icon_pixmap = (Pixmap) icon.GetPixmap();