changed wxColourData::GetCustomColour to const; there's no reason for it to be non...

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

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index ca69e6e10764121964b09b787b1469dd4079b2bf..1540716412b29433af511f970f092aaeea3f4042 100644 (file)
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -46,10 +46,10 @@ public:
     const wxColour& GetColour() const { return m_dataColour; }
     wxColour& GetColour() { return m_dataColour; }
 
-    // These functions modify colours in an internal array of NUM_CUSTOM custom
-    // colours
+    // SetCustomColour() modifies colours in an internal array of NUM_CUSTOM
+    // custom colours;
     void SetCustomColour(int i, const wxColour& colour);
-    wxColour GetCustomColour(int i);
+    wxColour GetCustomColour(int i) const;
 
     // Serialize the object to a string and restore it from it
     wxString ToString() const;

diff --git a/interface/wx/cmndata.h b/interface/wx/cmndata.h
index 4c59595f7fc7f82d249b42b99e3a0be623fc0a75..b80af16af7d8cb31ef447de9861bc007609f8197 100644 (file)
--- a/interface/wx/cmndata.h
+++ b/interface/wx/cmndata.h
@@ -393,7 +393,7 @@ public:
             that the user has saved. The default custom colours are invalid
             colours.
     */
-    wxColour& GetCustomColour(int i) const;
+    wxColour GetCustomColour(int i) const;
 
     /**
         Under Windows, tells the Windows colour dialog to display the full
@@ -424,6 +424,11 @@ public:
         Assignment operator for the colour data.
     */
     void operator =(const wxColourData& data);
+
+
+    /** @todo document these */
+    wxString wxColourData::ToString() const;
+    bool wxColourData::FromString(const wxString& str);
 };
 
 
@@ -464,7 +469,7 @@ enum wxPrintBin
     between the print dialogs and the application.
 
     @remarks
-    
+
     The following functions are specific to PostScript printing and have not
     yet been documented:
 
@@ -819,7 +824,7 @@ public:
 
         Determines whether the dialog to be shown will be the Print dialog
         (pass @false) or Print Setup dialog (pass @true).
-        
+
     */
     void SetSetupDialog(bool flag);
 

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 3c04d1d0b961b7e4b4eca4ecf0014578a3989e5c..8c1309a9df952f079f430eed5cfcd299cec87b10 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -92,7 +92,7 @@ void wxColourData::SetCustomColour(int i, const wxColour& colour)
     m_custColours[i] = colour;
 }
 
-wxColour wxColourData::GetCustomColour(int i)
+wxColour wxColourData::GetCustomColour(int i) const
 {
     wxCHECK_MSG( i >= 0 && i < NUM_CUSTOM, wxColour(0,0,0),
                  _T("custom colour index out of range") );