Reverted changes to make buttons smaller in wxMotif because they uncover

a bug in wxGTK, and, more importantly, thay will break user code under
Motif which uses sizers and calls wxButton::SetDefault.

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 58054505bacbbab53bb80899bbea4958b2ee7a1b..206be7fd5d004c699d34b9a3068359987d1676a5 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -101,9 +101,9 @@ wxMotif:
   xmcombo; xmcombo is still used for Motif 1.x and Lesstif when compiled
   with Motif 1.x compatibility
 - implemented wxToggleButton
   xmcombo; xmcombo is still used for Motif 1.x and Lesstif when compiled
   with Motif 1.x compatibility
 - implemented wxToggleButton

-- made wxButton a bit smaller by default

 - wxRadioBox and wxStaticBox now use the default shadow (border) style
   instead of 
 - wxRadioBox and wxStaticBox now use the default shadow (border) style
   instead of 

+

 wxUniv:
 
 - Controls in toolbars now supported.
 wxUniv:
 
 - Controls in toolbars now supported.

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index 0fa83f4475786cc7f42b3041ccdfc3e47a4ba709..e1b894b63c44e9bce2de7c8e7888b923c0c7bb2c 100644 (file)
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -212,39 +212,39 @@ wxSizer *wxDialogBase::CreateButtonSizer( long flags )
     if (flags & wxYES)
     {
         yes = new wxButton( this, wxID_YES, _("Yes"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS );
     if (flags & wxYES)
     {
         yes = new wxButton( this, wxID_YES, _("Yes"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS );

-        inner_yes_no->Add( yes, 0, wxLEFT|wxRIGHT|wxADJUST_MINSIZE, margin );
+        inner_yes_no->Add( yes, 0, wxLEFT|wxRIGHT, margin );

     }
     if (flags & wxNO)
     {
         no = new wxButton( this, wxID_NO, _("No"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS );
     }
     if (flags & wxNO)
     {
         no = new wxButton( this, wxID_NO, _("No"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS );

-        inner_yes_no->Add( no, 0, wxLEFT|wxRIGHT|wxADJUST_MINSIZE, margin );
+        inner_yes_no->Add( no, 0, wxLEFT|wxRIGHT, margin );

     }
 
     if (flags & wxOK)
     {
         ok = new wxButton( this, wxID_OK, _("OK"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS );
     }
 
     if (flags & wxOK)
     {
         ok = new wxButton( this, wxID_OK, _("OK"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS );

-        inner_rest->Add( ok, 0, wxLEFT|wxRIGHT|wxADJUST_MINSIZE, margin );
+        inner_rest->Add( ok, 0, wxLEFT|wxRIGHT, margin );

     }
 
     if (flags & wxFORWARD)
     }
 
     if (flags & wxFORWARD)

-        inner_rest->Add( new wxButton( this, wxID_FORWARD, _("Forward"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS  ), 0, wxLEFT|wxRIGHT|wxADJUST_MINSIZE, margin );
+        inner_rest->Add( new wxButton( this, wxID_FORWARD, _("Forward"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS  ), 0, wxLEFT|wxRIGHT, margin );

 
     if (flags & wxBACKWARD)
 
     if (flags & wxBACKWARD)

-        inner_rest->Add( new wxButton( this, wxID_BACKWARD, _("Backward"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS  ), 0, wxLEFT|wxRIGHT|wxADJUST_MINSIZE, margin );
+        inner_rest->Add( new wxButton( this, wxID_BACKWARD, _("Backward"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS  ), 0, wxLEFT|wxRIGHT, margin );

 
     if (flags & wxSETUP)
 
     if (flags & wxSETUP)

-        inner_rest->Add( new wxButton( this, wxID_SETUP, _("Setup"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS  ), 0, wxLEFT|wxRIGHT|wxADJUST_MINSIZE, margin );
+        inner_rest->Add( new wxButton( this, wxID_SETUP, _("Setup"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS  ), 0, wxLEFT|wxRIGHT, margin );

 
     if (flags & wxMORE)
 
     if (flags & wxMORE)

-        inner_rest->Add( new wxButton( this, wxID_MORE, _("More..."),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS  ), 0, wxLEFT|wxRIGHT|wxADJUST_MINSIZE, margin );
+        inner_rest->Add( new wxButton( this, wxID_MORE, _("More..."),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS  ), 0, wxLEFT|wxRIGHT, margin );

 
     if (flags & wxHELP)
 
     if (flags & wxHELP)

-        inner_rest->Add( new wxButton( this, wxID_HELP, _("Help"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS  ), 0, wxLEFT|wxRIGHT|wxADJUST_MINSIZE, margin );
+        inner_rest->Add( new wxButton( this, wxID_HELP, _("Help"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS  ), 0, wxLEFT|wxRIGHT, margin );

 
     if (flags & wxCANCEL)
     {
         cancel = new wxButton( this, wxID_CANCEL, _("Cancel"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS );
 
     if (flags & wxCANCEL)
     {
         cancel = new wxButton( this, wxID_CANCEL, _("Cancel"),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS );

-        inner_rest->Add( cancel, 0, wxLEFT|wxRIGHT|wxADJUST_MINSIZE, margin );
+        inner_rest->Add( cancel, 0, wxLEFT|wxRIGHT, margin );

     }
 
     // choose the default button
     }
 
     // choose the default button

diff --git a/src/motif/button.cpp b/src/motif/button.cpp
index 01c739addb0e21475d69d26d036e1d997d68e771..709a1a9ffcf1f0b416f39c9032da6df03e448f60 100644 (file)
--- a/src/motif/button.cpp
+++ b/src/motif/button.cpp
@@ -20,8 +20,6 @@
 #include "wx/defs.h"
 
 #include "wx/button.h"
 #include "wx/defs.h"
 
 #include "wx/button.h"

-#include "wx/utils.h"
-#include "wx/panel.h"

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -68,6 +66,7 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
         parentWidget,
         wxFont::GetFontTag(), m_font.GetFontType(XtDisplay(parentWidget)),
         XmNlabelString, text(),
         parentWidget,
         wxFont::GetFontTag(), m_font.GetFontType(XtDisplay(parentWidget)),
         XmNlabelString, text(),

+        XmNrecomputeSize, False,

         // See comment for wxButton::SetDefault
         // XmNdefaultButtonShadowThickness, 1, 
         NULL);
         // See comment for wxButton::SetDefault
         // XmNdefaultButtonShadowThickness, 1, 
         NULL);


@@ -104,12 +103,16 @@ void wxButton::SetDefaultShadowThicknessAndResize()
     if( managed )
         XtManageChild( buttonWidget );
 
     if( managed )
         XtManageChild( buttonWidget );
 

+    // this can't currently be done, because user code that calls SetDefault
+    // will break otherwise
+#if 0

     wxSize best = GetBestSize(), actual = GetSize();
     if( best.x < actual.x ) best.x = actual.x;
     if( best.y < actual.y ) best.y = actual.y;
 
     if( best != actual )
         SetSize( best );
     wxSize best = GetBestSize(), actual = GetSize();
     if( best.x < actual.x ) best.x = actual.x;
     if( best.y < actual.y ) best.y = actual.y;
 
     if( best != actual )
         SetSize( best );

+#endif

 }
 
 
 }
 
 


@@ -144,8 +147,8 @@ void wxButton::SetDefault()
 wxSize wxButton::GetDefaultSize()
 {
     // TODO: check font size as in wxMSW ?  MB
 wxSize wxButton::GetDefaultSize()
 {
     // TODO: check font size as in wxMSW ?  MB

-    // Note: this is only the button size (text + margin + shadow)
-    return wxSize(70,25);
+    // Note: this is the button size (text + margin + shadow + defaultBorder)
+    return wxSize(78,30);

 }
 
 wxSize wxButton::DoGetBestSize() const
 }
 
 wxSize wxButton::DoGetBestSize() const