From b5a5362e55572bcc057d014c5bdde81d75804653 Mon Sep 17 00:00:00 2001 From: Jouk Jansen Date: Thu, 18 Jun 2009 15:37:33 +0000 Subject: [PATCH] Patch wxGTK1 for recent changes in bmpbuttn git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk1/bmpbuttn.cpp | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp index 068f635..a0f54cd 100644 --- a/src/gtk1/bmpbuttn.cpp +++ b/src/gtk1/bmpbuttn.cpp @@ -141,14 +141,14 @@ bool wxBitmapButton::Create( wxWindow *parent, 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 ); - if (m_bmpNormal.Ok()) + if (bitmap.IsOk()) { OnSetBitmap(); } @@ -195,16 +195,18 @@ void wxBitmapButton::OnSetBitmap() 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(); -- 2.7.4