AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Patch wxGTK1 for recent changes in bmpbuttn

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jouk Jansen 2009-06-18 15:37:33 +00:00
parent 69ce9cea39
commit b5a5362e55
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/gtk1/bmpbuttn.cpp
View File

@ -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(); m_widget = gtk_button_new();
if (style & wxNO_BORDER) if (style & wxNO_BORDER)
gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE ); 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; wxBitmap the_one;
if (!IsThisEnabled()) if (!IsThisEnabled())
the_one = m_bmpDisabled; the_one = GetBitmapDisabled();
else if (m_isSelected) else if (m_isSelected)
the_one = m_bmpSelected; the_one = GetBitmapPressed();
else if (m_hasFocus) else if (HasFocus())
the_one = m_bmpFocus; the_one = GetBitmapFocus();
else
the_one = m_bmpNormal;
if (!the_one.Ok()) the_one = m_bmpNormal; if (!the_one.IsOk())
if (!the_one.Ok()) return; {
the_one = GetBitmapLabel();
if (!the_one.IsOk())
return;
}
GdkBitmap *mask = NULL; GdkBitmap *mask = NULL;
if (the_one.GetMask()) mask = the_one.GetMask()->GetBitmap(); if (the_one.GetMask()) mask = the_one.GetMask()->GetBitmap();