From: Václav Slavík <vslavik@fastmail.fm>
Date: Mon, 18 Oct 2004 13:13:39 +0000 (+0000)
Subject: fixed previous revision: call wxControl's, not wxButton's DoGetBestSize
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e0aeebed0a3003f455e2bd7e962143faa1dde4c8?ds=sidebyside

fixed previous revision: call wxControl's, not wxButton's DoGetBestSize


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

diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h
index 473991447b..f4d71460df 100644
--- a/include/wx/gtk/bmpbuttn.h
+++ b/include/wx/gtk/bmpbuttn.h
@@ -68,6 +68,7 @@ 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 473991447b..f4d71460df 100644
--- a/include/wx/gtk1/bmpbuttn.h
+++ b/include/wx/gtk1/bmpbuttn.h
@@ -68,6 +68,7 @@ public:
 
 protected:
     virtual void OnSetBitmap();
+    virtual wxSize DoGetBestSize() const;
 
     void Init();
 
diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp
index 7b51da0f9d..b209fabcc5 100644
--- a/src/gtk/bmpbuttn.cpp
+++ b/src/gtk/bmpbuttn.cpp
@@ -263,6 +263,11 @@ void wxBitmapButton::OnSetBitmap()
     }
 }
 
+wxSize wxBitmapButton::DoGetBestSize() const
+{
+    return wxControl::DoGetBestSize();
+}
+
 bool wxBitmapButton::Enable( bool enable )
 {
     if ( !wxWindow::Enable(enable) )
diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp
index 7b51da0f9d..b209fabcc5 100644
--- a/src/gtk1/bmpbuttn.cpp
+++ b/src/gtk1/bmpbuttn.cpp
@@ -263,6 +263,11 @@ void wxBitmapButton::OnSetBitmap()
     }
 }
 
+wxSize wxBitmapButton::DoGetBestSize() const
+{
+    return wxControl::DoGetBestSize();
+}
+
 bool wxBitmapButton::Enable( bool enable )
 {
     if ( !wxWindow::Enable(enable) )