unused parameter warnings suppressed

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

diff --git a/src/motif/button.cpp b/src/motif/button.cpp
index 144cb92156569078c36e2adee0bb06164336064e..610a94ef19e7e87ca400c7c09636fe558e2e15ad 100644 (file)
--- a/src/motif/button.cpp
+++ b/src/motif/button.cpp
@@ -80,7 +80,17 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
         (XtPointer) this);
 
     SetCanAddEventHandler(TRUE);
         (XtPointer) this);
 
     SetCanAddEventHandler(TRUE);

-    AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
+    
+    int x = 0;  int y = 0;
+    wxFont new_font( parent->GetFont() );
+    GetTextExtent( label1, &x, &y, (int*)NULL, (int*)NULL, &new_font );
+
+    wxSize newSize = size;
+    if (newSize.x == -1) newSize.x = 30+x;
+    if (newSize.y == -1) newSize.y = 27+y;
+    SetSize( newSize.x, newSize.y );
+    
+    AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, newSize.x, newSize.y);

 
     ChangeBackgroundColour();
 
 
     ChangeBackgroundColour();
 


@@ -90,7 +100,7 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 void wxButton::SetDefault()
 {
     wxWindow *parent = GetParent();
 void wxButton::SetDefault()
 {
     wxWindow *parent = GetParent();

-    wxPanel *panel = wxDynamicCast(panel, wxPanel);
+    wxPanel *panel = wxDynamicCast(parent, wxPanel);

     if ( panel )
         panel->SetDefaultItem(this);
 
     if ( panel )
         panel->SetDefaultItem(this);