Applied patch for multiple file selection, documented.

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

diff --git a/src/motif/bmpbuttn.cpp b/src/motif/bmpbuttn.cpp
index 9f8f221f7bdd0c09bc40eb68c1534317cbe56fc4..29f0d9ae28b4df66aadce7398fcb2400c0c04407 100644 (file)
--- 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
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -15,8 +15,14 @@
 
 #include "wx/bmpbuttn.h"
 
 
 #include "wx/bmpbuttn.h"
 

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/PushBG.h>
 #include <Xm/PushB.h>
 #include <Xm/PushBG.h>
 #include <Xm/PushB.h>

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

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


@@ -36,10 +42,10 @@ wxBitmapButton::wxBitmapButton()
 }
 
 bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
 }
 
 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;
 {
     m_buttonBitmap = bitmap;
     m_buttonBitmapOriginal = bitmap;


@@ -56,10 +62,12 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
     m_marginX = 0;
     m_marginY = 0;
 
     m_marginX = 0;
     m_marginY = 0;
 

+    /*

     int x = pos.x;
     int y = pos.y;
     int width = size.x;
     int height = size.y;
     int x = pos.x;
     int y = pos.y;
     int width = size.x;
     int height = size.y;

+    */

 
     if (id == -1)
         m_windowId = NewControlId();
 
     if (id == -1)
         m_windowId = NewControlId();


@@ -68,41 +76,41 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bit
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
 
     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",
 
     Widget buttonWidget = XtVaCreateManagedWidget ("button",
 

-    // Gadget causes problems for default button operation.
+        // Gadget causes problems for default button operation.

 #if wxUSE_GADGETS
 #if wxUSE_GADGETS

-                           xmPushButtonGadgetClass, parentWidget,
+        xmPushButtonGadgetClass, parentWidget,

 #else
 #else

-                xmPushButtonWidgetClass, parentWidget,
+        xmPushButtonWidgetClass, parentWidget,

 #endif
 #endif

-//                  XmNdefaultButtonShadowThickness, 1, // See comment for wxButton::SetDefault
-                                                NULL);
+        //                  XmNdefaultButtonShadowThickness, 1, // See comment for wxButton::SetDefault
+        NULL);

 
     m_mainWidget = (WXWidget) buttonWidget;
 
 
     m_mainWidget = (WXWidget) buttonWidget;
 

+    m_font = parent->GetFont();
+    ChangeFont(FALSE);
+

     ChangeBackgroundColour ();
 
     DoSetBitmap();
 
     XtAddCallback (buttonWidget, XmNactivateCallback, (XtCallbackProc) wxButtonCallback,
     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);
 
 
     SetCanAddEventHandler(TRUE);
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
 

-    SetFont(* parent->GetFont());
-
-

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -158,11 +166,11 @@ void wxBitmapButton::DoSetBitmap()
         {
             int backgroundPixel;
             XtVaGetValues((Widget) m_mainWidget, XmNbackground, &backgroundPixel,
         {
             int backgroundPixel;
             XtVaGetValues((Widget) m_mainWidget, XmNbackground, &backgroundPixel,

-                   NULL);
+                NULL);

 
             wxColour col;
             col.SetPixel(backgroundPixel);
 
             wxColour col;
             col.SetPixel(backgroundPixel);

-                
+

             wxBitmap newBitmap = wxCreateMaskedBitmap(m_buttonBitmapOriginal, col);
             m_buttonBitmap = newBitmap;
 
             wxBitmap newBitmap = wxCreateMaskedBitmap(m_buttonBitmapOriginal, col);
             m_buttonBitmap = newBitmap;
 


@@ -177,11 +185,11 @@ void wxBitmapButton::DoSetBitmap()
             {
                 int backgroundPixel;
                 XtVaGetValues((Widget) m_mainWidget, XmNbackground, &backgroundPixel,
             {
                 int backgroundPixel;
                 XtVaGetValues((Widget) m_mainWidget, XmNbackground, &backgroundPixel,

-                   NULL);
+                    NULL);

 
                 wxColour col;
                 col.SetPixel(backgroundPixel);
 
                 wxColour col;
                 col.SetPixel(backgroundPixel);

-                
+

                 wxBitmap newBitmap = wxCreateMaskedBitmap(m_buttonBitmapDisabledOriginal, col);
                 m_buttonBitmapDisabled = newBitmap;
 
                 wxBitmap newBitmap = wxCreateMaskedBitmap(m_buttonBitmapDisabledOriginal, col);
                 m_buttonBitmapDisabled = newBitmap;
 


@@ -200,21 +208,21 @@ void wxBitmapButton::DoSetBitmap()
             {
                 int backgroundPixel;
                 XtVaGetValues((Widget) m_mainWidget, XmNarmColor, &backgroundPixel,
             {
                 int backgroundPixel;
                 XtVaGetValues((Widget) m_mainWidget, XmNarmColor, &backgroundPixel,

-                   NULL);
+                    NULL);

 
                 wxColour col;
                 col.SetPixel(backgroundPixel);
 
                 wxColour col;
                 col.SetPixel(backgroundPixel);

-                
+

                 wxBitmap newBitmap = wxCreateMaskedBitmap(m_buttonBitmapSelectedOriginal, col);
                 m_buttonBitmapSelected = newBitmap;
 
                 armPixmap = (Pixmap) m_buttonBitmapSelected.GetPixmap();
             }
             else
                 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
         }
         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!
         {
 
         if (insensPixmap == pixmap) // <- the Get...Pixmap()-functions return the same pixmap!
         {


@@ -237,7 +245,7 @@ void wxBitmapButton::DoSetBitmap()
         XtVaSetValues ((Widget) m_mainWidget,
             XmNlabelType, XmSTRING,
             XmNlabelPixmap, XmUNSPECIFIED_PIXMAP,
         XtVaSetValues ((Widget) m_mainWidget,
             XmNlabelType, XmSTRING,
             XmNlabelPixmap, XmUNSPECIFIED_PIXMAP,

-           XmNlabelInsensitivePixmap, XmUNSPECIFIED_PIXMAP,
+            XmNlabelInsensitivePixmap, XmUNSPECIFIED_PIXMAP,

             XmNarmPixmap, XmUNSPECIFIED_PIXMAP,
             NULL);
     }
             XmNarmPixmap, XmUNSPECIFIED_PIXMAP,
             NULL);
     }