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 473991447b3d8748012bf32ff5451049430b78b8..f4d71460df7ae126d2d614ae116f73ebcb7e62fc 100644 (file)
--- a/include/wx/gtk/bmpbuttn.h
+++ b/include/wx/gtk/bmpbuttn.h
@@ -68,6 +68,7 @@ public:
 
 protected:
     virtual void OnSetBitmap();
 
 protected:
     virtual void OnSetBitmap();

+    virtual wxSize DoGetBestSize() const;

 
     void Init();
 
 
     void Init();
 

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

+    virtual wxSize DoGetBestSize() const;

 
     void Init();
 
 
     void Init();
 

diff --git a/src/gtk/bmpbuttn.cpp b/src/gtk/bmpbuttn.cpp
index 7b51da0f9d3b0a5bbdc7ee6ba6ede75144cecf33..b209fabcc5a1d428dd815986a2a80cd753c467ba 100644 (file)
--- 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) )
 bool wxBitmapButton::Enable( bool enable )
 {
     if ( !wxWindow::Enable(enable) )

diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp
index 7b51da0f9d3b0a5bbdc7ee6ba6ede75144cecf33..b209fabcc5a1d428dd815986a2a80cd753c467ba 100644 (file)
--- 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) )
 bool wxBitmapButton::Enable( bool enable )
 {
     if ( !wxWindow::Enable(enable) )