X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d57be459406c2830f6abc9d99ae99166c6d133b..4ca9b362cd539ab0c3d38a027e889d3b48168578:/src/motif/bmpbuttn.cpp

diff --git a/src/motif/bmpbuttn.cpp b/src/motif/bmpbuttn.cpp
index 74a9f6f93e..f5e7767b14 100644
--- a/src/motif/bmpbuttn.cpp
+++ b/src/motif/bmpbuttn.cpp
@@ -36,129 +36,198 @@ 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;
+    m_buttonBitmapSelected = bitmap;
+    m_buttonBitmapSelectedOriginal = bitmap;
+    
     SetName(name);
     SetValidator(validator);
     parent->AddChild(this);
-
+    
     m_backgroundColour = parent->GetBackgroundColour() ;
     m_foregroundColour = parent->GetForegroundColour() ;
     m_windowStyle = style;
     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();
     else
         m_windowId = id;
-
+    
     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;
-
-    if (bitmap.Ok())
-    {
-        Pixmap p1, p2;
-
-        p1 = (Pixmap) ((wxBitmap&)bitmap).GetLabelPixmap(m_mainWidget);
-        p2 = (Pixmap) ((wxBitmap&)bitmap).GetInsensPixmap(m_mainWidget);
-
-        if(p1 == p2) // <- the Get...Pixmap()-functions return the same pixmap!
-        {
-            p2 =
-                XCreateInsensitivePixmap(DisplayOfScreen(XtScreen(buttonWidget)), p1);
-            m_insensPixmap = (WXPixmap) p2;
-        }
-
-        XtVaSetValues (buttonWidget,
-            XmNlabelPixmap, p1,
-            XmNlabelInsensitivePixmap, p2,
-            XmNarmPixmap, (Pixmap) ((wxBitmap&)bitmap).GetArmPixmap (m_mainWidget),
-            XmNlabelType, XmPIXMAP,
-            NULL);
-    }
-
+    
+    m_windowFont = 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());
-
-    ChangeBackgroundColour ();
-
-
+    
     return TRUE;
 }
 
 wxBitmapButton::~wxBitmapButton()
 {
     SetBitmapLabel(wxNullBitmap);
-
+    
     if (m_insensPixmap)
         XmDestroyPixmap (DefaultScreenOfDisplay ((Display*) GetXDisplay()), (Pixmap) m_insensPixmap);
 }
 
 void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
 {
+    m_buttonBitmapOriginal = bitmap;
     m_buttonBitmap = bitmap;
+    
+    DoSetBitmap();
+}
 
-    if (bitmap.Ok())
-    {
-        Pixmap labelPixmap, insensPixmap, armPixmap;
+void wxBitmapButton::SetBitmapSelected(const wxBitmap& sel)
+{
+    m_buttonBitmapSelected = sel;
+    m_buttonBitmapSelectedOriginal = sel;
+    
+    DoSetBitmap();
+};
 
-        labelPixmap = (Pixmap) ((wxBitmap&)bitmap).GetLabelPixmap(m_mainWidget);
+void wxBitmapButton::SetBitmapFocus(const wxBitmap& focus)
+{
+    m_buttonBitmapFocus = focus;
+    // Not used in Motif
+};
 
-        if (m_buttonBitmapSelected.Ok())
-            armPixmap = (Pixmap) m_buttonBitmapSelected.GetLabelPixmap(m_mainWidget);
-        else
-            armPixmap = (Pixmap) ((wxBitmap&)bitmap).GetArmPixmap(m_mainWidget);
+void wxBitmapButton::SetBitmapDisabled(const wxBitmap& disabled)
+{
+    m_buttonBitmapDisabled = disabled;
+    m_buttonBitmapDisabledOriginal = disabled;
+    
+    DoSetBitmap();
+};
 
-        if (m_buttonBitmapDisabled.Ok())
-            insensPixmap = (Pixmap) m_buttonBitmapDisabled.GetLabelPixmap(m_mainWidget);
+void wxBitmapButton::DoSetBitmap()
+{
+    if (m_buttonBitmapOriginal.Ok())
+    {
+        Pixmap pixmap = 0;
+        Pixmap insensPixmap = 0;
+        Pixmap armPixmap = 0;
+        
+        // Must re-make the bitmap to have its transparent areas drawn
+        // in the current widget background colour.
+        if (m_buttonBitmapOriginal.GetMask())
+        {
+            int backgroundPixel;
+            XtVaGetValues((Widget) m_mainWidget, XmNbackground, &backgroundPixel,
+                NULL);
+            
+            wxColour col;
+            col.SetPixel(backgroundPixel);
+            
+            wxBitmap newBitmap = wxCreateMaskedBitmap(m_buttonBitmapOriginal, col);
+            m_buttonBitmap = newBitmap;
+            
+            pixmap = (Pixmap) m_buttonBitmap.GetPixmap();
+        }
         else
-            insensPixmap = (Pixmap) ((wxBitmap&)bitmap).GetInsensPixmap(m_mainWidget);
-
-        if (!insensPixmap || (insensPixmap == labelPixmap)) // <- the Get...Pixmap()-functions return the same pixmap!
+            pixmap = (Pixmap) m_buttonBitmap.GetLabelPixmap(m_mainWidget);
+        
+        if (m_buttonBitmapDisabledOriginal.Ok())
+        {
+            if (m_buttonBitmapDisabledOriginal.GetMask())
+            {
+                int backgroundPixel;
+                XtVaGetValues((Widget) m_mainWidget, XmNbackground, &backgroundPixel,
+                    NULL);
+                
+                wxColour col;
+                col.SetPixel(backgroundPixel);
+                
+                wxBitmap newBitmap = wxCreateMaskedBitmap(m_buttonBitmapDisabledOriginal, col);
+                m_buttonBitmapDisabled = newBitmap;
+                
+                insensPixmap = (Pixmap) m_buttonBitmapDisabled.GetPixmap();
+            }
+            else
+                insensPixmap = (Pixmap) m_buttonBitmap.GetInsensPixmap(m_mainWidget);
+        }
+        else
+            insensPixmap = (Pixmap) m_buttonBitmap.GetInsensPixmap(m_mainWidget);
+        
+        // Now make the bitmap representing the armed state
+        if (m_buttonBitmapSelectedOriginal.Ok())
         {
-            insensPixmap = XCreateInsensitivePixmap(DisplayOfScreen(XtScreen((Widget) m_mainWidget)), labelPixmap);
+            if (m_buttonBitmapSelectedOriginal.GetMask())
+            {
+                int backgroundPixel;
+                XtVaGetValues((Widget) m_mainWidget, XmNarmColor, &backgroundPixel,
+                    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);
+        }
+        else
+            armPixmap = (Pixmap) m_buttonBitmap.GetArmPixmap(m_mainWidget);
+        
+        if (insensPixmap == pixmap) // <- the Get...Pixmap()-functions return the same pixmap!
+        {
+            insensPixmap =
+                XCreateInsensitivePixmap(DisplayOfScreen(XtScreen((Widget) m_mainWidget)), pixmap);
             m_insensPixmap = (WXPixmap) insensPixmap;
         }
-
+        
         XtVaSetValues ((Widget) m_mainWidget,
-            XmNlabelPixmap, labelPixmap,
-    	    XmNlabelInsensitivePixmap, insensPixmap,
+            XmNlabelPixmap, pixmap,
+            XmNlabelInsensitivePixmap, insensPixmap,
             XmNarmPixmap, armPixmap,
             XmNlabelType, XmPIXMAP,
             NULL);
@@ -169,27 +238,17 @@ void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
         // since it is no longer valid.
         XtVaSetValues ((Widget) m_mainWidget,
             XmNlabelType, XmSTRING,
-            XmNlabelPixmap, NULL, // TODO: Does this work?
-    	    XmNlabelInsensitivePixmap, NULL,
-            XmNarmPixmap, NULL,
+            XmNlabelPixmap, XmUNSPECIFIED_PIXMAP,
+            XmNlabelInsensitivePixmap, XmUNSPECIFIED_PIXMAP,
+            XmNarmPixmap, XmUNSPECIFIED_PIXMAP,
             NULL);
     }
 }
 
-void wxBitmapButton::SetBitmapSelected(const wxBitmap& sel)
+void wxBitmapButton::ChangeBackgroundColour()
 {
-    m_buttonBitmapSelected = sel;
-};
-
-void wxBitmapButton::SetBitmapFocus(const wxBitmap& focus)
-{
-    m_buttonBitmapFocus = focus;
-    // Not used in Motif
-};
-
-void wxBitmapButton::SetBitmapDisabled(const wxBitmap& disabled)
-{
-    m_buttonBitmapDisabled = disabled;
-};
-
-
+    DoChangeBackgroundColour(m_mainWidget, m_backgroundColour, TRUE);
+    
+    // Must reset the bitmaps since the colours have changed.
+    DoSetBitmap();
+}