rtti api mods added

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

diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp
index f04731070bd738cf692d20d846a2a1765f9d913d..494858f390672cc8e9112421cc6afb11eaf90e6d 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,139 +17,150 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_COLOURDLG
+

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

 #endif
 
 #include "wx/generic/colrdlgg.h"
 
 #endif
 
 #include "wx/generic/colrdlgg.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog)
 
 BEGIN_EVENT_TABLE(wxGenericColourDialog, wxDialog)
 IMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog)
 
 BEGIN_EVENT_TABLE(wxGenericColourDialog, wxDialog)

-       EVT_BUTTON(wxID_ADD_CUSTOM, wxGenericColourDialog::OnAddCustom)
-       EVT_SLIDER(wxID_RED_SLIDER, wxGenericColourDialog::OnRedSlider)
-       EVT_SLIDER(wxID_GREEN_SLIDER, wxGenericColourDialog::OnGreenSlider)
-       EVT_SLIDER(wxID_BLUE_SLIDER, wxGenericColourDialog::OnBlueSlider)
-       EVT_PAINT(wxGenericColourDialog::OnPaint)
-       EVT_MOUSE_EVENTS(wxGenericColourDialog::OnMouseEvent)
-       EVT_CLOSE(wxGenericColourDialog::OnCloseWindow)
+    EVT_BUTTON(wxID_ADD_CUSTOM, wxGenericColourDialog::OnAddCustom)
+    EVT_SLIDER(wxID_RED_SLIDER, wxGenericColourDialog::OnRedSlider)
+    EVT_SLIDER(wxID_GREEN_SLIDER, wxGenericColourDialog::OnGreenSlider)
+    EVT_SLIDER(wxID_BLUE_SLIDER, wxGenericColourDialog::OnBlueSlider)
+    EVT_PAINT(wxGenericColourDialog::OnPaint)
+    EVT_MOUSE_EVENTS(wxGenericColourDialog::OnMouseEvent)
+    EVT_CLOSE(wxGenericColourDialog::OnCloseWindow)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-#endif

 
 /*
  * Generic wxColourDialog
  */
 
 
 /*
  * Generic wxColourDialog
  */
 

-#define NUM_COLS 48
-static wxString wxColourDialogNames[NUM_COLS]={_T("ORANGE"),
-                                   _T("GOLDENROD"),
-                                   _T("WHEAT"),
-                                   _T("SPRING GREEN"),
-                                   _T("SKY BLUE"),
-                                   _T("SLATE BLUE"),
-                                   _T("MEDIUM VIOLET RED"),
-                                   _T("PURPLE"),
-
-                                   _T("RED"),
-                                   _T("YELLOW"),
-                                   _T("MEDIUM SPRING GREEN"),
-                                   _T("PALE GREEN"),
-                                   _T("CYAN"),
-                                   _T("LIGHT STEEL BLUE"),
-                                   _T("ORCHID"),
-                                   _T("LIGHT MAGENTA"),
-                                   
-                                   _T("BROWN"),
-                                   _T("YELLOW"),
-                                   _T("GREEN"),
-                                   _T("CADET BLUE"),
-                                   _T("MEDIUM BLUE"),
-                                   _T("MAGENTA"),
-                                   _T("MAROON"),
-                                   _T("ORANGE RED"),
-
-                                   _T("FIREBRICK"),
-                                   _T("CORAL"),
-                                   _T("FOREST GREEN"),
-                                   _T("AQUAMARINE"),
-                                   _T("BLUE"),
-                                   _T("NAVY"),
-                                   _T("THISTLE"),
-                                   _T("MEDIUM VIOLET RED"),
-                                   
-                                   _T("INDIAN RED"),
-                                   _T("GOLD"),
-                                   _T("MEDIUM SEA GREEN"),
-                                   _T("MEDIUM BLUE"),
-                                   _T("MIDNIGHT BLUE"),
-                                   _T("GREY"),
-                                   _T("PURPLE"),
-                                   _T("KHAKI"),
-                                   
-                                   _T("BLACK"),
-                                   _T("MEDIUM FOREST GREEN"),
-                                   _T("KHAKI"),
-                                   _T("DARK GREY"),
-                                   _T("SEA GREEN"),
-                                   _T("LIGHT GREY"),
-                                   _T("MEDIUM SLATE BLUE"),
-                                   _T("WHITE")
-                                   };
-
-wxGenericColourDialog::wxGenericColourDialog(void)
+// 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;
 {
   dialogParent = NULL;
   whichKind = 1;

-  colourSelection = 0;
+  colourSelection = -1;

 }
 
 }
 

-wxGenericColourDialog::wxGenericColourDialog(wxWindow *parent, wxColourData *data):
-  wxDialog(parent, -1, "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);
 }
 

-wxGenericColourDialog::~wxGenericColourDialog(void)
+wxGenericColourDialog::~wxGenericColourDialog()

 {
 }
 
 {
 }
 

-void wxGenericColourDialog::OnCloseWindow(wxCloseEvent& event)
+void wxGenericColourDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))

 {
   EndModal(wxID_CANCEL);
 }
 
 bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data)
 {
 {
   EndModal(wxID_CANCEL);
 }
 
 bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data)
 {

-  dialogParent = parent;
-  
-  if (data)
-    colourData = *data;
-
-  InitializeColours();
-  CalculateMeasurements();
-  CreateWidgets();
-  
-  return TRUE;
+    if ( !wxDialog::Create(parent, -1, wxT("Colour"),
+                           wxPoint(0, 0), wxSize(900, 900),
+                           wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL) )
+        return FALSE;
+
+    dialogParent = parent;
+
+    if (data)
+        colourData = *data;
+
+    InitializeColours();
+    CalculateMeasurements();
+    CreateWidgets();
+
+    return TRUE;

 }
 
 }
 

-int wxGenericColourDialog::ShowModal(void)
+int wxGenericColourDialog::ShowModal()

 {
   return wxDialog::ShowModal();
 }
 {
   return wxDialog::ShowModal();
 }


@@ -163,6 +174,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)))
     {


@@ -179,12 +197,18 @@ 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)
 {

+#if !defined(__WXMOTIF__) && !defined(__WXMAC__) && !defined(__WXPM__) && !defined(__WXCOCOA__)

   wxDialog::OnPaint(event);
   wxDialog::OnPaint(event);

+#endif

 
   wxPaintDC dc(this);
 
 
   wxPaintDC dc(this);
 


@@ -194,7 +218,7 @@ void wxGenericColourDialog::OnPaint(wxPaintEvent& event)
   PaintHighlight(dc, TRUE);
 }
 
   PaintHighlight(dc, TRUE);
 }
 

-void wxGenericColourDialog::CalculateMeasurements(void)
+void wxGenericColourDialog::CalculateMeasurements()

 {
   smallRectangleSize.x = 18;
   smallRectangleSize.y = 14;
 {
   smallRectangleSize.x = 18;
   smallRectangleSize.y = 14;


@@ -205,7 +229,11 @@ void wxGenericColourDialog::CalculateMeasurements(void)
   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);
 


@@ -224,64 +252,106 @@ void wxGenericColourDialog::CalculateMeasurements(void)
   buttonY = customColoursRect.y + customColoursRect.height + 10;
 }
 
   buttonY = customColoursRect.y + customColoursRect.height + 10;
 }
 

-void wxGenericColourDialog::CreateWidgets(void)
+void wxGenericColourDialog::CreateWidgets()

 {
 {

-  wxBeginBusyCursor();
-  
-  wxButton *okButton = new wxButton(this, wxID_OK, _("OK"), wxPoint(okButtonX, buttonY), wxSize(75,-1) );
-  int bw, bh;
-  okButton->GetSize(&bw, &bh);
-
-  (void) new wxButton(this, wxID_CANCEL, _("Cancel"), wxPoint(okButtonX + bw + 20, buttonY), wxSize(75,-1));
-  (void) new wxButton(this, wxID_ADD_CUSTOM, _("Add to custom colours"),
-     wxPoint(customButtonX, buttonY));
-
-  int sliderX = singleCustomColourRect.x + singleCustomColourRect.width + sectionSpacing;
-#ifdef __X__
-  int sliderSpacing = 75;
-  int sliderHeight = 160;
+    wxBeginBusyCursor();
+
+    int sliderX = singleCustomColourRect.x + singleCustomColourRect.width + sectionSpacing;
+#if defined(__WXMOTIF__)
+    int sliderSpacing = 65;
+    int sliderHeight = 160;

 #else
 #else

-  int sliderSpacing = 45;
-  int sliderHeight = 160;
+    int sliderSpacing = 45;
+    int sliderHeight = 160;

 #endif
 #endif

-  
-  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);

 
 

-  SetClientSize(sliderX + 3*sliderSpacing, buttonY + 40);
-  okButton->SetDefault();
+    redSlider = new wxSlider(this, wxID_RED_SLIDER, singleCustomColour.Red(), 0, 255,
+        wxPoint(sliderX, 10), wxSize(-1, sliderHeight), wxVERTICAL|wxSL_LABELS);
+    greenSlider = new wxSlider(this, wxID_GREEN_SLIDER, singleCustomColour.Green(), 0, 255,
+        wxPoint(sliderX + sliderSpacing, 10), wxSize(-1, sliderHeight), wxVERTICAL|wxSL_LABELS);
+    blueSlider = new wxSlider(this, wxID_BLUE_SLIDER, singleCustomColour.Blue(), 0, 255,
+        wxPoint(sliderX + 2*sliderSpacing, 10), wxSize(-1, sliderHeight), wxVERTICAL|wxSL_LABELS);
+
+    wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
+
+    // 1) space for explicitly layouted controls
+    topsizer->Add( sliderX + 3*sliderSpacing, sliderHeight+25 );
+
+#if wxUSE_STATLINE
+    // 2) static line
+    topsizer->Add( new wxStaticLine( this, -1 ), 0, wxEXPAND | wxLEFT|wxRIGHT|wxTOP, 10 );
+#endif

 
 

-  Centre(wxBOTH);
+    // 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 );

 
 

-  wxEndBusyCursor();
+    SetAutoLayout( TRUE );
+    SetSizer( topsizer );
+
+    topsizer->SetSizeHints( this );
+    topsizer->Fit( this );
+
+    Centre( wxBOTH );
+
+    wxEndBusyCursor();

 }
 
 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->FindColour(wxColourDialogNames[i]);
+        if (col)
+            standardColours[i].Set(col->Red(), col->Green(), col->Blue());
+        else
+            standardColours[i].Set(0, 0, 0);
+    }
+
+    for (i = 0; i < 16; i++)
+    {
+        customColours[i] = colourData.GetCustomColour(i);
+    }

 
 

-  singleCustomColour.Set(0, 0, 0);
+    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 < 16; i++ )
+            {
+                if ( customColours[i] == curr )
+                {
+                    whichKind = 2;
+                    colourSelection = i;
+                    initColourFound = TRUE;
+                    break;
+                }
+            }
+        }
+        singleCustomColour.Set( curr.Red(), curr.Green(), curr.Blue() );
+    }
+    else
+    {
+        whichKind = 1;
+        colourSelection = 0;
+        singleCustomColour.Set( 0, 0, 0 );
+    }

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


@@ -295,7 +365,7 @@ void wxGenericColourDialog::PaintBasicColours(wxDC& dc)
     for (j = 0; j < 8; j++)
     {
       int ptr = i*8 + j;
     for (j = 0; j < 8; j++)
     {
       int ptr = i*8 + j;

-      
+

       int x = (j*(smallRectangleSize.x+gridSpacing) + standardColoursRect.x);
       int y = (i*(smallRectangleSize.y+gridSpacing) + standardColoursRect.y);
 
       int x = (j*(smallRectangleSize.x+gridSpacing) + standardColoursRect.x);
       int y = (i*(smallRectangleSize.y+gridSpacing) + standardColoursRect.y);
 


@@ -320,7 +390,7 @@ void wxGenericColourDialog::PaintCustomColours(wxDC& dc)
     for (j = 0; j < 8; j++)
     {
       int ptr = i*8 + j;
     for (j = 0; j < 8; j++)
     {
       int ptr = i*8 + j;

-      
+

       int x = (j*(smallRectangleSize.x+gridSpacing)) + customColoursRect.x;
       int y = (i*(smallRectangleSize.y+gridSpacing)) + customColoursRect.y;
 
       int x = (j*(smallRectangleSize.x+gridSpacing)) + customColoursRect.x;
       int y = (i*(smallRectangleSize.y+gridSpacing)) + customColoursRect.y;
 


@@ -337,6 +407,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


@@ -374,18 +447,18 @@ void wxGenericColourDialog::PaintHighlight(wxDC& dc, bool draw)
       dc.SetPen(*wxBLACK_PEN);
     else
       dc.SetPen(*wxLIGHT_GREY_PEN);
       dc.SetPen(*wxBLACK_PEN);
     else
       dc.SetPen(*wxLIGHT_GREY_PEN);

-      
+

     dc.SetBrush(*wxTRANSPARENT_BRUSH);
     dc.DrawRectangle( x, y, (smallRectangleSize.x + (2*deltaX)), (smallRectangleSize.y + (2*deltaY)));
   }
     dc.SetBrush(*wxTRANSPARENT_BRUSH);
     dc.DrawRectangle( x, y, (smallRectangleSize.x + (2*deltaX)), (smallRectangleSize.y + (2*deltaY)));
   }

-  
+

   dc.EndDrawing();
 }
 
 void wxGenericColourDialog::PaintCustomColour(wxDC& dc)
 {
   dc.BeginDrawing();
   dc.EndDrawing();
 }
 
 void wxGenericColourDialog::PaintCustomColour(wxDC& dc)
 {
   dc.BeginDrawing();

-  
+

   dc.SetPen(*wxBLACK_PEN);
 
   wxBrush *brush = new wxBrush(singleCustomColour, wxSOLID);
   dc.SetPen(*wxBLACK_PEN);
 
   wxBrush *brush = new wxBrush(singleCustomColour, wxSOLID);


@@ -408,8 +481,13 @@ void wxGenericColourDialog::OnBasicColourClick(int which)
   whichKind = 1;
   colourSelection = which;
   colourData.SetColour(standardColours[colourSelection]);
   whichKind = 1;
   colourSelection = which;
   colourData.SetColour(standardColours[colourSelection]);

+  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());

 
 

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

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


@@ -419,7 +497,11 @@ void wxGenericColourDialog::OnCustomColourClick(int which)
   whichKind = 2;
   colourSelection = which;
   colourData.SetColour(customColours[colourSelection]);
   whichKind = 2;
   colourSelection = which;
   colourData.SetColour(customColours[colourSelection]);

-
+  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());
+  PaintCustomColour(dc);

   PaintHighlight(dc, TRUE);
 }
 
   PaintHighlight(dc, TRUE);
 }
 


@@ -450,7 +532,7 @@ void wxGenericColourDialog::OnAddCustom(wxCommandEvent& WXUNUSED(event))
   customColours[colourSelection].Set(singleCustomColour.Red(), singleCustomColour.Green(), singleCustomColour.Blue());
   colourData.SetColour(customColours[colourSelection]);
   colourData.SetCustomColour(colourSelection, customColours[colourSelection]);
   customColours[colourSelection].Set(singleCustomColour.Red(), singleCustomColour.Green(), singleCustomColour.Blue());
   colourData.SetColour(customColours[colourSelection]);
   colourData.SetCustomColour(colourSelection, customColours[colourSelection]);

-  
+

   PaintCustomColours(dc);
 }
 
   PaintCustomColours(dc);
 }
 


@@ -458,7 +540,7 @@ void wxGenericColourDialog::OnRedSlider(wxCommandEvent& WXUNUSED(event))
 {
   if (!redSlider)
     return;
 {
   if (!redSlider)
     return;

-    
+

   wxClientDC dc(this);
   singleCustomColour.Set(redSlider->GetValue(), singleCustomColour.Green(), singleCustomColour.Blue());
   PaintCustomColour(dc);
   wxClientDC dc(this);
   singleCustomColour.Set(redSlider->GetValue(), singleCustomColour.Green(), singleCustomColour.Blue());
   PaintCustomColour(dc);


@@ -484,4 +566,5 @@ void wxGenericColourDialog::OnBlueSlider(wxCommandEvent& WXUNUSED(event))
   PaintCustomColour(dc);
 }
 
   PaintCustomColour(dc);
 }
 

+#endif // wxUSE_COLOURDLG