Fix recreating of wxBitmapComboBox using untyped client data.

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

diff --git a/src/motif/bmpbuttn.cpp b/src/motif/bmpbuttn.cpp
index 96bb57b2b6658ba0c4110a4fd9f384ccb7b86a83..d4403a2e169d36eeb27f9f6322e78bee72d75748 100644 (file)
--- a/src/motif/bmpbuttn.cpp
+++ b/src/motif/bmpbuttn.cpp
@@ -1,65 +1,239 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        bmpbuttn.cpp
+// Name:        src/motif/bmpbuttn.cpp

 // Purpose:     wxBitmapButton
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // Purpose:     wxBitmapButton
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Copyright:   (c) Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "bmpbuttn.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #include "wx/bmpbuttn.h"
 
 
 #include "wx/bmpbuttn.h"
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
+#include <Xm/PushBG.h>
+#include <Xm/PushB.h>
+#ifdef __VMS__
+#pragma message enable nosimpint

 #endif
 
 #endif
 

-bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
-           const wxPoint& pos,
-           const wxSize& size, long style,
-           const wxValidator& validator,
-           const wxString& name)
+#include "wx/motif/private.h"
+
+// Implemented in button.cpp
+void wxButtonCallback (Widget w, XtPointer clientData, XtPointer ptr);
+
+// Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap );
+
+wxBitmapButton::wxBitmapButton()

 {
 {

-    m_buttonBitmap = bitmap;
-    SetName(name);
-    SetValidator(validator);
-    parent->AddChild(this);
-
-    m_backgroundColour = parent->GetDefaultBackgroundColour() ;
-    m_foregroundColour = parent->GetDefaultForegroundColour() ;
-    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;
+    m_marginX = m_marginY = wxDEFAULT_BUTTON_MARGIN;
+    m_insensPixmap = (WXPixmap) 0;
+}
+
+bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id,
+                            const wxBitmap& bitmap,
+                            const wxPoint& pos,
+                            const wxSize& size, long style,
+                            const wxValidator& validator,
+                            const wxString& name)
+{
+    if( !CreateControl( parent, id, pos, size, style, validator, name ) )
+        return false;
+    PreCreation();
+
+    m_bitmaps[State_Normal] =
+    m_bitmapsOriginal[State_Normal] = bitmap;
+    m_bitmaps[State_Pressed] =
+    m_bitmapsOriginal[State_Pressed] = bitmap;
+
+    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.
+    */
+    Widget buttonWidget = XtVaCreateManagedWidget ("button",
+
+        // Gadget causes problems for default button operation.
+#if wxUSE_GADGETS
+        xmPushButtonGadgetClass, parentWidget,
+#else
+        xmPushButtonWidgetClass, parentWidget,
+#endif
+        // See comment for wxButton::SetDefault
+        // XmNdefaultButtonShadowThickness, 1,
+        XmNrecomputeSize, False,
+        NULL);
+
+    m_mainWidget = (WXWidget) buttonWidget;
+
+    XtAddCallback (buttonWidget,
+                   XmNactivateCallback, (XtCallbackProc) wxButtonCallback,
+                   (XtPointer) this);
+
+    wxSize best = GetBitmapLabel().IsOk() ? GetBestSize() : wxSize(30, 30);
+    if( size.x != -1 ) best.x = size.x;
+    if( size.y != -1 ) best.y = size.y;
+
+    PostCreation();
+    OnSetBitmap();
+
+    AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
+                  pos.x, pos.y, best.x, best.y);
+
+    return true;
+}
+
+wxBitmapButton::~wxBitmapButton()
+{
+    SetBitmapLabel(wxNullBitmap);
+
+    if (m_insensPixmap)
+        XmDestroyPixmap (DefaultScreenOfDisplay ((Display*) GetXDisplay()),
+                         (Pixmap) m_insensPixmap);
+}
+
+void wxBitmapButton::DoSetBitmap(const wxBitmap& bitmap, State which)
+{
+    m_bitmapsOriginal[which] = bitmap;
+
+    wxBitmapButtonBase::DoSetBitmap(bitmap, which);
+}
+
+void wxBitmapButton::OnSetBitmap()
+{
+    wxBitmapButtonBase::OnSetBitmap();
+
+    if ( m_bitmapsOriginal[State_Normal].IsOk() )
+    {
+        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_bitmapsOriginal[State_Normal].GetMask() )
+        {
+            WXPixel backgroundPixel;
+            XtVaGetValues((Widget) m_mainWidget,
+                          XmNbackground, &backgroundPixel,
+                          NULL);
+
+            wxColour col;
+            col.SetPixel(backgroundPixel);
+
+            wxBitmap newBitmap =
+                wxCreateMaskedBitmap(m_bitmapsOriginal[State_Normal], col);
+            m_bitmaps[State_Normal] = newBitmap;
+            m_bitmapCache.SetBitmap( m_bitmaps[State_Normal] );
+
+            pixmap = (Pixmap) m_bitmaps[State_Normal].GetDrawable();
+        }
+        else
+        {
+            m_bitmapCache.SetBitmap( m_bitmaps[State_Normal] );
+            pixmap = (Pixmap) m_bitmapCache.GetLabelPixmap(m_mainWidget);
+        }

 
 

-    if ( width == -1 && bitmap.Ok())
-       width = bitmap.GetWidth() + 2*m_marginX;
+        if (m_bitmapsOriginal[State_Disabled].IsOk())
+        {
+            if (m_bitmapsOriginal[State_Disabled].GetMask())
+            {
+                WXPixel backgroundPixel;
+                XtVaGetValues((Widget) m_mainWidget,
+                              XmNbackground, &backgroundPixel,
+                              NULL);

 
 

-    if ( height == -1 && bitmap.Ok())
-       height = bitmap.GetHeight() + 2*m_marginY;
+                wxColour col;
+                col.SetPixel(backgroundPixel);

 
 

-    /* TODO: create bitmap button
-     */
+                wxBitmap newBitmap =
+                    wxCreateMaskedBitmap(m_bitmapsOriginal[State_Disabled], col);
+                m_bitmaps[State_Disabled] = newBitmap;

 
 

-    return FALSE;
+                insensPixmap = (Pixmap) m_bitmaps[State_Disabled].GetDrawable();
+            }
+            else
+                insensPixmap = (Pixmap) m_bitmapCache.GetInsensPixmap(m_mainWidget);
+        }
+        else
+            insensPixmap = (Pixmap) m_bitmapCache.GetInsensPixmap(m_mainWidget);
+
+        // Now make the bitmap representing the armed state
+        if (m_bitmapsOriginal[State_Pressed].IsOk())
+        {
+            if (m_bitmapsOriginal[State_Pressed].GetMask())
+            {
+                WXPixel backgroundPixel;
+                XtVaGetValues((Widget) m_mainWidget,
+                              XmNarmColor, &backgroundPixel,
+                              NULL);
+
+                wxColour col;
+                col.SetPixel(backgroundPixel);
+
+                wxBitmap newBitmap =
+                    wxCreateMaskedBitmap(m_bitmapsOriginal[State_Pressed], col);
+                m_bitmaps[State_Pressed] = newBitmap;
+
+                armPixmap = (Pixmap) m_bitmaps[State_Pressed].GetDrawable();
+            }
+            else
+                armPixmap = (Pixmap) m_bitmapCache.GetArmPixmap(m_mainWidget);
+        }
+        else
+            armPixmap = (Pixmap) m_bitmapCache.GetArmPixmap(m_mainWidget);
+
+        XtVaSetValues ((Widget) m_mainWidget,
+            XmNlabelPixmap, pixmap,
+            XmNlabelInsensitivePixmap, insensPixmap,
+            XmNarmPixmap, armPixmap,
+            XmNlabelType, XmPIXMAP,
+            NULL);
+    }
+    else
+    {
+        // Null bitmap: must not use current pixmap
+        // since it is no longer valid.
+        XtVaSetValues ((Widget) m_mainWidget,
+            XmNlabelType, XmSTRING,
+            XmNlabelPixmap, XmUNSPECIFIED_PIXMAP,
+            XmNlabelInsensitivePixmap, XmUNSPECIFIED_PIXMAP,
+            XmNarmPixmap, XmUNSPECIFIED_PIXMAP,
+            NULL);
+    }

 }
 
 }
 

-void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
+void wxBitmapButton::ChangeBackgroundColour()

 {
 {

-    m_buttonBitmap = bitmap;
+    wxDoChangeBackgroundColour(m_mainWidget, m_backgroundColour, true);
+
+    // Must reset the bitmaps since the colours have changed.
+    OnSetBitmap();

 }
 
 }
 

+wxSize wxBitmapButton::DoGetBestSize() const
+{
+    wxSize ret( 30,30 );
+
+    if (GetBitmapLabel().IsOk())
+    {
+        int border = HasFlag(wxNO_BORDER) ? 4 : 10;
+        ret.x += border;
+        ret.y += border;
+
+        ret += GetBitmapLabel().GetSize();
+    }
+
+    return ret;
+}