Patch wxGTK1 for recent changes in bmpbuttn

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp
index 068f6351a319582e2fcec6355bf849a822a0bf15..a0f54cd27f7442a6ab13d1ba31be5b0c34f3644f 100644 (file)
--- a/src/gtk1/bmpbuttn.cpp
+++ b/src/gtk1/bmpbuttn.cpp
@@ -141,14 +141,14 @@ bool wxBitmapButton::Create( wxWindow *parent,
         return false;
     }
 
         return false;
     }
 

-    m_bmpNormal = bitmap;
+    m_bitmaps[State_Normal] = bitmap;

 
     m_widget = gtk_button_new();
 
     if (style & wxNO_BORDER)
        gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
 
 
     m_widget = gtk_button_new();
 
     if (style & wxNO_BORDER)
        gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
 

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

     {
         OnSetBitmap();
     }
     {
         OnSetBitmap();
     }


@@ -195,16 +195,18 @@ void wxBitmapButton::OnSetBitmap()
 
     wxBitmap the_one;
     if (!IsThisEnabled())
 
     wxBitmap the_one;
     if (!IsThisEnabled())

-        the_one = m_bmpDisabled;
-    else if (m_isSelected)
-        the_one = m_bmpSelected;
-    else if (m_hasFocus)
-        the_one = m_bmpFocus;
-    else
-        the_one = m_bmpNormal;
-
-    if (!the_one.Ok()) the_one = m_bmpNormal;
-    if (!the_one.Ok()) return;
+        the_one = GetBitmapDisabled();
+   else if (m_isSelected)
+     the_one = GetBitmapPressed();
+   else if (HasFocus())
+     the_one = GetBitmapFocus();
+
+   if (!the_one.IsOk())
+     {
+       the_one = GetBitmapLabel();
+       if (!the_one.IsOk())
+         return;
+     }

 
     GdkBitmap *mask = NULL;
     if (the_one.GetMask()) mask = the_one.GetMask()->GetBitmap();
 
     GdkBitmap *mask = NULL;
     if (the_one.GetMask()) mask = the_one.GetMask()->GetBitmap();