X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7d610b90ffb5c212b429c717ebae5f605fc5fac7..3fbcc7fce5cb170b1a7cbc9c22299e44152cb1f7:/src/generic/colrdlgg.cpp

diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp
index e4b06443bb..bc7ea6f7eb 100644
--- a/src/generic/colrdlgg.cpp
+++ b/src/generic/colrdlgg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        colrdlgg.cpp
+// Name:        generic/colrdlgg.cpp
 // Purpose:     Choice dialogs
 // Author:      Julian Smart
 // Modified by:
@@ -17,22 +17,22 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
+#if wxUSE_COLOURDLG
+
 #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/slider.h"
+    #include "wx/sizer.h"
 #endif
 
 #if wxUSE_STATLINE
@@ -118,14 +118,14 @@ wxGenericColourDialog::wxGenericColourDialog()
 {
   dialogParent = NULL;
   whichKind = 1;
-  colourSelection = 0;
+  colourSelection = -1;
 }
 
 wxGenericColourDialog::wxGenericColourDialog(wxWindow *parent,
                                              wxColourData *data)
 {
   whichKind = 1;
-  colourSelection = 0;
+  colourSelection = -1;
   Create(parent, data);
 }
 
@@ -187,12 +187,16 @@ void wxGenericColourDialog::OnMouseEvent(wxMouseEvent& event)
       int ptr = (int)(selX + selY*8);
       OnCustomColourClick(ptr);
     }
+    else
+        event.Skip();
   }
+  else
+      event.Skip();
 }
 
 void wxGenericColourDialog::OnPaint(wxPaintEvent& event)
 {
-#if !defined(__WXMOTIF__) && !defined(__WXMAC__)
+#if !defined(__WXMOTIF__) && !defined(__WXMAC__) && !defined(__WXPM__)
   wxDialog::OnPaint(event);
 #endif
 
@@ -247,18 +251,18 @@ void wxGenericColourDialog::CreateWidgets()
     int sliderHeight = 160;
 #endif
 
-    redSlider = new wxSlider(this, wxID_RED_SLIDER, 0, 0, 255,
+    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, 0, 0, 255,
+    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, 0, 0, 255,
+    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 );
@@ -271,7 +275,7 @@ void wxGenericColourDialog::CreateWidgets()
 
     SetAutoLayout( TRUE );
     SetSizer( topsizer );
-    
+
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
 
@@ -282,26 +286,58 @@ void wxGenericColourDialog::CreateWidgets()
 
 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);
-  }
+    int i;
 
-  for (i = 0; i < 16; i++)
-    customColours[i] =
-/*
-#ifndef __VMS__
-     (wxColour&)
-#endif
-*/
-       colourData.GetCustomColour(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);
+    }
 
-  singleCustomColour.Set(0, 0, 0);
+    for (i = 0; i < 16; i++)
+    {
+        customColours[i] = colourData.GetCustomColour(i);
+    }
+
+    wxColour curr = colourData.GetColour();
+    if ( curr.Ok() )
+    {
+        bool initColourFound = FALSE;
+
+        for (i = 0; i < 48; 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)
@@ -357,6 +393,9 @@ void wxGenericColourDialog::PaintCustomColours(wxDC& dc)
 
 void wxGenericColourDialog::PaintHighlight(wxDC& dc, bool draw)
 {
+  if ( colourSelection < 0 )
+      return;
+
   dc.BeginDrawing();
 
   // Number of pixels bigger than the standard rectangle size
@@ -428,8 +467,13 @@ void wxGenericColourDialog::OnBasicColourClick(int which)
   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)
@@ -439,7 +483,11 @@ void wxGenericColourDialog::OnCustomColourClick(int which)
   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);
 }
 
@@ -504,4 +552,5 @@ void wxGenericColourDialog::OnBlueSlider(wxCommandEvent& WXUNUSED(event))
   PaintCustomColour(dc);
 }
 
+#endif // wxUSE_COLOURDLG