fixed GetPath() trailing separator bug, rewrote GetFullPath() in terms of GetPath()

[wxWidgets.git] / src / univ / button.cpp

diff --git a/src/univ/button.cpp b/src/univ/button.cpp
index eaf7fea91bd05ef5d1f7256f7fe60f4419d41060..23a4d96eea253a9f9c59a5f11ae7fb147c729f7e 100644 (file)
--- a/src/univ/button.cpp
+++ b/src/univ/button.cpp
@@ -136,12 +136,14 @@ wxSize wxButton::DoGetBestClientSize() const
 
     // for compatibility with other ports, the buttons default size is never
     // less than the standard one
+#ifndef __WXX11__
     if ( !(GetWindowStyle() & wxBU_EXACTFIT) )
     {
         wxSize szDef = GetDefaultSize();
         if ( width < szDef.x )
             width = szDef.x;
     }
+#endif
 
     return wxSize(width, height);
 }
@@ -236,9 +238,9 @@ void wxButton::SetImageLabel(const wxBitmap& bitmap)
 
 void wxButton::SetImageMargins(wxCoord x, wxCoord y)
 {
-    m_marginBmpX = x;
-    m_marginBmpY = y;
-
+    m_marginBmpX = x + 2;
+    m_marginBmpY = y + 2;
+    
     SetBestSize(wxDefaultSize);
 }