MacHandleControlClick extended by mouseStillDown state for supporting things like...

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

diff --git a/src/motif/button.cpp b/src/motif/button.cpp
index b5abcc320ecd9e4aeca3cf4104ea53bc9fd72f6e..5272ec5984fb8fbff4511bf42c92bdca15bd2785 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/utils.h"
-#include "wx/panel.h"
 
 #ifdef __VMS__
 #pragma message disable nosimpint
@@ -54,9 +52,6 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 
     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.
@@ -69,8 +64,9 @@ bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
     m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("button",
         xmPushButtonWidgetClass,
         parentWidget,
-        XmNfontList, fontList,
+        wxFont::GetFontTag(), m_font.GetFontType(XtDisplay(parentWidget)),
         XmNlabelString, text(),
+        XmNrecomputeSize, False,
         // See comment for wxButton::SetDefault
         // XmNdefaultButtonShadowThickness, 1, 
         NULL);
@@ -79,8 +75,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;
@@ -107,12 +101,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
 }
 
 
@@ -147,8 +145,8 @@ void wxButton::SetDefault()
 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