use alpha channel in Blit() as well and not only in DrawBitmap()

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

diff --git a/src/motif/bmpbuttn.cpp b/src/motif/bmpbuttn.cpp
index 3bb099000209550814ddb251fa2106d78a2c8966..721409d8a4c0f3c54018385818f92b567f93dbeb 100644 (file)
--- a/src/motif/bmpbuttn.cpp
+++ b/src/motif/bmpbuttn.cpp
@@ -35,7 +35,7 @@
 // Implemented in button.cpp
 void wxButtonCallback (Widget w, XtPointer clientData, XtPointer ptr);
 
 // Implemented in button.cpp
 void wxButtonCallback (Widget w, XtPointer clientData, XtPointer ptr);
 

-Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap );
+// Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap );

 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
 


@@ -101,8 +101,6 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id,
                    XmNactivateCallback, (XtCallbackProc) wxButtonCallback,
                    (XtPointer) this);
 
                    XmNactivateCallback, (XtCallbackProc) wxButtonCallback,
                    (XtPointer) this);
 

-    SetCanAddEventHandler(TRUE);
-    

     wxSize best = m_bmpNormal.Ok() ? GetBestSize() : wxSize(30, 30);
     if( size.x != -1 ) best.x = size.x;
     if( size.y != -1 ) best.y = size.y;
     wxSize best = m_bmpNormal.Ok() ? GetBestSize() : wxSize(30, 30);
     if( size.x != -1 ) best.x = size.x;
     if( size.y != -1 ) best.y = size.y;


@@ -175,11 +173,15 @@ void wxBitmapButton::DoSetBitmap()
             wxBitmap newBitmap =
                 wxCreateMaskedBitmap(m_bmpNormalOriginal, col);
             m_bmpNormal = newBitmap;
             wxBitmap newBitmap =
                 wxCreateMaskedBitmap(m_bmpNormalOriginal, col);
             m_bmpNormal = newBitmap;

+            m_bitmapCache.SetBitmap( m_bmpNormal );

 
 

-            pixmap = (Pixmap) m_bmpNormal.GetPixmap();
+            pixmap = (Pixmap) m_bmpNormal.GetDrawable();

         }
         else
         }
         else

-            pixmap = (Pixmap) m_bmpNormal.GetLabelPixmap(m_mainWidget);
+        {
+            m_bitmapCache.SetBitmap( m_bmpNormal );
+            pixmap = (Pixmap) m_bitmapCache.GetLabelPixmap(m_mainWidget);
+        }

 
         if (m_bmpDisabledOriginal.Ok())
         {
 
         if (m_bmpDisabledOriginal.Ok())
         {


@@ -197,13 +199,13 @@ void wxBitmapButton::DoSetBitmap()
                     wxCreateMaskedBitmap(m_bmpDisabledOriginal, col);
                 m_bmpDisabled = newBitmap;
 
                     wxCreateMaskedBitmap(m_bmpDisabledOriginal, col);
                 m_bmpDisabled = newBitmap;
 

-                insensPixmap = (Pixmap) m_bmpDisabled.GetPixmap();
+                insensPixmap = (Pixmap) m_bmpDisabled.GetDrawable();

             }
             else
             }
             else

-                insensPixmap = (Pixmap) m_bmpNormal.GetInsensPixmap(m_mainWidget);
+                insensPixmap = (Pixmap) m_bitmapCache.GetInsensPixmap(m_mainWidget);

         }
         else
         }
         else

-            insensPixmap = (Pixmap) m_bmpNormal.GetInsensPixmap(m_mainWidget);
+            insensPixmap = (Pixmap) m_bitmapCache.GetInsensPixmap(m_mainWidget);

 
         // Now make the bitmap representing the armed state
         if (m_bmpSelectedOriginal.Ok())
 
         // Now make the bitmap representing the armed state
         if (m_bmpSelectedOriginal.Ok())


@@ -222,14 +224,15 @@ void wxBitmapButton::DoSetBitmap()
                     wxCreateMaskedBitmap(m_bmpSelectedOriginal, col);
                 m_bmpSelected = newBitmap;
 
                     wxCreateMaskedBitmap(m_bmpSelectedOriginal, col);
                 m_bmpSelected = newBitmap;
 

-                armPixmap = (Pixmap) m_bmpSelected.GetPixmap();
+                armPixmap = (Pixmap) m_bmpSelected.GetDrawable();

             }
             else
             }
             else

-                armPixmap = (Pixmap) m_bmpNormal.GetArmPixmap(m_mainWidget);
+                armPixmap = (Pixmap) m_bitmapCache.GetArmPixmap(m_mainWidget);

         }
         else
         }
         else

-            armPixmap = (Pixmap) m_bmpNormal.GetArmPixmap(m_mainWidget);
+            armPixmap = (Pixmap) m_bitmapCache.GetArmPixmap(m_mainWidget);

 
 

+#if 0

         // <- the Get...Pixmap()-functions return the same pixmap!
         if (insensPixmap == pixmap) 
         {
         // <- the Get...Pixmap()-functions return the same pixmap!
         if (insensPixmap == pixmap) 
         {


@@ -237,6 +240,7 @@ void wxBitmapButton::DoSetBitmap()
                 XCreateInsensitivePixmap(DisplayOfScreen(XtScreen((Widget) m_mainWidget)), pixmap);
             m_insensPixmap = (WXPixmap) insensPixmap;
         }
                 XCreateInsensitivePixmap(DisplayOfScreen(XtScreen((Widget) m_mainWidget)), pixmap);
             m_insensPixmap = (WXPixmap) insensPixmap;
         }

+#endif

 
         XtVaSetValues ((Widget) m_mainWidget,
             XmNlabelPixmap, pixmap,
 
         XtVaSetValues ((Widget) m_mainWidget,
             XmNlabelPixmap, pixmap,


@@ -260,7 +264,7 @@ void wxBitmapButton::DoSetBitmap()
 
 void wxBitmapButton::ChangeBackgroundColour()
 {
 
 void wxBitmapButton::ChangeBackgroundColour()
 {

-    DoChangeBackgroundColour(m_mainWidget, m_backgroundColour, TRUE);
+    wxDoChangeBackgroundColour(m_mainWidget, m_backgroundColour, TRUE);

 
     // Must reset the bitmaps since the colours have changed.
     DoSetBitmap();
 
     // Must reset the bitmaps since the colours have changed.
     DoSetBitmap();