X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da494b405d0826b343ea6d249bbac27061e11d3e..2d0c2e79c27e46a238cf44562fb98c99e65d79b4:/src/motif/button.cpp

diff --git a/src/motif/button.cpp b/src/motif/button.cpp
index 01c739addb..93189fd2a7 100644
--- a/src/motif/button.cpp
+++ b/src/motif/button.cpp
@@ -9,10 +9,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "button.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #ifdef __VMS
 #define XtDisplay XTDISPLAY
 #endif
@@ -20,8 +23,6 @@
 #include "wx/defs.h"
 
 #include "wx/button.h"
-#include "wx/utils.h"
-#include "wx/panel.h"
 
 #ifdef __VMS__
 #pragma message disable nosimpint
@@ -32,20 +33,29 @@
 #pragma message enable nosimpint
 #endif
 
+#include "wx/stockitem.h"
 #include "wx/motif/private.h"
+#include "wx/sysopt.h"
 
 void wxButtonCallback (Widget w, XtPointer clientData, XtPointer ptr);
 
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 
+#define MIN_WIDTH 78
+#define MIN_LARGE_HEIGHT 30
+
 // Button
 
-bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
+bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& lbl,
                       const wxPoint& pos,
                       const wxSize& size, long style,
                       const wxValidator& validator,
                       const wxString& name)
 {
+    wxString label(lbl);
+    if (label.empty() && wxIsStockID(id))
+        label = wxGetStockLabel(id);
+    
     if( !CreateControl( parent, id, pos, size, style, validator, name ) )
         return false;
 
@@ -68,6 +78,7 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
         parentWidget,
         wxFont::GetFontTag(), m_font.GetFontType(XtDisplay(parentWidget)),
         XmNlabelString, text(),
+        XmNrecomputeSize, False,
         // See comment for wxButton::SetDefault
         // XmNdefaultButtonShadowThickness, 1, 
         NULL);
@@ -76,8 +87,6 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
                    XmNactivateCallback, (XtCallbackProc) wxButtonCallback,
                    (XtPointer) this);
 
-    SetCanAddEventHandler(TRUE);
-
     wxSize best = GetBestSize();
     if( size.x != -1 ) best.x = size.x;
     if( size.y != -1 ) best.y = size.y;
@@ -87,7 +96,7 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 
     ChangeBackgroundColour();
 
-    return TRUE;
+    return true;
 }
 
 void wxButton::SetDefaultShadowThicknessAndResize()
@@ -104,12 +113,16 @@ void wxButton::SetDefaultShadowThicknessAndResize()
     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 );
+#endif
 }
 
 
@@ -126,7 +139,7 @@ void wxButton::SetDefault()
     // wxButton in the same row, correction is straighforward: we set
     // resource for all wxButton in this parent (but not sub panels)
 
-    for (wxWindowList::Node * node = parent->GetChildren().GetFirst ();
+    for (wxWindowList::compatibility_iterator node = parent->GetChildren().GetFirst ();
          node; node = node->GetNext ())
     {
         wxWindow *win = node->GetData ();
@@ -140,15 +153,36 @@ void wxButton::SetDefault()
                    NULL);
 }
 
+static inline bool wxMotifLargeButtons()
+{
+    return wxSystemOptions::HasOption("motif.largebuttons")
+        && wxSystemOptions::GetOptionInt("motif.largebuttons") != 0;
+}
+
 /* static */
 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( MIN_WIDTH, MIN_LARGE_HEIGHT );
 }
 
 wxSize wxButton::DoGetBestSize() const
+{
+    if( wxMotifLargeButtons() )
+        return OldGetBestSize();
+
+    wxSize best = wxControl::DoGetBestSize();
+
+    if( HasFlag( wxBU_EXACTFIT ) )
+        return best;
+    else if( best.x < MIN_WIDTH )
+        best.x = MIN_WIDTH;
+
+    return best;
+}
+
+wxSize wxButton::OldGetBestSize() const
 {
     Dimension xmargin, ymargin, highlight, shadow, defThickness;