Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update minimum GTK2 version requirement to 2.6

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2012-07-10 16:39:44 +00:00
parent abac13f901
commit 4e621d2471
18 changed files with 18 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gtk/anybutton.cpp
View File

@@ -178,23 +178,9 @@ void wxAnyButton::GTKDoShowBitmap(const wxBitmap& bitmap)
}
else // have both label and bitmap
{
#ifdef __WXGTK26__
if ( !gtk_check_version(2,6,0) )
{
image = gtk_button_get_image(GTK_BUTTON(m_widget));
}
else
#endif // __WXGTK26__
{
// buttons with both label and bitmap are only supported with GTK+
// 2.6 so far
//
// it shouldn't be difficult to implement them ourselves for the
// previous GTK+ versions by stuffing a container with a label and
// an image inside GtkButton but there doesn't seem to be much
// point in doing this for ancient GTK+ versions
return;
}
}
wxCHECK_RET( image && GTK_IS_IMAGE(image), "must have image widget" );
@@ -219,10 +205,9 @@ void wxAnyButton::DoSetBitmap(const wxBitmap& bitmap, State which)
// its size) changes
InvalidateBestSize();
}
#ifdef __WXGTK26__
// normal image is special: setting it enables images for the button and
// resetting it to nothing disables all of them
else if ( !gtk_check_version(2,6,0) )
else
{
GtkWidget *image = gtk_button_get_image(GTK_BUTTON(m_widget));
if ( image && !bitmap.IsOk() )
@@ -242,7 +227,6 @@ void wxAnyButton::DoSetBitmap(const wxBitmap& bitmap, State which)
InvalidateBestSize();
}
#endif // GTK+ 2.6+
break;
case State_Pressed: