X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/321db4b6bf15df209942b9c0e6c744c8e7074d1b..866592d872daa1f4e3d44948d7d3a6c90b0af9d0:/src/motif/bmpbuttn.cpp?ds=sidebyside

diff --git a/src/motif/bmpbuttn.cpp b/src/motif/bmpbuttn.cpp
index 9f8f221f7b..358149b072 100644
--- a/src/motif/bmpbuttn.cpp
+++ b/src/motif/bmpbuttn.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -36,10 +36,10 @@ wxBitmapButton::wxBitmapButton()
 }
 
 bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
-           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)
 {
     m_buttonBitmap = bitmap;
     m_buttonBitmapOriginal = bitmap;
@@ -56,10 +56,12 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
     m_marginX = 0;
     m_marginY = 0;
 
+    /*
     int x = pos.x;
     int y = pos.y;
     int width = size.x;
     int height = size.y;
+    */
 
     if (id == -1)
         m_windowId = NewControlId();
@@ -68,41 +70,41 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
-  /*
-   * 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.
+    */
     Widget buttonWidget = XtVaCreateManagedWidget ("button",
 
-    // Gadget causes problems for default button operation.
+        // Gadget causes problems for default button operation.
 #if wxUSE_GADGETS
-			    xmPushButtonGadgetClass, parentWidget,
+        xmPushButtonGadgetClass, parentWidget,
 #else
-                xmPushButtonWidgetClass, parentWidget,
+        xmPushButtonWidgetClass, parentWidget,
 #endif
-//                  XmNdefaultButtonShadowThickness, 1, // See comment for wxButton::SetDefault
-						 NULL);
+        //                  XmNdefaultButtonShadowThickness, 1, // See comment for wxButton::SetDefault
+        NULL);
 
     m_mainWidget = (WXWidget) buttonWidget;
 
+    m_font = parent->GetFont();
+    ChangeFont(FALSE);
+
     ChangeBackgroundColour ();
 
     DoSetBitmap();
 
     XtAddCallback (buttonWidget, 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());
-
-
     return TRUE;
 }
 
@@ -158,11 +160,11 @@ void wxBitmapButton::DoSetBitmap()
         {
             int backgroundPixel;
             XtVaGetValues((Widget) m_mainWidget, XmNbackground, &backgroundPixel,
-                   NULL);
+                NULL);
 
             wxColour col;
             col.SetPixel(backgroundPixel);
-                
+
             wxBitmap newBitmap = wxCreateMaskedBitmap(m_buttonBitmapOriginal, col);
             m_buttonBitmap = newBitmap;
 
@@ -177,11 +179,11 @@ void wxBitmapButton::DoSetBitmap()
             {
                 int backgroundPixel;
                 XtVaGetValues((Widget) m_mainWidget, XmNbackground, &backgroundPixel,
-                   NULL);
+                    NULL);
 
                 wxColour col;
                 col.SetPixel(backgroundPixel);
-                
+
                 wxBitmap newBitmap = wxCreateMaskedBitmap(m_buttonBitmapDisabledOriginal, col);
                 m_buttonBitmapDisabled = newBitmap;
 
@@ -200,21 +202,21 @@ void wxBitmapButton::DoSetBitmap()
             {
                 int backgroundPixel;
                 XtVaGetValues((Widget) m_mainWidget, XmNarmColor, &backgroundPixel,
-                   NULL);
+                    NULL);
 
                 wxColour col;
                 col.SetPixel(backgroundPixel);
-                
+
                 wxBitmap newBitmap = wxCreateMaskedBitmap(m_buttonBitmapSelectedOriginal, col);
                 m_buttonBitmapSelected = newBitmap;
 
                 armPixmap = (Pixmap) m_buttonBitmapSelected.GetPixmap();
             }
             else
-              armPixmap = (Pixmap) m_buttonBitmap.GetArmPixmap(m_mainWidget);
+                armPixmap = (Pixmap) m_buttonBitmap.GetArmPixmap(m_mainWidget);
         }
         else
-          armPixmap = (Pixmap) m_buttonBitmap.GetArmPixmap(m_mainWidget);
+            armPixmap = (Pixmap) m_buttonBitmap.GetArmPixmap(m_mainWidget);
 
         if (insensPixmap == pixmap) // <- the Get...Pixmap()-functions return the same pixmap!
         {
@@ -237,7 +239,7 @@ void wxBitmapButton::DoSetBitmap()
         XtVaSetValues ((Widget) m_mainWidget,
             XmNlabelType, XmSTRING,
             XmNlabelPixmap, XmUNSPECIFIED_PIXMAP,
-    	    XmNlabelInsensitivePixmap, XmUNSPECIFIED_PIXMAP,
+            XmNlabelInsensitivePixmap, XmUNSPECIFIED_PIXMAP,
             XmNarmPixmap, XmUNSPECIFIED_PIXMAP,
             NULL);
     }