renamed Render's argument to not obfuscate its meaning

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

diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp
index 849f205e680d76da2346990429bea33fffa20a66..a5d264b557c8b9003edb3fd71afba5a0e8a4eb32 100644 (file)
--- a/src/generic/colrdlgg.cpp
+++ b/src/generic/colrdlgg.cpp
@@ -20,7 +20,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_COLOURDLG && !defined(__WXGTK20__)
+#if wxUSE_COLOURDLG && (!defined(__WXGTK20__) || defined(__WXUNIVERSAL__))
 
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
@@ -31,7 +31,6 @@
     #include "wx/stattext.h"
     #include "wx/layout.h"
     #include "wx/dcclient.h"
-    #include "wx/slider.h"
     #include "wx/sizer.h"
 #endif
 
@@ -39,15 +38,21 @@
     #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)
+#if wxUSE_SLIDER
     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)
@@ -255,42 +260,48 @@ void wxGenericColourDialog::CreateWidgets()
 {
     wxBeginBusyCursor();
 
-    int sliderX = singleCustomColourRect.x + singleCustomColourRect.width + sectionSpacing;
-#if defined(__WXMOTIF__)
-    int sliderSpacing = 65;
-    int sliderHeight = 160;
-#else
-    int sliderSpacing = 45;
-    int sliderHeight = 160;
-#endif
+    wxBoxSizer *topSizer = new wxBoxSizer( wxVERTICAL );
 
-    redSlider = new wxSlider(this, wxID_RED_SLIDER, singleCustomColour.Red(), 0, 255,
-        wxPoint(sliderX, 10), wxSize(wxDefaultSize.x, sliderHeight), wxVERTICAL|wxSL_LABELS);
-    greenSlider = new wxSlider(this, wxID_GREEN_SLIDER, singleCustomColour.Green(), 0, 255,
-        wxPoint(sliderX + sliderSpacing, 10), wxSize(wxDefaultSize.x, sliderHeight), wxVERTICAL|wxSL_LABELS);
-    blueSlider = new wxSlider(this, wxID_BLUE_SLIDER, singleCustomColour.Blue(), 0, 255,
-        wxPoint(sliderX + 2*sliderSpacing, 10), wxSize(wxDefaultSize.x, sliderHeight), wxVERTICAL|wxSL_LABELS);
+    const int sliderHeight = 160;
 
-    wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
+#if wxUSE_SLIDER
+    const int sliderX = singleCustomColourRect.x + singleCustomColourRect.width + sectionSpacing;
 
-    // 1) space for explicitly layouted controls
-    topsizer->Add( sliderX + 3*sliderSpacing, sliderHeight+25 );
+    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,
+        wxDefaultPosition, wxSize(wxDefaultCoord, sliderHeight), wxVERTICAL|wxSL_LABELS);
+    blueSlider = new wxSlider(this, wxID_BLUE_SLIDER, colourData.m_dataColour.Blue(), 0, 255,
+        wxDefaultPosition, wxSize(wxDefaultCoord, sliderHeight), wxVERTICAL|wxSL_LABELS);
+
+    wxBoxSizer *sliderSizer = new wxBoxSizer( wxHORIZONTAL );
+
+    // 1) space for sliders
+    sliderSizer->Add( sliderX, sliderHeight );
+    sliderSizer->Add( redSlider, 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 );
+
+    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
-    topsizer->Add( new wxStaticLine( this, wxID_ANY ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
+    topSizer->Add( new wxStaticLine( this, wxID_ANY ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
 #endif
 
     // 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, wxCENTRE | wxALL, 10 );
 
     SetAutoLayout( true );
-    SetSizer( topsizer );
+    SetSizer( topSizer );
 
-    topsizer->SetSizeHints( this );
-    topsizer->Fit( this );
+    topSizer->SetSizeHints( this );
+    topSizer->Fit( this );
 
     Centre( wxBOTH );
 
@@ -346,13 +357,13 @@ void wxGenericColourDialog::InitializeColours(void)
                 }
             }
         }
-        singleCustomColour.Set( curr.Red(), curr.Green(), curr.Blue() );
+        colourData.m_dataColour.Set( curr.Red(), curr.Green(), curr.Blue() );
     }
     else
     {
         whichKind = 1;
         colourSelection = 0;
-        singleCustomColour.Set( 0, 0, 0 );
+        colourData.m_dataColour.Set( 0, 0, 0 );
     }
 }
 
@@ -463,7 +474,7 @@ void wxGenericColourDialog::PaintCustomColour(wxDC& dc)
 
   dc.SetPen(*wxBLACK_PEN);
 
-  wxBrush *brush = new wxBrush(singleCustomColour, wxSOLID);
+  wxBrush *brush = new wxBrush(colourData.m_dataColour, wxSOLID);
   dc.SetBrush(*brush);
 
   dc.DrawRectangle( singleCustomColourRect.x, singleCustomColourRect.y,
@@ -482,11 +493,16 @@ void wxGenericColourDialog::OnBasicColourClick(int which)
     PaintHighlight(dc, false);
     whichKind = 1;
     colourSelection = which;
-    colourData.SetColour(standardColours[colourSelection]);
+    
+#if wxUSE_SLIDER
     redSlider->SetValue( standardColours[colourSelection].Red() );
     greenSlider->SetValue( standardColours[colourSelection].Green() );
     blueSlider->SetValue( standardColours[colourSelection].Blue() );
-    singleCustomColour.Set(standardColours[colourSelection].Red(), standardColours[colourSelection].Green(), standardColours[colourSelection].Blue());
+#endif // wxUSE_SLIDER
+    
+    colourData.m_dataColour.Set(standardColours[colourSelection].Red(), 
+                                standardColours[colourSelection].Green(), 
+                                standardColours[colourSelection].Blue());
 
     PaintCustomColour(dc);
     PaintHighlight(dc, true);
@@ -498,11 +514,17 @@ void wxGenericColourDialog::OnCustomColourClick(int which)
     PaintHighlight(dc, false);
     whichKind = 2;
     colourSelection = which;
-    colourData.SetColour(customColours[colourSelection]);
+    
+#if wxUSE_SLIDER
     redSlider->SetValue( customColours[colourSelection].Red() );
     greenSlider->SetValue( customColours[colourSelection].Green() );
     blueSlider->SetValue( customColours[colourSelection].Blue() );
-    singleCustomColour.Set(customColours[colourSelection].Red(), customColours[colourSelection].Green(), customColours[colourSelection].Blue());
+#endif // wxUSE_SLIDER
+    
+    colourData.m_dataColour.Set(customColours[colourSelection].Red(), 
+                                customColours[colourSelection].Green(), 
+                                customColours[colourSelection].Blue());
+    
     PaintCustomColour(dc);
     PaintHighlight(dc, true);
 }
@@ -531,20 +553,24 @@ void wxGenericColourDialog::OnAddCustom(wxCommandEvent& WXUNUSED(event))
     PaintHighlight(dc, true);
   }
 
-  customColours[colourSelection].Set(singleCustomColour.Red(), singleCustomColour.Green(), singleCustomColour.Blue());
-  colourData.SetColour(customColours[colourSelection]);
+  customColours[colourSelection].Set(colourData.m_dataColour.Red(), 
+                                     colourData.m_dataColour.Green(), 
+                                     colourData.m_dataColour.Blue());
+  
   colourData.SetCustomColour(colourSelection, customColours[colourSelection]);
 
   PaintCustomColours(dc);
 }
 
+#if wxUSE_SLIDER
+
 void wxGenericColourDialog::OnRedSlider(wxCommandEvent& WXUNUSED(event))
 {
   if (!redSlider)
     return;
 
   wxClientDC dc(this);
-  singleCustomColour.Set(redSlider->GetValue(), singleCustomColour.Green(), singleCustomColour.Blue());
+  colourData.m_dataColour.Set((unsigned char)redSlider->GetValue(), colourData.m_dataColour.Green(), colourData.m_dataColour.Blue());
   PaintCustomColour(dc);
 }
 
@@ -554,7 +580,7 @@ void wxGenericColourDialog::OnGreenSlider(wxCommandEvent& WXUNUSED(event))
     return;
 
   wxClientDC dc(this);
-  singleCustomColour.Set(singleCustomColour.Red(), greenSlider->GetValue(), singleCustomColour.Blue());
+  colourData.m_dataColour.Set(colourData.m_dataColour.Red(), (unsigned char)greenSlider->GetValue(), colourData.m_dataColour.Blue());
   PaintCustomColour(dc);
 }
 
@@ -564,9 +590,11 @@ void wxGenericColourDialog::OnBlueSlider(wxCommandEvent& WXUNUSED(event))
     return;
 
   wxClientDC dc(this);
-  singleCustomColour.Set(singleCustomColour.Red(), singleCustomColour.Green(), blueSlider->GetValue());
+  colourData.m_dataColour.Set(colourData.m_dataColour.Red(), colourData.m_dataColour.Green(), (unsigned char)blueSlider->GetValue());
   PaintCustomColour(dc);
 }
 
+#endif // wxUSE_SLIDER
+
 #endif // wxUSE_COLOURDLG && !defined(__WXGTK20__)