made GetColourFromGTKWidget() more general, it is now used for all colours

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

diff --git a/src/univ/button.cpp b/src/univ/button.cpp
index a6438e0d51c83d0131dff8925f3483cebf0b01de..65a5b69c9bbfbd87f5e64f0ff4a7d143207e4133 100644 (file)
--- a/src/univ/button.cpp
+++ b/src/univ/button.cpp
@@ -152,7 +152,11 @@ wxSize wxButton::DoGetBestClientSize() const
 
 void wxButton::DoDraw(wxControlRenderer *renderer)
 {
-    renderer->DrawButtonBorder();
+    if ( !(GetWindowStyle() & wxBORDER_NONE) )
+    {
+        renderer->DrawButtonBorder();
+    }
+
     renderer->DrawLabel(m_bitmap, m_marginBmpX, m_marginBmpY);
 }