Remove some unnecessary GTK preprocessor version checks
The contained code no longer uses anything version-specific
This commit is contained in:
@@ -240,7 +240,6 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
|
|||||||
if (cr == NULL)
|
if (cr == NULL)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
#if GTK_CHECK_VERSION(3,20,0)
|
|
||||||
if (gtk_check_version(3,20,0) == NULL)
|
if (gtk_check_version(3,20,0) == NULL)
|
||||||
{
|
{
|
||||||
int pos = 1;
|
int pos = 1;
|
||||||
@@ -257,7 +256,6 @@ wxRendererGTK::DrawHeaderButton(wxWindow *win,
|
|||||||
gtk_render_frame(sc, cr, rect.x - x_diff, rect.y, rect.width, rect.height);
|
gtk_render_frame(sc, cr, rect.x - x_diff, rect.y, rect.width, rect.height);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
GtkStyleContext* sc = gtk_widget_get_style_context(button);
|
GtkStyleContext* sc = gtk_widget_get_style_context(button);
|
||||||
gtk_style_context_save(sc);
|
gtk_style_context_save(sc);
|
||||||
@@ -1028,7 +1026,6 @@ void wxRendererGTK::DrawRadioBitmap(wxWindow*, wxDC& dc, const wxRect& rect, int
|
|||||||
int min_width, min_height;
|
int min_width, min_height;
|
||||||
wxGtkStyleContext sc(dc.GetContentScaleFactor());
|
wxGtkStyleContext sc(dc.GetContentScaleFactor());
|
||||||
sc.Add(GTK_TYPE_RADIO_BUTTON, "radiobutton", NULL);
|
sc.Add(GTK_TYPE_RADIO_BUTTON, "radiobutton", NULL);
|
||||||
#if GTK_CHECK_VERSION(3,20,0)
|
|
||||||
if (gtk_check_version(3,20,0) == NULL)
|
if (gtk_check_version(3,20,0) == NULL)
|
||||||
{
|
{
|
||||||
sc.Add("radio");
|
sc.Add("radio");
|
||||||
@@ -1036,7 +1033,6 @@ void wxRendererGTK::DrawRadioBitmap(wxWindow*, wxDC& dc, const wxRect& rect, int
|
|||||||
"min-width", &min_width, "min-height", &min_height, NULL);
|
"min-width", &min_width, "min-height", &min_height, NULL);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
GValue value = G_VALUE_INIT;
|
GValue value = G_VALUE_INIT;
|
||||||
g_value_init(&value, G_TYPE_INT);
|
g_value_init(&value, G_TYPE_INT);
|
||||||
|
Reference in New Issue
Block a user