From 286ffcfaaef1ab4ee3e38e75c888ca4578148245 Mon Sep 17 00:00:00 2001 From: Niels Martin Hansen Date: Sat, 6 Jun 2009 01:59:33 +0000 Subject: [PATCH] Close #861, remove colour dropper tool on non-Windows platforms for now. Originally committed to SVN as r3020. --- aegisub/src/dialog_colorpicker.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/aegisub/src/dialog_colorpicker.cpp b/aegisub/src/dialog_colorpicker.cpp index 74eb35249..aa2759f2f 100644 --- a/aegisub/src/dialog_colorpicker.cpp +++ b/aegisub/src/dialog_colorpicker.cpp @@ -615,9 +615,11 @@ DialogColorPicker::DialogColorPicker(wxWindow *parent, wxColour initial_color) if (Options.AsBool(_T("RGBAdjust Tool"))) recent_sizer->Add(new wxButton(this,BUTTON_RGBADJUST,_T("rgbadjust()")), 0, wxEXPAND); wxSizer *picker_sizer = new wxBoxSizer(wxHORIZONTAL); +#ifdef __WXMSW__ picker_sizer->AddStretchSpacer(); picker_sizer->Add(screen_dropper_icon, 0, wxALIGN_CENTER|wxRIGHT, 5); picker_sizer->Add(screen_dropper, 0, wxALIGN_CENTER); +#endif picker_sizer->AddStretchSpacer(); picker_sizer->Add(recent_sizer, 0, wxALIGN_CENTER); picker_sizer->AddStretchSpacer();