remember custom palette changes done in wxColourDialog

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index a2fd69d7ac4108b50b0e802a8411e0ef319feb09..7eb014a3a8e388f79ade2e07281f6078a78a410b 100644 (file)
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -224,30 +224,26 @@ MyFrame::MyFrame(wxWindow *parent,
     m_dlgFind =
     m_dlgReplace = NULL;
 #endif
     m_dlgFind =
     m_dlgReplace = NULL;
 #endif

+    
+    m_clrData.SetChooseFull(true);
+    for (int i = 0; i < 16; i++)
+    {
+        m_clrData.SetCustomColour(i, wxColour(i*16, i*16, i*16));
+    }

    
     CreateStatusBar();
 }
 
 void MyFrame::ChooseColour(wxCommandEvent& WXUNUSED(event) )
 {
    
     CreateStatusBar();
 }
 
 void MyFrame::ChooseColour(wxCommandEvent& WXUNUSED(event) )
 {

-    wxColour col = myCanvas->GetBackgroundColour();
-
-    wxColourData data;
-    data.SetColour(col);
-    data.SetChooseFull(TRUE);
-    for (int i = 0; i < 16; i++)
-    {
-        wxColour colour(i*16, i*16, i*16);
-        data.SetCustomColour(i, colour);
-    }
+    m_clrData.SetColour(myCanvas->GetBackgroundColour());

 
 

-    wxColourDialog dialog(this, &data);
+    wxColourDialog dialog(this, &m_clrData);

     dialog.SetTitle(_T("Choose the background colour"));
     if (dialog.ShowModal() == wxID_OK)
     {
     dialog.SetTitle(_T("Choose the background colour"));
     if (dialog.ShowModal() == wxID_OK)
     {

-        wxColourData retData = dialog.GetColourData();
-        col = retData.GetColour();
-        myCanvas->SetBackgroundColour(col);
+        m_clrData = dialog.GetColourData();
+        myCanvas->SetBackgroundColour(m_clrData.GetColour());

         myCanvas->ClearBackground();
         myCanvas->Refresh();
     }
         myCanvas->ClearBackground();
         myCanvas->Refresh();
     }

diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index dda293bf167e03b2479dfa2727a7a55e6005600b..8b734dcacf6a48c00f7774c47e91b525a7d3a2e7 100644 (file)
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -109,6 +109,8 @@ private:
                         *m_dlgReplace;
 #endif // wxUSE_FINDREPLDLG
 
                         *m_dlgReplace;
 #endif // wxUSE_FINDREPLDLG
 

+    wxColourData m_clrData;
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };