X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/02e8b2f9fbdfcd25080c42082d637da257c20094..82540ef2327daaf6ae78189139a669afc9edf9d9:/src/motif/button.cpp

diff --git a/src/motif/button.cpp b/src/motif/button.cpp
index 455f2e17fb..209c03de98 100644
--- a/src/motif/button.cpp
+++ b/src/motif/button.cpp
@@ -14,6 +14,7 @@
 #endif
 
 #include "wx/button.h"
+#include "wx/utils.h"
 
 #include <Xm/PushBG.h>
 #include <Xm/PushB.h>
@@ -29,55 +30,59 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
 // Button
 
 bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label,
-           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_windowFont = parent->GetFont();
+    
     parent->AddChild((wxButton *)this);
-
+    
     if (id == -1)
         m_windowId = NewControlId();
     else
         m_windowId = id;
-
-    char* label1 = (label.IsNull() ? "" : (char*) (const char*) label);
-
-    XmString text = XmStringCreateSimple (label1);
+    
+    wxString label1(wxStripMenuCodes(label));
+    
+    XmString text = XmStringCreateSimple ((char*) (const char*) label1);
     Widget parentWidget = (Widget) parent->GetClientWidget();
-
+    
+    XmFontList fontList = (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay(parentWidget));
+    
     /*
-     * Patch Note (important)
-     * There is no major reason to put a defaultButtonThickness here.
-     * Not requesting it give the ability to put wxButton with a spacing
-     * as small as requested. However, if some button become a DefaultButton,
-     * other buttons are no more aligned -- This is why we set
-     * defaultButtonThickness of ALL buttons belonging to the same wxPanel,
-     * in the ::SetDefaultButton method.
-     */
+    * Patch Note (important)
+    * There is no major reason to put a defaultButtonThickness here.
+    * Not requesting it give the ability to put wxButton with a spacing
+    * as small as requested. However, if some button become a DefaultButton,
+    * other buttons are no more aligned -- This is why we set
+    * defaultButtonThickness of ALL buttons belonging to the same wxPanel,
+    * in the ::SetDefaultButton method.
+    */
     m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("button",
-                                        xmPushButtonWidgetClass,
-						 parentWidget,
-						 XmNlabelString, text,
-//                  XmNdefaultButtonShadowThickness, 1, // See comment for wxButton::SetDefault
-						 NULL);
-
+        xmPushButtonWidgetClass,
+        parentWidget,
+        XmNfontList, fontList,
+        XmNlabelString, text,
+        //                  XmNdefaultButtonShadowThickness, 1, // See comment for wxButton::SetDefault
+        NULL);
+    
     XmStringFree (text);
-
+    
     XtAddCallback ((Widget) m_mainWidget, XmNactivateCallback, (XtCallbackProc) wxButtonCallback,
-            (XtPointer) this);
-
-
+        (XtPointer) this);
+    
     SetCanAddEventHandler(TRUE);
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
-
-    SetFont(* parent->GetFont());
-    ChangeColour(m_mainWidget);
-
+    
+    ChangeBackgroundColour();
+    
     return TRUE;
 }
 
@@ -86,33 +91,33 @@ void wxButton::SetDefault()
     wxWindow *parent = (wxWindow *)GetParent();
     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 (wxNode * node = parent->GetChildren ()->First (); node; node = node->Next ())
+    
+    // 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 ())
     {
-      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());
-	}
+        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);
+    
+    //  XtVaSetValues((Widget)handle, XmNshowAsDefault, 1, NULL);
+    XtVaSetValues ((Widget) parent->GetMainWidget(), XmNdefaultButton, (Widget) GetMainWidget(), NULL);
 }
 
 void wxButton::Command (wxCommandEvent & event)
@@ -120,14 +125,30 @@ void wxButton::Command (wxCommandEvent & event)
     ProcessCommand (event);
 }
 
-void wxButtonCallback (Widget w, XtPointer clientData, XtPointer ptr)
+void wxButtonCallback (Widget w, XtPointer clientData, XtPointer WXUNUSED(ptr))
+{
+    if (!wxGetWindowFromTable(w))
+        // Widget has been deleted!
+        return;
+    
+    wxButton *item = (wxButton *) clientData;
+    wxCommandEvent event (wxEVT_COMMAND_BUTTON_CLICKED, item->GetId());
+    event.SetEventObject(item);
+    item->ProcessCommand (event);
+}
+
+void wxButton::ChangeFont(bool keepOriginalSize)
 {
-  if (!wxGetWindowFromTable(w))
-    // Widget has been deleted!
-    return;
+    wxWindow::ChangeFont(keepOriginalSize);
+}
+
+void wxButton::ChangeBackgroundColour()
+{
+    DoChangeBackgroundColour(m_mainWidget, m_backgroundColour, TRUE);
+}
 
-  wxButton *item = (wxButton *) clientData;
-  wxCommandEvent event (wxEVT_COMMAND_BUTTON_CLICKED, item->GetId());
-  event.SetEventObject(item);
-  item->ProcessCommand (event);
+void wxButton::ChangeForegroundColour()
+{
+    wxWindow::ChangeForegroundColour();
 }
+