Added C/wxString array constructors to wxArrayString

[wxWidgets.git] / include / wx / generic / colrdlgg.h

diff --git a/include/wx/generic/colrdlgg.h b/include/wx/generic/colrdlgg.h
index ebf0a901f93000b3f57c65fb2e1f204fee21e666..8e80019d78b127fb61ee62b9e6719277f7338666 100644 (file)
--- a/include/wx/generic/colrdlgg.h
+++ b/include/wx/generic/colrdlgg.h
@@ -12,7 +12,7 @@
 #ifndef __COLORDLGH_G__
 #define __COLORDLGH_G__
 
 #ifndef __COLORDLGH_G__
 #define __COLORDLGH_G__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "colrdlgg.h"
 #endif
 
 #pragma interface "colrdlgg.h"
 #endif
 


@@ -22,11 +22,17 @@
 #include "wx/cmndata.h"
 
 #define wxID_ADD_CUSTOM     3000
 #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:
 class WXDLLEXPORT wxGenericColourDialog : public wxDialog
 {
 public:


@@ -59,9 +65,11 @@ public:
 
     void OnAddCustom(wxCommandEvent& event);
 
 
     void OnAddCustom(wxCommandEvent& event);
 

+#if wxUSE_SLIDER

     void OnRedSlider(wxCommandEvent& event);
     void OnGreenSlider(wxCommandEvent& event);
     void OnBlueSlider(wxCommandEvent& event);
     void OnRedSlider(wxCommandEvent& event);
     void OnGreenSlider(wxCommandEvent& event);
     void OnBlueSlider(wxCommandEvent& event);

+#endif // wxUSE_SLIDER

 
     void OnCloseWindow(wxCloseEvent& event);
 
 
     void OnCloseWindow(wxCloseEvent& event);
 


@@ -92,16 +100,15 @@ protected:
     // 16 'custom' colours
     wxColour customColours[16];
 
     // 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,
 
     // 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;
     wxSlider *redSlider;
     wxSlider *greenSlider;
     wxSlider *blueSlider;

+#endif // wxUSE_SLIDER

 
     int buttonY;
 
 
     int buttonY;
 


@@ -114,10 +121,4 @@ protected:
     DECLARE_DYNAMIC_CLASS(wxGenericColourDialog)
 };
 
     DECLARE_DYNAMIC_CLASS(wxGenericColourDialog)
 };
 

-/* This shouldn't be necessary, we have a #define in wx/colordlg.h.
-#ifdef __WXGTK__
-typedef wxGenericColourDialog wxColourDialog;
-#endif
-*/
-

 #endif
 #endif