Ignore non-existant string selection in wxComboBox::SetValue() in read-only mode...

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

diff --git a/src/motif/bmpbuttn.cpp b/src/motif/bmpbuttn.cpp
index b9dcbf8c9a0f229652483a571164706db0b02c20..4449639d9ce17a1d580e11ade5556112a49914d0 100644 (file)
--- a/src/motif/bmpbuttn.cpp
+++ b/src/motif/bmpbuttn.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxBitmapButton
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxBitmapButton
 // Author:      Julian Smart
 // Modified by:


@@ -12,12 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#ifdef __VMS
-#define XtScreen XTSCREEN
-#endif
-
-#include "wx/defs.h"
-

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


@@ -53,9 +47,12 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id,
 {
     if( !CreateControl( parent, id, pos, size, style, validator, name ) )
         return false;
 {
     if( !CreateControl( parent, id, pos, size, style, validator, name ) )
         return false;

+    PreCreation();

 
 

-    m_bmpNormal = m_bmpNormalOriginal = bitmap;
-    m_bmpSelected = m_bmpSelectedOriginal = bitmap;
+    m_bitmaps[State_Normal] =
+    m_bitmapsOriginal[State_Normal] = bitmap;
+    m_bitmaps[State_Pressed] =
+    m_bitmapsOriginal[State_Pressed] = bitmap;

 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
 


@@ -77,26 +74,23 @@ bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id,
         xmPushButtonWidgetClass, parentWidget,
 #endif
         // See comment for wxButton::SetDefault
         xmPushButtonWidgetClass, parentWidget,
 #endif
         // See comment for wxButton::SetDefault

-        // XmNdefaultButtonShadowThickness, 1, 
+        // XmNdefaultButtonShadowThickness, 1,

         XmNrecomputeSize, False,
         NULL);
 
     m_mainWidget = (WXWidget) buttonWidget;
 
         XmNrecomputeSize, False,
         NULL);
 
     m_mainWidget = (WXWidget) buttonWidget;
 

-    ChangeFont(false);
-
-    ChangeBackgroundColour ();
-
-    DoSetBitmap();
-

     XtAddCallback (buttonWidget,
                    XmNactivateCallback, (XtCallbackProc) wxButtonCallback,
                    (XtPointer) this);
 
     XtAddCallback (buttonWidget,
                    XmNactivateCallback, (XtCallbackProc) wxButtonCallback,
                    (XtPointer) this);
 

-    wxSize best = m_bmpNormal.Ok() ? GetBestSize() : wxSize(30, 30);
+    wxSize best = GetBitmapLabel().IsOk() ? GetBestSize() : wxSize(30, 30);

     if( size.x != -1 ) best.x = size.x;
     if( size.y != -1 ) best.y = size.y;
 
     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);
 
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
                   pos.x, pos.y, best.x, best.y);
 


@@ -112,39 +106,18 @@ wxBitmapButton::~wxBitmapButton()
                          (Pixmap) m_insensPixmap);
 }
 
                          (Pixmap) m_insensPixmap);
 }
 

-void wxBitmapButton::SetBitmapLabel(const wxBitmap& bitmap)
+void wxBitmapButton::DoSetBitmap(const wxBitmap& bitmap, State which)

 {
 {

-    m_bmpNormalOriginal = bitmap;
-    m_bmpNormal = bitmap;
+    m_bitmapsOriginal[which] = bitmap;

 
 

-    DoSetBitmap();
+    wxBitmapButtonBase::DoSetBitmap(bitmap, which);

 }
 
 }
 

-void wxBitmapButton::SetBitmapSelected(const wxBitmap& sel)
-{
-    m_bmpSelected = sel;
-    m_bmpSelectedOriginal = sel;
-
-    DoSetBitmap();
-};
-
-void wxBitmapButton::SetBitmapFocus(const wxBitmap& focus)
-{
-    m_bmpFocus = focus;
-    // Not used in Motif
-};
-
-void wxBitmapButton::SetBitmapDisabled(const wxBitmap& disabled)
+void wxBitmapButton::OnSetBitmap()

 {
 {

-    m_bmpDisabled = disabled;
-    m_bmpDisabledOriginal = disabled;
+    wxBitmapButtonBase::OnSetBitmap();

 
 

-    DoSetBitmap();
-};
-
-void wxBitmapButton::DoSetBitmap()
-{
-    if (m_bmpNormalOriginal.Ok())
+    if ( m_bitmapsOriginal[State_Normal].IsOk() )

     {
         Pixmap pixmap = 0;
         Pixmap insensPixmap = 0;
     {
         Pixmap pixmap = 0;
         Pixmap insensPixmap = 0;


@@ -152,9 +125,9 @@ void wxBitmapButton::DoSetBitmap()
 
         // Must re-make the bitmap to have its transparent areas drawn
         // in the current widget background colour.
 
         // Must re-make the bitmap to have its transparent areas drawn
         // in the current widget background colour.

-        if (m_bmpNormalOriginal.GetMask())
+        if ( m_bitmapsOriginal[State_Normal].GetMask() )

         {
         {

-            int backgroundPixel;
+            WXPixel backgroundPixel;

             XtVaGetValues((Widget) m_mainWidget,
                           XmNbackground, &backgroundPixel,
                           NULL);
             XtVaGetValues((Widget) m_mainWidget,
                           XmNbackground, &backgroundPixel,
                           NULL);


@@ -163,23 +136,23 @@ void wxBitmapButton::DoSetBitmap()
             col.SetPixel(backgroundPixel);
 
             wxBitmap newBitmap =
             col.SetPixel(backgroundPixel);
 
             wxBitmap newBitmap =

-                wxCreateMaskedBitmap(m_bmpNormalOriginal, col);
-            m_bmpNormal = newBitmap;
-            m_bitmapCache.SetBitmap( m_bmpNormal );
+                wxCreateMaskedBitmap(m_bitmapsOriginal[State_Normal], col);
+            m_bitmaps[State_Normal] = newBitmap;
+            m_bitmapCache.SetBitmap( m_bitmaps[State_Normal] );

 
 

-            pixmap = (Pixmap) m_bmpNormal.GetDrawable();
+            pixmap = (Pixmap) m_bitmaps[State_Normal].GetDrawable();

         }
         else
         {
         }
         else
         {

-            m_bitmapCache.SetBitmap( m_bmpNormal );
+            m_bitmapCache.SetBitmap( m_bitmaps[State_Normal] );

             pixmap = (Pixmap) m_bitmapCache.GetLabelPixmap(m_mainWidget);
         }
 
             pixmap = (Pixmap) m_bitmapCache.GetLabelPixmap(m_mainWidget);
         }
 

-        if (m_bmpDisabledOriginal.Ok())
+        if (m_bitmapsOriginal[State_Disabled].IsOk())

         {
         {

-            if (m_bmpDisabledOriginal.GetMask())
+            if (m_bitmapsOriginal[State_Disabled].GetMask())

             {
             {

-                int backgroundPixel;
+                WXPixel backgroundPixel;

                 XtVaGetValues((Widget) m_mainWidget,
                               XmNbackground, &backgroundPixel,
                               NULL);
                 XtVaGetValues((Widget) m_mainWidget,
                               XmNbackground, &backgroundPixel,
                               NULL);


@@ -188,10 +161,10 @@ void wxBitmapButton::DoSetBitmap()
                 col.SetPixel(backgroundPixel);
 
                 wxBitmap newBitmap =
                 col.SetPixel(backgroundPixel);
 
                 wxBitmap newBitmap =

-                    wxCreateMaskedBitmap(m_bmpDisabledOriginal, col);
-                m_bmpDisabled = newBitmap;
+                    wxCreateMaskedBitmap(m_bitmapsOriginal[State_Disabled], col);
+                m_bitmaps[State_Disabled] = newBitmap;

 
 

-                insensPixmap = (Pixmap) m_bmpDisabled.GetDrawable();
+                insensPixmap = (Pixmap) m_bitmaps[State_Disabled].GetDrawable();

             }
             else
                 insensPixmap = (Pixmap) m_bitmapCache.GetInsensPixmap(m_mainWidget);
             }
             else
                 insensPixmap = (Pixmap) m_bitmapCache.GetInsensPixmap(m_mainWidget);


@@ -200,11 +173,11 @@ void wxBitmapButton::DoSetBitmap()
             insensPixmap = (Pixmap) m_bitmapCache.GetInsensPixmap(m_mainWidget);
 
         // Now make the bitmap representing the armed state
             insensPixmap = (Pixmap) m_bitmapCache.GetInsensPixmap(m_mainWidget);
 
         // Now make the bitmap representing the armed state

-        if (m_bmpSelectedOriginal.Ok())
+        if (m_bitmapsOriginal[State_Pressed].IsOk())

         {
         {

-            if (m_bmpSelectedOriginal.GetMask())
+            if (m_bitmapsOriginal[State_Pressed].GetMask())

             {
             {

-                int backgroundPixel;
+                WXPixel backgroundPixel;

                 XtVaGetValues((Widget) m_mainWidget,
                               XmNarmColor, &backgroundPixel,
                               NULL);
                 XtVaGetValues((Widget) m_mainWidget,
                               XmNarmColor, &backgroundPixel,
                               NULL);


@@ -213,10 +186,10 @@ void wxBitmapButton::DoSetBitmap()
                 col.SetPixel(backgroundPixel);
 
                 wxBitmap newBitmap =
                 col.SetPixel(backgroundPixel);
 
                 wxBitmap newBitmap =

-                    wxCreateMaskedBitmap(m_bmpSelectedOriginal, col);
-                m_bmpSelected = newBitmap;
+                    wxCreateMaskedBitmap(m_bitmapsOriginal[State_Pressed], col);
+                m_bitmaps[State_Pressed] = newBitmap;

 
 

-                armPixmap = (Pixmap) m_bmpSelected.GetDrawable();
+                armPixmap = (Pixmap) m_bitmaps[State_Pressed].GetDrawable();

             }
             else
                 armPixmap = (Pixmap) m_bitmapCache.GetArmPixmap(m_mainWidget);
             }
             else
                 armPixmap = (Pixmap) m_bitmapCache.GetArmPixmap(m_mainWidget);


@@ -249,20 +222,21 @@ void wxBitmapButton::ChangeBackgroundColour()
     wxDoChangeBackgroundColour(m_mainWidget, m_backgroundColour, true);
 
     // Must reset the bitmaps since the colours have changed.
     wxDoChangeBackgroundColour(m_mainWidget, m_backgroundColour, true);
 
     // Must reset the bitmaps since the colours have changed.

-    DoSetBitmap();
+    OnSetBitmap();

 }
 
 wxSize wxBitmapButton::DoGetBestSize() const
 {
     wxSize ret( 30,30 );
 
 }
 
 wxSize wxBitmapButton::DoGetBestSize() const
 {
     wxSize ret( 30,30 );
 

-    if (m_bmpNormal.Ok())
+    if (GetBitmapLabel().IsOk())

     {
     {

-        int border = (GetWindowStyle() & wxNO_BORDER) ? 4 : 10;
-        ret.x = m_bmpNormal.GetWidth()+border;
-        ret.y = m_bmpNormal.GetHeight()+border;
+        int border = HasFlag(wxNO_BORDER) ? 4 : 10;
+        ret.x += border;
+        ret.y += border;
+
+        ret += GetBitmapLabel().GetSize();

     }
 
     return ret;
 }
     }
 
     return ret;
 }

-