X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..ce4b7808ca940be201422a066de141ca12f13863:/include/wx/generic/colrdlgg.h diff --git a/include/wx/generic/colrdlgg.h b/include/wx/generic/colrdlgg.h index d219de8512..06feb75ffa 100644 --- a/include/wx/generic/colrdlgg.h +++ b/include/wx/generic/colrdlgg.h @@ -5,28 +5,30 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) -// Licence: wxWidgets licence +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __COLORDLGH_G__ #define __COLORDLGH_G__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "colrdlgg.h" -#endif - -#include "wx/setup.h" +#include "wx/defs.h" #include "wx/gdicmn.h" #include "wx/dialog.h" #include "wx/cmndata.h" #define wxID_ADD_CUSTOM 3000 -#define wxID_RED_SLIDER 3001 -#define wxID_GREEN_SLIDER 3002 -#define wxID_BLUE_SLIDER 3003 -class WXDLLEXPORT wxSlider; +#if wxUSE_SLIDER + + #define wxID_RED_SLIDER 3001 + #define wxID_GREEN_SLIDER 3002 + #define wxID_BLUE_SLIDER 3003 + + class WXDLLEXPORT wxSlider; + +#endif // wxUSE_SLIDER + class WXDLLEXPORT wxGenericColourDialog : public wxDialog { public: @@ -59,9 +61,11 @@ public: void OnAddCustom(wxCommandEvent& event); +#if wxUSE_SLIDER void OnRedSlider(wxCommandEvent& event); void OnGreenSlider(wxCommandEvent& event); void OnBlueSlider(wxCommandEvent& event); +#endif // wxUSE_SLIDER void OnCloseWindow(wxCloseEvent& event); @@ -92,16 +96,15 @@ protected: // 16 'custom' colours wxColour customColours[16]; - // One single custom colour (use sliders) - wxColour singleCustomColour; - // Which colour is selected? An index into one of the two areas. int colourSelection; int whichKind; // 1 for standard colours, 2 for custom colours, +#if wxUSE_SLIDER wxSlider *redSlider; wxSlider *greenSlider; wxSlider *blueSlider; +#endif // wxUSE_SLIDER int buttonY; @@ -114,10 +117,4 @@ protected: DECLARE_DYNAMIC_CLASS(wxGenericColourDialog) }; -/* This shouldn't be necessary, we have a #define in wx/colordlg.h. -#ifdef __WXGTK__ -typedef wxGenericColourDialog wxColourDialog; -#endif -*/ - #endif