Syntax fix.

[wxWidgets.git] / src / generic / colrdlgg.cpp

diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp
index 7207f2927c8c4aa9ba1a4b9e469966da2367c712..80b13b5337e601fb9d08dc08ee139bf8bd171525 100644 (file)
--- a/src/generic/colrdlgg.cpp
+++ b/src/generic/colrdlgg.cpp
@@ -31,7 +31,6 @@
     #include "wx/stattext.h"
     #include "wx/layout.h"
     #include "wx/dcclient.h"
     #include "wx/stattext.h"
     #include "wx/layout.h"
     #include "wx/dcclient.h"

-    #include "wx/slider.h"

     #include "wx/sizer.h"
 #endif
 
     #include "wx/sizer.h"
 #endif
 


@@ -39,15 +38,21 @@
     #include "wx/statline.h"
 #endif
 
     #include "wx/statline.h"
 #endif
 

+#if wxUSE_SLIDER
+    #include "wx/slider.h"
+#endif
+

 #include "wx/generic/colrdlgg.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog)
 
 BEGIN_EVENT_TABLE(wxGenericColourDialog, wxDialog)
     EVT_BUTTON(wxID_ADD_CUSTOM, wxGenericColourDialog::OnAddCustom)
 #include "wx/generic/colrdlgg.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog)
 
 BEGIN_EVENT_TABLE(wxGenericColourDialog, wxDialog)
     EVT_BUTTON(wxID_ADD_CUSTOM, wxGenericColourDialog::OnAddCustom)

+#if wxUSE_SLIDER

     EVT_SLIDER(wxID_RED_SLIDER, wxGenericColourDialog::OnRedSlider)
     EVT_SLIDER(wxID_GREEN_SLIDER, wxGenericColourDialog::OnGreenSlider)
     EVT_SLIDER(wxID_BLUE_SLIDER, wxGenericColourDialog::OnBlueSlider)
     EVT_SLIDER(wxID_RED_SLIDER, wxGenericColourDialog::OnRedSlider)
     EVT_SLIDER(wxID_GREEN_SLIDER, wxGenericColourDialog::OnGreenSlider)
     EVT_SLIDER(wxID_BLUE_SLIDER, wxGenericColourDialog::OnBlueSlider)

+#endif

     EVT_PAINT(wxGenericColourDialog::OnPaint)
     EVT_MOUSE_EVENTS(wxGenericColourDialog::OnMouseEvent)
     EVT_CLOSE(wxGenericColourDialog::OnCloseWindow)
     EVT_PAINT(wxGenericColourDialog::OnPaint)
     EVT_MOUSE_EVENTS(wxGenericColourDialog::OnMouseEvent)
     EVT_CLOSE(wxGenericColourDialog::OnCloseWindow)


@@ -255,9 +260,13 @@ void wxGenericColourDialog::CreateWidgets()
 {
     wxBeginBusyCursor();
 
 {
     wxBeginBusyCursor();
 

-    const int sliderX = singleCustomColourRect.x + singleCustomColourRect.width + sectionSpacing;
+    wxBoxSizer *topSizer = new wxBoxSizer( wxVERTICAL );
+

     const int sliderHeight = 160;
 
     const int sliderHeight = 160;
 

+#if wxUSE_SLIDER
+    const int sliderX = singleCustomColourRect.x + singleCustomColourRect.width + sectionSpacing;
+

     redSlider = new wxSlider(this, wxID_RED_SLIDER, colourData.m_dataColour.Red(), 0, 255,
         wxDefaultPosition, wxSize(wxDefaultCoord, sliderHeight), wxVERTICAL|wxSL_LABELS);
     greenSlider = new wxSlider(this, wxID_GREEN_SLIDER, colourData.m_dataColour.Green(), 0, 255,
     redSlider = new wxSlider(this, wxID_RED_SLIDER, colourData.m_dataColour.Red(), 0, 255,
         wxDefaultPosition, wxSize(wxDefaultCoord, sliderHeight), wxVERTICAL|wxSL_LABELS);
     greenSlider = new wxSlider(this, wxID_GREEN_SLIDER, colourData.m_dataColour.Green(), 0, 255,


@@ -273,9 +282,10 @@ void wxGenericColourDialog::CreateWidgets()
     sliderSizer->Add( greenSlider, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxALL, 10 );
     sliderSizer->Add( blueSlider, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxALL, 10 );
 
     sliderSizer->Add( greenSlider, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxALL, 10 );
     sliderSizer->Add( blueSlider, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL | wxALL, 10 );
 

-    wxBoxSizer *topSizer = new wxBoxSizer( wxVERTICAL );
-

     topSizer->Add( sliderSizer, 0, wxCENTRE | wxALL, 10 );
     topSizer->Add( sliderSizer, 0, wxCENTRE | wxALL, 10 );

+#else
+    topSizer->Add( 1, sliderHeight, 0, wxCENTRE | wxALL, 15 );
+#endif // wxUSE_SLIDER

 
 #if wxUSE_STATLINE
     // 2) static line
 
 #if wxUSE_STATLINE
     // 2) static line


@@ -285,7 +295,7 @@ void wxGenericColourDialog::CreateWidgets()
     // 3) buttons
     wxSizer *buttonsizer = CreateButtonSizer( wxOK|wxCANCEL );
     buttonsizer->Add( new wxButton(this, wxID_ADD_CUSTOM, _("Add to custom colours") ), 0, wxLEFT|wxRIGHT, 10 );
     // 3) buttons
     wxSizer *buttonsizer = CreateButtonSizer( wxOK|wxCANCEL );
     buttonsizer->Add( new wxButton(this, wxID_ADD_CUSTOM, _("Add to custom colours") ), 0, wxLEFT|wxRIGHT, 10 );

-    topSizer->Add( buttonsizer, 0, wxCENTRE | wxALL, 10 );
+    topSizer->Add( buttonsizer, 0, wxEXPAND | wxALL, 10 );

 
     SetAutoLayout( true );
     SetSizer( topSizer );
 
     SetAutoLayout( true );
     SetSizer( topSizer );


@@ -484,9 +494,11 @@ void wxGenericColourDialog::OnBasicColourClick(int which)
     whichKind = 1;
     colourSelection = which;
     
     whichKind = 1;
     colourSelection = which;
     

+#if wxUSE_SLIDER

     redSlider->SetValue( standardColours[colourSelection].Red() );
     greenSlider->SetValue( standardColours[colourSelection].Green() );
     blueSlider->SetValue( standardColours[colourSelection].Blue() );
     redSlider->SetValue( standardColours[colourSelection].Red() );
     greenSlider->SetValue( standardColours[colourSelection].Green() );
     blueSlider->SetValue( standardColours[colourSelection].Blue() );

+#endif // wxUSE_SLIDER

     
     colourData.m_dataColour.Set(standardColours[colourSelection].Red(), 
                                 standardColours[colourSelection].Green(), 
     
     colourData.m_dataColour.Set(standardColours[colourSelection].Red(), 
                                 standardColours[colourSelection].Green(), 


@@ -503,9 +515,11 @@ void wxGenericColourDialog::OnCustomColourClick(int which)
     whichKind = 2;
     colourSelection = which;
     
     whichKind = 2;
     colourSelection = which;
     

+#if wxUSE_SLIDER

     redSlider->SetValue( customColours[colourSelection].Red() );
     greenSlider->SetValue( customColours[colourSelection].Green() );
     blueSlider->SetValue( customColours[colourSelection].Blue() );
     redSlider->SetValue( customColours[colourSelection].Red() );
     greenSlider->SetValue( customColours[colourSelection].Green() );
     blueSlider->SetValue( customColours[colourSelection].Blue() );

+#endif // wxUSE_SLIDER

     
     colourData.m_dataColour.Set(customColours[colourSelection].Red(), 
                                 customColours[colourSelection].Green(), 
     
     colourData.m_dataColour.Set(customColours[colourSelection].Red(), 
                                 customColours[colourSelection].Green(), 


@@ -548,6 +562,8 @@ void wxGenericColourDialog::OnAddCustom(wxCommandEvent& WXUNUSED(event))
   PaintCustomColours(dc);
 }
 
   PaintCustomColours(dc);
 }
 

+#if wxUSE_SLIDER
+

 void wxGenericColourDialog::OnRedSlider(wxCommandEvent& WXUNUSED(event))
 {
   if (!redSlider)
 void wxGenericColourDialog::OnRedSlider(wxCommandEvent& WXUNUSED(event))
 {
   if (!redSlider)


@@ -578,5 +594,7 @@ void wxGenericColourDialog::OnBlueSlider(wxCommandEvent& WXUNUSED(event))
   PaintCustomColour(dc);
 }
 
   PaintCustomColour(dc);
 }
 

+#endif // wxUSE_SLIDER
+

 #endif // wxUSE_COLOURDLG && !defined(__WXGTK20__)
 
 #endif // wxUSE_COLOURDLG && !defined(__WXGTK20__)