wxBitmapButton doesn't need own DoGetBestSize, wxControl's one works (fixes sizing...

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

diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h
index f4d71460df7ae126d2d614ae116f73ebcb7e62fc..473991447b3d8748012bf32ff5451049430b78b8 100644 (file)
--- a/include/wx/gtk/bmpbuttn.h
+++ b/include/wx/gtk/bmpbuttn.h
@@ -68,7 +68,6 @@ public:
 
 protected:
     virtual void OnSetBitmap();
-    virtual wxSize DoGetBestSize() const;
 
     void Init();
 

diff --git a/include/wx/gtk1/bmpbuttn.h b/include/wx/gtk1/bmpbuttn.h
index f4d71460df7ae126d2d614ae116f73ebcb7e62fc..473991447b3d8748012bf32ff5451049430b78b8 100644 (file)
--- a/include/wx/gtk1/bmpbuttn.h
+++ b/include/wx/gtk1/bmpbuttn.h
@@ -68,7 +68,6 @@ public:
 
 protected:
     virtual void OnSetBitmap();
-    virtual wxSize DoGetBestSize() const;
 
     void Init();
 

diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp
index 55b275d0bbd14640befda1a0dce737788130797f..7b51da0f9d3b0a5bbdc7ee6ba6ede75144cecf33 100644 (file)
--- a/src/gtk/bmpbuttn.cpp
+++ b/src/gtk/bmpbuttn.cpp
@@ -263,20 +263,6 @@ void wxBitmapButton::OnSetBitmap()
     }
 }
 
-wxSize wxBitmapButton::DoGetBestSize() const
-{
-    wxSize best;
-    
-    if (m_bmpNormal.Ok())
-    {
-        int border = HasFlag(wxNO_BORDER) ? 4 : 10;
-        best.x = m_bmpNormal.GetWidth()+border;
-        best.y = m_bmpNormal.GetHeight()+border;
-    }
-    CacheBestSize(best);
-    return best;
-}
-
 bool wxBitmapButton::Enable( bool enable )
 {
     if ( !wxWindow::Enable(enable) )

diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp
index 55b275d0bbd14640befda1a0dce737788130797f..7b51da0f9d3b0a5bbdc7ee6ba6ede75144cecf33 100644 (file)
--- a/src/gtk1/bmpbuttn.cpp
+++ b/src/gtk1/bmpbuttn.cpp
@@ -263,20 +263,6 @@ void wxBitmapButton::OnSetBitmap()
     }
 }
 
-wxSize wxBitmapButton::DoGetBestSize() const
-{
-    wxSize best;
-    
-    if (m_bmpNormal.Ok())
-    {
-        int border = HasFlag(wxNO_BORDER) ? 4 : 10;
-        best.x = m_bmpNormal.GetWidth()+border;
-        best.y = m_bmpNormal.GetHeight()+border;
-    }
-    CacheBestSize(best);
-    return best;
-}
-
 bool wxBitmapButton::Enable( bool enable )
 {
     if ( !wxWindow::Enable(enable) )