fixed a signed/unsigned comparison warning introudced by last warning fix...

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

diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp
index 2c4766cbf9074908231b0eaa74c3f71e73139dfa..c347ecc31bfcead004fd10784eba6c26407cc90e 100644 (file)
--- a/src/generic/colrdlgg.cpp
+++ b/src/generic/colrdlgg.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "colrdlgg.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -149,7 +145,7 @@ void wxGenericColourDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data)
 {
     if ( !wxDialog::Create(parent, wxID_ANY, _("Choose colour"),
 bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data)
 {
     if ( !wxDialog::Create(parent, wxID_ANY, _("Choose colour"),

-                           wxPoint(), wxSize(900, 900)) )
+                           wxPoint(0,0), wxSize(900, 900)) )

         return false;
 
     dialogParent = parent;
         return false;
 
     dialogParent = parent;


@@ -211,15 +207,17 @@ void wxGenericColourDialog::OnMouseEvent(wxMouseEvent& event)
 void wxGenericColourDialog::OnPaint(wxPaintEvent& event)
 {
 #if !defined(__WXMOTIF__) && !defined(__WXPM__) && !defined(__WXCOCOA__)
 void wxGenericColourDialog::OnPaint(wxPaintEvent& event)
 {
 #if !defined(__WXMOTIF__) && !defined(__WXPM__) && !defined(__WXCOCOA__)

-  wxDialog::OnPaint(event);
+    wxDialog::OnPaint(event);
+#else
+    wxUnusedVar(event);

 #endif
 
 #endif
 

-  wxPaintDC dc(this);
+    wxPaintDC dc(this);

 
 

-  PaintBasicColours(dc);
-  PaintCustomColours(dc);
-  PaintCustomColour(dc);
-  PaintHighlight(dc, true);
+    PaintBasicColours(dc);
+    PaintCustomColours(dc);
+    PaintCustomColour(dc);
+    PaintHighlight(dc, true);

 }
 
 void wxGenericColourDialog::CalculateMeasurements()
 }
 
 void wxGenericColourDialog::CalculateMeasurements()


@@ -268,11 +266,11 @@ void wxGenericColourDialog::CreateWidgets()
     const int sliderX = singleCustomColourRect.x + singleCustomColourRect.width + sectionSpacing;
 
     redSlider = new wxSlider(this, wxID_RED_SLIDER, colourData.m_dataColour.Red(), 0, 255,
     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);
+        wxDefaultPosition, wxSize(wxDefaultCoord, sliderHeight), wxSL_VERTICAL|wxSL_LABELS|wxSL_INVERSE);

     greenSlider = new wxSlider(this, wxID_GREEN_SLIDER, colourData.m_dataColour.Green(), 0, 255,
     greenSlider = new wxSlider(this, wxID_GREEN_SLIDER, colourData.m_dataColour.Green(), 0, 255,

-        wxDefaultPosition, wxSize(wxDefaultCoord, sliderHeight), wxVERTICAL|wxSL_LABELS);
+        wxDefaultPosition, wxSize(wxDefaultCoord, sliderHeight), wxSL_VERTICAL|wxSL_LABELS|wxSL_INVERSE);

     blueSlider = new wxSlider(this, wxID_BLUE_SLIDER, colourData.m_dataColour.Blue(), 0, 255,
     blueSlider = new wxSlider(this, wxID_BLUE_SLIDER, colourData.m_dataColour.Blue(), 0, 255,

-        wxDefaultPosition, wxSize(wxDefaultCoord, sliderHeight), wxVERTICAL|wxSL_LABELS);
+        wxDefaultPosition, wxSize(wxDefaultCoord, sliderHeight), wxSL_VERTICAL|wxSL_LABELS|wxSL_INVERSE);

 
     wxBoxSizer *sliderSizer = new wxBoxSizer( wxHORIZONTAL );
 
 
     wxBoxSizer *sliderSizer = new wxBoxSizer( wxHORIZONTAL );
 


@@ -597,4 +595,3 @@ void wxGenericColourDialog::OnBlueSlider(wxCommandEvent& WXUNUSED(event))
 #endif // wxUSE_SLIDER
 
 #endif // wxUSE_COLOURDLG && !defined(__WXGTK20__)
 #endif // wxUSE_SLIDER
 
 #endif // wxUSE_COLOURDLG && !defined(__WXGTK20__)

-