implement wxBitmapButton::DoGetBestSize

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

diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h
index 5a27135aba932c82af5e9f5832fb0b84f3575745..c71501e59a7c8e57e57f2f044336f6d716058541 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 5a27135aba932c82af5e9f5832fb0b84f3575745..c71501e59a7c8e57e57f2f044336f6d716058541 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 dda20401468d7d2ed77799a590d1de78b0913f6b..2c7762f095f50ce27ca3ccd6c182dabbbc6fc92f 100644 (file)
--- a/src/gtk/bmpbuttn.cpp
+++ b/src/gtk/bmpbuttn.cpp
@@ -150,11 +150,11 @@ bool wxBitmapButton::Create( wxWindow *parent,
     if (m_bmpNormal.Ok())
     {
         wxSize newSize = size;
     if (m_bmpNormal.Ok())
     {
         wxSize newSize = size;

-        int border = (style & wxNO_BORDER) ? 4 : 10;
+        wxSize bestSize = DoGetBestSize();

         if (newSize.x == -1)
         if (newSize.x == -1)

-            newSize.x = m_bmpNormal.GetWidth()+border;
+            newSize.x = bestSize.x;

         if (newSize.y == -1)
         if (newSize.y == -1)

-            newSize.y = m_bmpNormal.GetHeight()+border;
+            newSize.y = bestSize.y;

         SetSize( newSize.x, newSize.y );
         OnSetBitmap();
     }
         SetSize( newSize.x, newSize.y );
         OnSetBitmap();
     }


@@ -258,6 +258,19 @@ 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;
+    }
+    return best;
+}
+

 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 dda20401468d7d2ed77799a590d1de78b0913f6b..2c7762f095f50ce27ca3ccd6c182dabbbc6fc92f 100644 (file)
--- a/src/gtk1/bmpbuttn.cpp
+++ b/src/gtk1/bmpbuttn.cpp
@@ -150,11 +150,11 @@ bool wxBitmapButton::Create( wxWindow *parent,
     if (m_bmpNormal.Ok())
     {
         wxSize newSize = size;
     if (m_bmpNormal.Ok())
     {
         wxSize newSize = size;

-        int border = (style & wxNO_BORDER) ? 4 : 10;
+        wxSize bestSize = DoGetBestSize();

         if (newSize.x == -1)
         if (newSize.x == -1)

-            newSize.x = m_bmpNormal.GetWidth()+border;
+            newSize.x = bestSize.x;

         if (newSize.y == -1)
         if (newSize.y == -1)

-            newSize.y = m_bmpNormal.GetHeight()+border;
+            newSize.y = bestSize.y;

         SetSize( newSize.x, newSize.y );
         OnSetBitmap();
     }
         SetSize( newSize.x, newSize.y );
         OnSetBitmap();
     }


@@ -258,6 +258,19 @@ 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;
+    }
+    return best;
+}
+

 bool wxBitmapButton::Enable( bool enable )
 {
     if ( !wxWindow::Enable(enable) )
 bool wxBitmapButton::Enable( bool enable )
 {
     if ( !wxWindow::Enable(enable) )