Compilation fix for non-MSW: don't use ProcessCommand().

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

diff --git a/src/univ/button.cpp b/src/univ/button.cpp
index f04966be286c83a4632741964eeb9bf3938f5b55..4d9a8430841021021d97992a0d9e705f587ad03c 100644 (file)
--- a/src/univ/button.cpp
+++ b/src/univ/button.cpp
@@ -128,9 +128,9 @@ bool wxButton::Create(wxWindow *parent,
     SetLabel(label);
 
     if (bitmap.Ok())
     SetLabel(label);
 
     if (bitmap.Ok())

-        SetImageLabel(bitmap); // SetBestSize called by SetImageLabel()
+        SetBitmap(bitmap); // SetInitialSize called by SetBitmap()

     else
     else

-        SetBestSize(size);
+        SetInitialSize(size);

 
     CreateInputHandler(wxINP_HANDLER_BUTTON);
 
 
     CreateInputHandler(wxINP_HANDLER_BUTTON);
 


@@ -213,7 +213,7 @@ void wxButton::DoDraw(wxControlRenderer *renderer)
         renderer->DrawButtonBorder();
     }
 
         renderer->DrawButtonBorder();
     }
 

-    renderer->DrawLabel(m_bitmap, m_marginBmpX, m_marginBmpY);
+    renderer->DrawButtonLabel(m_bitmap, m_marginBmpX, m_marginBmpY);

 }
 
 bool wxButton::DoDrawBackground(wxDC& dc)
 }
 
 bool wxButton::DoDrawBackground(wxDC& dc)


@@ -315,24 +315,29 @@ wxInputHandler *wxButton::GetStdInputHandler(wxInputHandler *handlerDef)
 // misc
 // ----------------------------------------------------------------------------
 
 // misc
 // ----------------------------------------------------------------------------
 

-void wxButton::SetImageLabel(const wxBitmap& bitmap)
+void wxButton::DoSetBitmap(const wxBitmap& bitmap, State which)

 {
 {

-    m_bitmap = bitmap;
+    // we support only one bitmap right now, although this wouldn't be
+    // difficult to change
+    if ( which == State_Normal )
+        m_bitmap = bitmap;

 
 

-    SetImageMargins(DEFAULT_BTN_MARGIN_X, DEFAULT_BTN_MARGIN_Y);
+    SetBitmapMargins(DEFAULT_BTN_MARGIN_X, DEFAULT_BTN_MARGIN_Y);

 }
 
 }
 

-void wxButton::SetImageMargins(wxCoord x, wxCoord y)
+void wxButton::DoSetBitmapMargins(wxCoord x, wxCoord y)

 {
     m_marginBmpX = x + 2;
     m_marginBmpY = y + 2;
 
 {
     m_marginBmpX = x + 2;
     m_marginBmpY = y + 2;
 

-    SetBestSize(wxDefaultSize);
+    SetInitialSize(wxDefaultSize);

 }
 
 }
 

-void wxButton::SetDefault()
+wxWindow *wxButton::SetDefault()

 {
     m_isDefault = true;
 {
     m_isDefault = true;

+
+    return wxButtonBase::SetDefault();

 }
 
 // ============================================================================
 }
 
 // ============================================================================