From 0c1a38cc921259dc35c58c3ee3f4f27f84499bc5 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Tue, 14 Nov 2023 10:40:10 +0100 Subject: [PATCH] Fix for #11664 - 2.7.0 Beta 1: GUI Checkboxes is now very hard to see in GTK2 version --- src/slic3r/GUI/Widgets/BitmapToggleButton.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/Widgets/BitmapToggleButton.cpp b/src/slic3r/GUI/Widgets/BitmapToggleButton.cpp index 58896d01c0..ccb6b42f54 100644 --- a/src/slic3r/GUI/Widgets/BitmapToggleButton.cpp +++ b/src/slic3r/GUI/Widgets/BitmapToggleButton.cpp @@ -8,7 +8,7 @@ BitmapToggleButton::BitmapToggleButton(wxWindow* parent, const wxString& label, if (label.IsEmpty()) wxBitmapToggleButton::Create(parent, id, wxNullBitmap, wxDefaultPosition, wxDefaultSize, style); else { -#ifdef __linux__ +#ifdef __WXGTK3__ wxSize label_size = parent->GetTextExtent(label); wxSize def_size = wxSize(label_size.GetX() + 20, label_size.GetY()); #else @@ -23,7 +23,7 @@ BitmapToggleButton::BitmapToggleButton(wxWindow* parent, const wxString& label, SetBackgroundColour(parent->GetBackgroundColour()); SetForegroundColour(parent->GetForegroundColour()); } -#elif __linux__ +#elif __WXGTK3__ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); #endif @@ -40,7 +40,7 @@ BitmapToggleButton::BitmapToggleButton(wxWindow* parent, const wxString& label, void BitmapToggleButton::update_size() { -#ifndef __WXGTK__ +#ifndef __WXGTK3__ wxSize best_sz = GetBestSize(); SetSize(best_sz); #endif