fixed crash introduced by recently applied autowidth patch (patch 1171455)

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

diff --git a/src/motif/button.cpp b/src/motif/button.cpp
index 6953b76006d509e5913d267a78c5ec8aebe5c5a3..93189fd2a7199b67038e5475b7762e258bb78612 100644 (file)
--- a/src/motif/button.cpp
+++ b/src/motif/button.cpp
@@ -9,13 +9,20 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "button.h"
 #endif
 
 #pragma implementation "button.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#endif
+
+#include "wx/defs.h"
+

 #include "wx/button.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


@@ -26,43 +33,37 @@
 #pragma message enable nosimpint
 #endif
 
 #pragma message enable nosimpint
 #endif
 

+#include "wx/stockitem.h"

 #include "wx/motif/private.h"
 #include "wx/motif/private.h"

+#include "wx/sysopt.h"

 
 void wxButtonCallback (Widget w, XtPointer clientData, XtPointer ptr);
 
 
 void wxButtonCallback (Widget w, XtPointer clientData, XtPointer ptr);
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)

-#endif
+
+#define MIN_WIDTH 78
+#define MIN_LARGE_HEIGHT 30

 
 // Button
 
 
 // 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)
 {
                       const wxPoint& pos,
                       const wxSize& size, long style,
                       const wxValidator& validator,
                       const wxString& name)
 {

-    SetName(name);
-    SetValidator(validator);
-    m_windowStyle = style;
-    m_backgroundColour = parent->GetBackgroundColour();
-    m_foregroundColour = parent->GetForegroundColour();
-    m_font = parent->GetFont();
-
-    parent->AddChild((wxButton *)this);
-
-    if (id == -1)
-        m_windowId = NewControlId();
-    else
-        m_windowId = id;
+    wxString label(lbl);
+    if (label.empty() && wxIsStockID(id))
+        label = wxGetStockLabel(id);
+    
+    if( !CreateControl( parent, id, pos, size, style, validator, name ) )
+        return false;

 
     wxString label1(wxStripMenuCodes(label));
 
     wxString label1(wxStripMenuCodes(label));

+    wxXmString text( label1 );

 
 

-    XmString text = XmStringCreateSimple ((char*) (const char*) label1);

     Widget parentWidget = (Widget) parent->GetClientWidget();
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 

-    XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget));
-

     /*
     * Patch Note (important)
     * There is no major reason to put a defaultButtonThickness here.
     /*
     * Patch Note (important)
     * There is no major reason to put a defaultButtonThickness here.


@@ -75,75 +76,150 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
     m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("button",
         xmPushButtonWidgetClass,
         parentWidget,
     m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("button",
         xmPushButtonWidgetClass,
         parentWidget,

-        XmNfontList, fontList,
-        XmNlabelString, text,
-        //                  XmNdefaultButtonShadowThickness, 1, // See comment for wxButton::SetDefault
+        wxFont::GetFontTag(), m_font.GetFontType(XtDisplay(parentWidget)),
+        XmNlabelString, text(),
+        XmNrecomputeSize, False,
+        // See comment for wxButton::SetDefault
+        // XmNdefaultButtonShadowThickness, 1, 

         NULL);
 
         NULL);
 

-    XmStringFree (text);
-
-    XtAddCallback ((Widget) m_mainWidget, XmNactivateCallback, (XtCallbackProc) wxButtonCallback,
-        (XtPointer) this);
+    XtAddCallback ((Widget) m_mainWidget,
+                   XmNactivateCallback, (XtCallbackProc) wxButtonCallback,
+                   (XtPointer) this);

 
 

-    SetCanAddEventHandler(TRUE);
-    
-    int x = 0;  int y = 0;
-    wxFont new_font( parent->GetFont() );
-    GetTextExtent( label1, &x, &y, (int*)NULL, (int*)NULL, &new_font );
+    wxSize best = GetBestSize();
+    if( size.x != -1 ) best.x = size.x;
+    if( size.y != -1 ) best.y = size.y;

 
 

-    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);
+    AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
+                  pos.x, pos.y, best.x, best.y);

 
     ChangeBackgroundColour();
 
 
     ChangeBackgroundColour();
 

-    return TRUE;
+    return true;
+}
+
+void wxButton::SetDefaultShadowThicknessAndResize()
+{
+    Widget buttonWidget = (Widget)GetMainWidget();
+    bool managed = XtIsManaged( buttonWidget );
+    if( managed )
+        XtUnmanageChild( buttonWidget );
+
+    XtVaSetValues( buttonWidget,
+                   XmNdefaultButtonShadowThickness, 1,
+                   NULL );
+
+    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

 }
 
 }
 

+

 void wxButton::SetDefault()
 {
     wxWindow *parent = GetParent();
 void wxButton::SetDefault()
 {
     wxWindow *parent = GetParent();

-    wxPanel *panel = wxDynamicCast(parent, wxPanel);
-    if ( panel )
-        panel->SetDefaultItem(this);
-
-    // We initially do not set XmNdefaultShadowThickness, to have small buttons.
-    // Unfortunately, buttons are now mis-aligned. We try to correct this
-    // now -- setting this ressource to 1 for each button in the same row.
-    // Because it's very hard to find wxButton in the same row,
-    // correction is straighforward: we set resource for all wxButton
-    // in this parent (but not sub panels)
-    for (wxNode * node = parent->GetChildren().First (); node; node = node->Next ())
+    if ( parent )
+        parent->SetDefaultItem(this);
+
+    // We initially do not set XmNdefaultShadowThickness, to have
+    // small buttons.  Unfortunately, buttons are now mis-aligned. We
+    // try to correct this now -- setting this ressource to 1 for each
+    // button in the same row.  Because it's very hard to find
+    // wxButton in the same row, correction is straighforward: we set
+    // resource for all wxButton in this parent (but not sub panels)
+
+    for (wxWindowList::compatibility_iterator node = parent->GetChildren().GetFirst ();
+         node; node = node->GetNext ())

     {
     {

-        wxButton *item = (wxButton *) node->Data ();
-        if (item->IsKindOf(CLASSINFO(wxButton)))
-        {
-            bool managed = XtIsManaged((Widget) item->GetMainWidget());
-            if (managed)
-                XtUnmanageChild ((Widget) item->GetMainWidget());
-
-            XtVaSetValues ((Widget) item->GetMainWidget(),
-                XmNdefaultButtonShadowThickness, 1,
-                NULL);
-
-            if (managed)
-                XtManageChild ((Widget) item->GetMainWidget());
-        }
-    } // while
-
-    //  XtVaSetValues((Widget)handle, XmNshowAsDefault, 1, NULL);
-    XtVaSetValues ((Widget) parent->GetMainWidget(), XmNdefaultButton, (Widget) GetMainWidget(), NULL);
+        wxWindow *win = node->GetData ();
+        wxButton *item = wxDynamicCast(win, wxButton);
+        if (item)
+            item->SetDefaultShadowThicknessAndResize();
+    }
+
+    XtVaSetValues ((Widget) parent->GetMainWidget(),
+                   XmNdefaultButton, (Widget) GetMainWidget(),
+                   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
 }
 
 /* static */
 wxSize wxButton::GetDefaultSize()
 {
     // TODO: check font size as in wxMSW ?  MB

-    //
-    return wxSize(80,26);
+    // 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;
+
+    XtVaGetValues( (Widget)m_mainWidget,
+                   XmNmarginWidth, &xmargin,
+                   XmNmarginHeight, &ymargin,
+                   XmNhighlightThickness, &highlight,
+                   XmNshadowThickness, &shadow,
+                   XmNdefaultButtonShadowThickness, &defThickness,
+                   NULL );
+
+    int x = 0;  int y = 0;
+    GetTextExtent( GetLabel(), &x, &y );
+
+    int margin = highlight * 2 +
+        ( defThickness ? ( ( shadow + defThickness ) * 4 ) : ( shadow * 2 ) );
+    wxSize best( x + xmargin * 2 + margin,
+                 y + ymargin * 2 + margin );
+
+    // all buttons have at least the standard size unless the user explicitly
+    // wants them to be of smaller size and used wxBU_EXACTFIT style when
+    // creating the button
+    if( !HasFlag( wxBU_EXACTFIT ) )
+    {
+        wxSize def = GetDefaultSize();
+        int margin =  highlight * 2 +
+            ( defThickness ? ( shadow * 4 + defThickness * 4 ) : 0 );
+        def.x += margin;
+        def.y += margin;
+
+        if( def.x > best.x )
+            best.x = def.x;
+        if( def.y > best.y )
+            best.y = def.y;
+    }
+
+    return best;

 }
 
 void wxButton::Command (wxCommandEvent & event)
 }
 
 void wxButton::Command (wxCommandEvent & event)


@@ -162,19 +238,3 @@ void wxButtonCallback (Widget w, XtPointer clientData, XtPointer WXUNUSED(ptr))
     event.SetEventObject(item);
     item->ProcessCommand (event);
 }
     event.SetEventObject(item);
     item->ProcessCommand (event);
 }

-
-void wxButton::ChangeFont(bool keepOriginalSize)
-{
-    wxWindow::ChangeFont(keepOriginalSize);
-}
-
-void wxButton::ChangeBackgroundColour()
-{
-    DoChangeBackgroundColour(m_mainWidget, m_backgroundColour, TRUE);
-}
-
-void wxButton::ChangeForegroundColour()
-{
-    wxWindow::ChangeForegroundColour();
-}
-