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

Fix drawing checkbox and radiobutton in checked state with GTK+ >= 3.14, see #17240

Browse Source 
(cherry picked from commit ed817dd366)
This commit is contained in:
Paul Cornett
2015-11-01 19:46:01 -08:00
parent 458bcb9546
commit c1d150ed12
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gtk/renderer.cpp
View File

@@ -41,6 +41,10 @@
#include "wx/gtk/private.h" #include "wx/gtk/private.h"
#include "wx/gtk/private/gtk2-compat.h" #include "wx/gtk/private/gtk2-compat.h"
#if defined(__WXGTK3__) && !GTK_CHECK_VERSION(3,14,0)
#define GTK_STATE_FLAG_CHECKED (1 << 11)
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxRendererGTK: our wxRendererNative implementation // wxRendererGTK: our wxRendererNative implementation
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -551,7 +555,11 @@ wxRendererGTK::DrawCheckBox(wxWindow* win,
{ {
int stateFlags = GTK_STATE_FLAG_NORMAL; int stateFlags = GTK_STATE_FLAG_NORMAL;
if (flags & wxCONTROL_CHECKED) if (flags & wxCONTROL_CHECKED)
{
stateFlags = GTK_STATE_FLAG_ACTIVE; stateFlags = GTK_STATE_FLAG_ACTIVE;
if (gtk_check_version(3,14,0) == NULL)
stateFlags = GTK_STATE_FLAG_CHECKED;
}
if (flags & wxCONTROL_DISABLED) if (flags & wxCONTROL_DISABLED)
stateFlags |= GTK_STATE_FLAG_INSENSITIVE; stateFlags |= GTK_STATE_FLAG_INSENSITIVE;
if (flags & wxCONTROL_UNDETERMINED) if (flags & wxCONTROL_UNDETERMINED)
@@ -866,7 +874,11 @@ void wxRendererGTK::DrawRadioBitmap(wxWindow* win, wxDC& dc, const wxRect& rect,
#ifdef __WXGTK3__ #ifdef __WXGTK3__
int state = GTK_STATE_FLAG_NORMAL; int state = GTK_STATE_FLAG_NORMAL;
if (flags & wxCONTROL_CHECKED) if (flags & wxCONTROL_CHECKED)
{
state = GTK_STATE_FLAG_ACTIVE; state = GTK_STATE_FLAG_ACTIVE;
if (gtk_check_version(3,14,0) == NULL)
state = GTK_STATE_FLAG_CHECKED;
}
else if (flags & wxCONTROL_UNDETERMINED) else if (flags & wxCONTROL_UNDETERMINED)
state = GTK_STATE_FLAG_INCONSISTENT; state = GTK_STATE_FLAG_INCONSISTENT;
if (flags & wxCONTROL_DISABLED) if (flags & wxCONTROL_DISABLED)