corrected test for __WXGTK__ (but should it be there at all?)

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

diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp
index 4049e421fe53cdee0290e76fec8b989666d45d9f..6ac7e393d8c214a4840599921c2961714035b63e 100644 (file)
--- a/src/generic/colrdlgg.cpp
+++ b/src/generic/colrdlgg.cpp
@@ -1,15 +1,15 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        colrdlgg.cpp
+// Name:        generic/colrdlgg.cpp

 // Purpose:     Choice dialogs
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Purpose:     Choice dialogs
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

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

 #pragma implementation "colrdlgg.h"
 #endif
 
 #pragma implementation "colrdlgg.h"
 #endif
 


@@ -17,37 +17,42 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_COLOURDLG && (!defined(__WXGTK20__) || defined(__WXUNIVERSAL__))
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include <stdio.h>
-#include <stdio.h>
-#include "wx/utils.h"
-#include "wx/intl.h"
-#include "wx/dialog.h"
-#include "wx/listbox.h"
-#include "wx/button.h"
-#include "wx/stattext.h"
-#include "wx/layout.h"
-#include "wx/dcclient.h"
-#include "wx/slider.h"
-#include "wx/sizer.h"
+    #include "wx/utils.h"
+    #include "wx/intl.h"
+    #include "wx/dialog.h"
+    #include "wx/listbox.h"
+    #include "wx/button.h"
+    #include "wx/stattext.h"
+    #include "wx/layout.h"
+    #include "wx/dcclient.h"
+    #include "wx/sizer.h"

 #endif
 
 #if wxUSE_STATLINE
     #include "wx/statline.h"
 #endif
 
 #endif
 
 #if wxUSE_STATLINE
     #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)


@@ -58,74 +63,77 @@ END_EVENT_TABLE()
  * Generic wxColourDialog
  */
 
  * Generic wxColourDialog
  */
 

-#define NUM_COLS 48
-static wxString wxColourDialogNames[NUM_COLS]={wxT("ORANGE"),
-            wxT("GOLDENROD"),
-            wxT("WHEAT"),
-            wxT("SPRING GREEN"),
-            wxT("SKY BLUE"),
-            wxT("SLATE BLUE"),
-            wxT("MEDIUM VIOLET RED"),
-            wxT("PURPLE"),
-
-            wxT("RED"),
-            wxT("YELLOW"),
-            wxT("MEDIUM SPRING GREEN"),
-            wxT("PALE GREEN"),
-            wxT("CYAN"),
-            wxT("LIGHT STEEL BLUE"),
-            wxT("ORCHID"),
-            wxT("LIGHT MAGENTA"),
-
-            wxT("BROWN"),
-            wxT("YELLOW"),
-            wxT("GREEN"),
-            wxT("CADET BLUE"),
-            wxT("MEDIUM BLUE"),
-            wxT("MAGENTA"),
-            wxT("MAROON"),
-            wxT("ORANGE RED"),
-
-            wxT("FIREBRICK"),
-            wxT("CORAL"),
-            wxT("FOREST GREEN"),
-            wxT("AQUAMARINE"),
-            wxT("BLUE"),
-            wxT("NAVY"),
-            wxT("THISTLE"),
-            wxT("MEDIUM VIOLET RED"),
-
-            wxT("INDIAN RED"),
-            wxT("GOLD"),
-            wxT("MEDIUM SEA GREEN"),
-            wxT("MEDIUM BLUE"),
-            wxT("MIDNIGHT BLUE"),
-            wxT("GREY"),
-            wxT("PURPLE"),
-            wxT("KHAKI"),
-
-            wxT("BLACK"),
-            wxT("MEDIUM FOREST GREEN"),
-            wxT("KHAKI"),
-            wxT("DARK GREY"),
-            wxT("SEA GREEN"),
-            wxT("LIGHT GREY"),
-            wxT("MEDIUM SLATE BLUE"),
-            wxT("WHITE")
-            };
+// don't change the number of elements (48) in this array, the code below is
+// hardcoded to use it
+static const wxChar *wxColourDialogNames[] =
+{
+    wxT("ORANGE"),
+    wxT("GOLDENROD"),
+    wxT("WHEAT"),
+    wxT("SPRING GREEN"),
+    wxT("SKY BLUE"),
+    wxT("SLATE BLUE"),
+    wxT("MEDIUM VIOLET RED"),
+    wxT("PURPLE"),
+
+    wxT("RED"),
+    wxT("YELLOW"),
+    wxT("MEDIUM SPRING GREEN"),
+    wxT("PALE GREEN"),
+    wxT("CYAN"),
+    wxT("LIGHT STEEL BLUE"),
+    wxT("ORCHID"),
+    wxT("LIGHT MAGENTA"),
+
+    wxT("BROWN"),
+    wxT("YELLOW"),
+    wxT("GREEN"),
+    wxT("CADET BLUE"),
+    wxT("MEDIUM BLUE"),
+    wxT("MAGENTA"),
+    wxT("MAROON"),
+    wxT("ORANGE RED"),
+
+    wxT("FIREBRICK"),
+    wxT("CORAL"),
+    wxT("FOREST GREEN"),
+    wxT("AQUAMARINE"),
+    wxT("BLUE"),
+    wxT("NAVY"),
+    wxT("THISTLE"),
+    wxT("MEDIUM VIOLET RED"),
+
+    wxT("INDIAN RED"),
+    wxT("GOLD"),
+    wxT("MEDIUM SEA GREEN"),
+    wxT("MEDIUM BLUE"),
+    wxT("MIDNIGHT BLUE"),
+    wxT("GREY"),
+    wxT("PURPLE"),
+    wxT("KHAKI"),
+
+    wxT("BLACK"),
+    wxT("MEDIUM FOREST GREEN"),
+    wxT("KHAKI"),
+    wxT("DARK GREY"),
+    wxT("SEA GREEN"),
+    wxT("LIGHT GREY"),
+    wxT("MEDIUM SLATE BLUE"),
+    wxT("WHITE")
+};

 
 wxGenericColourDialog::wxGenericColourDialog()
 {
   dialogParent = NULL;
   whichKind = 1;
 
 wxGenericColourDialog::wxGenericColourDialog()
 {
   dialogParent = NULL;
   whichKind = 1;

-  colourSelection = 0;
+  colourSelection = -1;

 }
 
 }
 

-wxGenericColourDialog::wxGenericColourDialog(wxWindow *parent, wxColourData *data):
-  wxDialog(parent, -1, wxT("Colour"), wxPoint(0, 0), wxSize(900, 900), wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL)
+wxGenericColourDialog::wxGenericColourDialog(wxWindow *parent,
+                                             wxColourData *data)

 {
   whichKind = 1;
 {
   whichKind = 1;

-  colourSelection = 0;
+  colourSelection = -1;

   Create(parent, data);
 }
 
   Create(parent, data);
 }
 


@@ -140,16 +148,20 @@ void wxGenericColourDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 
 bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data)
 {
 
 bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data)
 {

-  dialogParent = parent;
+    if ( !wxDialog::Create(parent, wxID_ANY, _("Choose colour"),
+                           wxPoint(0,0), wxSize(900, 900)) )
+        return false;
+
+    dialogParent = parent;

 
 

-  if (data)
-    colourData = *data;
+    if (data)
+        colourData = *data;

 
 

-  InitializeColours();
-  CalculateMeasurements();
-  CreateWidgets();
+    InitializeColours();
+    CalculateMeasurements();
+    CreateWidgets();

 
 

-  return TRUE;
+    return true;

 }
 
 int wxGenericColourDialog::ShowModal()
 }
 
 int wxGenericColourDialog::ShowModal()


@@ -166,6 +178,13 @@ void wxGenericColourDialog::OnMouseEvent(wxMouseEvent& event)
     int x = (int)event.GetX();
     int y = (int)event.GetY();
 
     int x = (int)event.GetX();
     int y = (int)event.GetY();
 

+#ifdef __WXPM__
+    // Handle OS/2's reverse coordinate system and account for the dialog title
+    int                             nClientHeight;
+
+    GetClientSize(NULL, &nClientHeight);
+    y = (nClientHeight - y) + 20;
+#endif

     if ((x >= standardColoursRect.x && x <= (standardColoursRect.x + standardColoursRect.width)) &&
         (y >= standardColoursRect.y && y <= (standardColoursRect.y + standardColoursRect.height)))
     {
     if ((x >= standardColoursRect.x && x <= (standardColoursRect.x + standardColoursRect.width)) &&
         (y >= standardColoursRect.y && y <= (standardColoursRect.y + standardColoursRect.height)))
     {


@@ -182,21 +201,27 @@ void wxGenericColourDialog::OnMouseEvent(wxMouseEvent& event)
       int ptr = (int)(selX + selY*8);
       OnCustomColourClick(ptr);
     }
       int ptr = (int)(selX + selY*8);
       OnCustomColourClick(ptr);
     }

+    else
+        event.Skip();

   }
   }

+  else
+      event.Skip();

 }
 
 void wxGenericColourDialog::OnPaint(wxPaintEvent& event)
 {
 }
 
 void wxGenericColourDialog::OnPaint(wxPaintEvent& event)
 {

-#ifndef __WXMOTIF__
-  wxDialog::OnPaint(event);
+#if !defined(__WXMOTIF__) && !defined(__WXPM__) && !defined(__WXCOCOA__)
+    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()


@@ -210,7 +235,11 @@ void wxGenericColourDialog::CalculateMeasurements()
   sectionSpacing = 15;
 
   standardColoursRect.x = 10;
   sectionSpacing = 15;
 
   standardColoursRect.x = 10;

+#ifdef __WXPM__
+  standardColoursRect.y = 15 + 20; /* OS/2 needs to account for dialog titlebar */
+#else

   standardColoursRect.y = 15;
   standardColoursRect.y = 15;

+#endif

   standardColoursRect.width = (8*smallRectangleSize.x) + (7*gridSpacing);
   standardColoursRect.height = (6*smallRectangleSize.y) + (5*gridSpacing);
 
   standardColoursRect.width = (8*smallRectangleSize.x) + (7*gridSpacing);
   standardColoursRect.height = (6*smallRectangleSize.y) + (5*gridSpacing);
 


@@ -233,42 +262,48 @@ void wxGenericColourDialog::CreateWidgets()
 {
     wxBeginBusyCursor();
 
 {
     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 );
+
+    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), wxSL_VERTICAL|wxSL_LABELS|wxSL_INVERSE);
+    greenSlider = new wxSlider(this, wxID_GREEN_SLIDER, colourData.m_dataColour.Green(), 0, 255,
+        wxDefaultPosition, wxSize(wxDefaultCoord, sliderHeight), wxSL_VERTICAL|wxSL_LABELS|wxSL_INVERSE);
+    blueSlider = new wxSlider(this, wxID_BLUE_SLIDER, colourData.m_dataColour.Blue(), 0, 255,
+        wxDefaultPosition, wxSize(wxDefaultCoord, sliderHeight), wxSL_VERTICAL|wxSL_LABELS|wxSL_INVERSE);

 
 

-    redSlider = new wxSlider(this, wxID_RED_SLIDER, 0, 0, 255,
-        wxPoint(sliderX, 10), wxSize(-1, sliderHeight), wxVERTICAL|wxSL_LABELS);
-    greenSlider = new wxSlider(this, wxID_GREEN_SLIDER, 0, 0, 255,
-        wxPoint(sliderX + sliderSpacing, 10), wxSize(-1, sliderHeight), wxVERTICAL|wxSL_LABELS);
-    blueSlider = new wxSlider(this, wxID_BLUE_SLIDER, 0, 0, 255,
-        wxPoint(sliderX + 2*sliderSpacing, 10), wxSize(-1, sliderHeight), wxVERTICAL|wxSL_LABELS);
+    wxBoxSizer *sliderSizer = new wxBoxSizer( wxHORIZONTAL );

 
 

-    wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
+    // 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

 
 

-    // 1) space for explicitly layouted controls
-    topsizer->Add( sliderX + 3*sliderSpacing, sliderHeight+25 );
-    

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

-    topsizer->Add( new wxStaticLine( this, -1 ), 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 );
 #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, wxEXPAND | wxALL, 10 );
+
+    SetAutoLayout( true );
+    SetSizer( topSizer );

 
 

-    SetAutoLayout( TRUE );
-    SetSizer( topsizer );
-    
-    topsizer->SetSizeHints( this );
-    topsizer->Fit( this );
+    topSizer->SetSizeHints( this );
+    topSizer->Fit( this );

 
     Centre( wxBOTH );
 
 
     Centre( wxBOTH );
 


@@ -277,26 +312,61 @@ void wxGenericColourDialog::CreateWidgets()
 
 void wxGenericColourDialog::InitializeColours(void)
 {
 
 void wxGenericColourDialog::InitializeColours(void)
 {

-  int i;
-  for (i = 0; i < 48; i++)
-  {
-    wxColour *col = wxTheColourDatabase->FindColour(wxColourDialogNames[i]);
-    if (col)
-      standardColours[i].Set(col->Red(), col->Green(), col->Blue());
-    else
-      standardColours[i].Set(0, 0, 0);
-  }
+    size_t i;

 
 

-  for (i = 0; i < 16; i++)
-    customColours[i] =
-/*
-#ifndef __VMS__
-     (wxColour&)
-#endif
-*/
-       colourData.GetCustomColour(i);
+    for (i = 0; i < WXSIZEOF(wxColourDialogNames); i++)
+    {
+        wxColour col = wxTheColourDatabase->Find(wxColourDialogNames[i]);
+        if (col.Ok())
+            standardColours[i].Set(col.Red(), col.Green(), col.Blue());
+        else
+            standardColours[i].Set(0, 0, 0);
+    }

 
 

-  singleCustomColour.Set(0, 0, 0);
+    for (i = 0; i < WXSIZEOF(customColours); i++)
+    {
+        wxColour c = colourData.GetCustomColour(i);
+        if (c.Ok())
+            customColours[i] = colourData.GetCustomColour(i);
+        else
+            customColours[i] = wxColour(255, 255, 255);
+    }
+
+    wxColour curr = colourData.GetColour();
+    if ( curr.Ok() )
+    {
+        bool initColourFound = false;
+
+        for (i = 0; i < WXSIZEOF(wxColourDialogNames); i++)
+        {
+            if ( standardColours[i] == curr && !initColourFound )
+            {
+                whichKind = 1;
+                colourSelection = i;
+                initColourFound = true;
+                break;
+            }
+        }
+        if ( !initColourFound )
+        {
+            for ( i = 0; i < WXSIZEOF(customColours); i++ )
+            {
+                if ( customColours[i] == curr )
+                {
+                    whichKind = 2;
+                    colourSelection = i;
+                    break;
+                }
+            }
+        }
+        colourData.m_dataColour.Set( curr.Red(), curr.Green(), curr.Blue() );
+    }
+    else
+    {
+        whichKind = 1;
+        colourSelection = 0;
+        colourData.m_dataColour.Set( 0, 0, 0 );
+    }

 }
 
 void wxGenericColourDialog::PaintBasicColours(wxDC& dc)
 }
 
 void wxGenericColourDialog::PaintBasicColours(wxDC& dc)


@@ -352,6 +422,9 @@ void wxGenericColourDialog::PaintCustomColours(wxDC& dc)
 
 void wxGenericColourDialog::PaintHighlight(wxDC& dc, bool draw)
 {
 
 void wxGenericColourDialog::PaintHighlight(wxDC& dc, bool draw)
 {

+  if ( colourSelection < 0 )
+      return;
+

   dc.BeginDrawing();
 
   // Number of pixels bigger than the standard rectangle size
   dc.BeginDrawing();
 
   // Number of pixels bigger than the standard rectangle size


@@ -403,7 +476,7 @@ void wxGenericColourDialog::PaintCustomColour(wxDC& dc)
 
   dc.SetPen(*wxBLACK_PEN);
 
 
   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,
   dc.SetBrush(*brush);
 
   dc.DrawRectangle( singleCustomColourRect.x, singleCustomColourRect.y,


@@ -417,37 +490,57 @@ void wxGenericColourDialog::PaintCustomColour(wxDC& dc)
 
 void wxGenericColourDialog::OnBasicColourClick(int which)
 {
 
 void wxGenericColourDialog::OnBasicColourClick(int which)
 {

-  wxClientDC dc(this);
+    wxClientDC dc(this);

 
 

-  PaintHighlight(dc, FALSE);
-  whichKind = 1;
-  colourSelection = which;
-  colourData.SetColour(standardColours[colourSelection]);
+    PaintHighlight(dc, false);
+    whichKind = 1;
+    colourSelection = which;
+
+#if wxUSE_SLIDER
+    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(),
+                                standardColours[colourSelection].Blue());

 
 

-  PaintHighlight(dc, TRUE);
+    PaintCustomColour(dc);
+    PaintHighlight(dc, true);

 }
 
 void wxGenericColourDialog::OnCustomColourClick(int which)
 {
 }
 
 void wxGenericColourDialog::OnCustomColourClick(int which)
 {

-  wxClientDC dc(this);
-  PaintHighlight(dc, FALSE);
-  whichKind = 2;
-  colourSelection = which;
-  colourData.SetColour(customColours[colourSelection]);
+    wxClientDC dc(this);
+    PaintHighlight(dc, false);
+    whichKind = 2;
+    colourSelection = which;
+
+#if wxUSE_SLIDER
+    redSlider->SetValue( customColours[colourSelection].Red() );
+    greenSlider->SetValue( customColours[colourSelection].Green() );
+    blueSlider->SetValue( customColours[colourSelection].Blue() );
+#endif // wxUSE_SLIDER

 
 

-  PaintHighlight(dc, TRUE);
+    colourData.m_dataColour.Set(customColours[colourSelection].Red(),
+                                customColours[colourSelection].Green(),
+                                customColours[colourSelection].Blue());
+
+    PaintCustomColour(dc);
+    PaintHighlight(dc, true);

 }
 
 /*
 void wxGenericColourDialog::OnOk(void)
 {
 }
 
 /*
 void wxGenericColourDialog::OnOk(void)
 {

-  Show(FALSE);
+  Show(false);

 }
 
 void wxGenericColourDialog::OnCancel(void)
 {
 }
 
 void wxGenericColourDialog::OnCancel(void)
 {

-  colourDialogCancelled = TRUE;
-  Show(FALSE);
+  colourDialogCancelled = true;
+  Show(false);

 }
 */
 
 }
 */
 


@@ -456,26 +549,30 @@ void wxGenericColourDialog::OnAddCustom(wxCommandEvent& WXUNUSED(event))
   wxClientDC dc(this);
   if (whichKind != 2)
   {
   wxClientDC dc(this);
   if (whichKind != 2)
   {

-    PaintHighlight(dc, FALSE);
+    PaintHighlight(dc, false);

     whichKind = 2;
     colourSelection = 0;
     whichKind = 2;
     colourSelection = 0;

-    PaintHighlight(dc, TRUE);
+    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);
 }
 
   colourData.SetCustomColour(colourSelection, customColours[colourSelection]);
 
   PaintCustomColours(dc);
 }
 

+#if wxUSE_SLIDER
+

 void wxGenericColourDialog::OnRedSlider(wxCommandEvent& WXUNUSED(event))
 {
   if (!redSlider)
     return;
 
   wxClientDC dc(this);
 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);
 }
 
   PaintCustomColour(dc);
 }
 


@@ -485,7 +582,7 @@ void wxGenericColourDialog::OnGreenSlider(wxCommandEvent& WXUNUSED(event))
     return;
 
   wxClientDC dc(this);
     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);
 }
 
   PaintCustomColour(dc);
 }
 


@@ -495,8 +592,10 @@ void wxGenericColourDialog::OnBlueSlider(wxCommandEvent& WXUNUSED(event))
     return;
 
   wxClientDC dc(this);
     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);
 }
 
   PaintCustomColour(dc);
 }
 

+#endif // wxUSE_SLIDER

 
 

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