From 4eba7657a271568c639c34a30f2e467553388159 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Fri, 31 Jul 2009 23:42:15 +0000 Subject: [PATCH] Fix the slider in the color picker for non-GTK platforms. wx2.9 appears to have synchronized the behavior of changing the value of a slider across all platforms to how it behaved on GTK. Originally committed to SVN as r3341. --- aegisub/src/dialog_colorpicker.cpp | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/aegisub/src/dialog_colorpicker.cpp b/aegisub/src/dialog_colorpicker.cpp index c3ca8e84e..0eecd890f 100644 --- a/aegisub/src/dialog_colorpicker.cpp +++ b/aegisub/src/dialog_colorpicker.cpp @@ -1380,7 +1380,7 @@ void DialogColorPicker::OnSpectrumChange(wxCommandEvent &evt) /// @brief DOCME -/// @param evt +/// @param evt Ignored /// void DialogColorPicker::OnSliderChange(wxCommandEvent &evt) { @@ -1389,37 +1389,25 @@ void DialogColorPicker::OnSliderChange(wxCommandEvent &evt) int x, y; // only y is used, x is garbage for this control slider->GetXY(x, y); switch (i) { - // setting the value of a component input automatically invalidates the spectrum - // and calls the according UpdateFromXXX() function in wxMSW and wxMac, wxGTK must be manually updated case 0: rgb_input[0]->SetValue(y); -#ifdef __WXGTK__ UpdateFromRGB(); -#endif break; case 1: rgb_input[1]->SetValue(y); -#ifdef __WXGTK__ UpdateFromRGB(); -#endif break; case 2: rgb_input[2]->SetValue(y); -#ifdef __WXGTK__ UpdateFromRGB(); -#endif break; case 3: hsl_input[2]->SetValue(y); -#ifdef __WXGTK__ UpdateFromHSL(); -#endif break; case 4: hsv_input[0]->SetValue(y); -#ifdef __WXGTK__ UpdateFromHSV(); -#endif break; } }