Fix for #11664 - 2.7.0 Beta 1: GUI Checkboxes is now very hard to see in GTK2 version

This commit is contained in:
YuSanka 2023-11-14 10:40:10 +01:00
parent 2e07572498
commit 0c1a38cc92

View File

@ -8,7 +8,7 @@ BitmapToggleButton::BitmapToggleButton(wxWindow* parent, const wxString& label,
if (label.IsEmpty()) if (label.IsEmpty())
wxBitmapToggleButton::Create(parent, id, wxNullBitmap, wxDefaultPosition, wxDefaultSize, style); wxBitmapToggleButton::Create(parent, id, wxNullBitmap, wxDefaultPosition, wxDefaultSize, style);
else { else {
#ifdef __linux__ #ifdef __WXGTK3__
wxSize label_size = parent->GetTextExtent(label); wxSize label_size = parent->GetTextExtent(label);
wxSize def_size = wxSize(label_size.GetX() + 20, label_size.GetY()); wxSize def_size = wxSize(label_size.GetX() + 20, label_size.GetY());
#else #else
@ -23,7 +23,7 @@ BitmapToggleButton::BitmapToggleButton(wxWindow* parent, const wxString& label,
SetBackgroundColour(parent->GetBackgroundColour()); SetBackgroundColour(parent->GetBackgroundColour());
SetForegroundColour(parent->GetForegroundColour()); SetForegroundColour(parent->GetForegroundColour());
} }
#elif __linux__ #elif __WXGTK3__
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
#endif #endif
@ -40,7 +40,7 @@ BitmapToggleButton::BitmapToggleButton(wxWindow* parent, const wxString& label,
void BitmapToggleButton::update_size() void BitmapToggleButton::update_size()
{ {
#ifndef __WXGTK__ #ifndef __WXGTK3__
wxSize best_sz = GetBestSize(); wxSize best_sz = GetBestSize();
SetSize(best_sz); SetSize(best_sz);
#endif #endif