corrected/removed forward declarations

[wxWidgets.git] / include / wx / cmndata.h

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index 5aa5f102f7fb892ff82df56a2c87351ac88de208..0bfced12f30240f9d264b63315c0a2e8a16b5126 100644 (file)
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -26,11 +26,18 @@
 class WXDLLIMPEXP_FWD_CORE wxPrintNativeDataBase;
 
 
 class WXDLLIMPEXP_FWD_CORE wxPrintNativeDataBase;
 
 

-class WXDLLEXPORT wxColourData: public wxObject
+class WXDLLEXPORT wxColourData : public wxObject

 {
 public:
 {
 public:

+    // number of custom colours we store
+    enum
+    {
+        NUM_CUSTOM = 16
+    };
+

     wxColourData();
     wxColourData(const wxColourData& data);
     wxColourData();
     wxColourData(const wxColourData& data);

+    wxColourData& operator=(const wxColourData& data);

     virtual ~wxColourData();
 
     void SetChooseFull(bool flag) { m_chooseFull = flag; }
     virtual ~wxColourData();
 
     void SetChooseFull(bool flag) { m_chooseFull = flag; }


@@ -39,15 +46,18 @@ public:
     const wxColour& GetColour() const { return m_dataColour; }
     wxColour& GetColour() { return m_dataColour; }
 
     const wxColour& GetColour() const { return m_dataColour; }
     wxColour& GetColour() { return m_dataColour; }
 

-    // Array of 16 custom colours
+    // These functions modify colours in an internal array of NUM_CUSTOM custom
+    // colours

     void SetCustomColour(int i, const wxColour& colour);
     wxColour GetCustomColour(int i);
 
     void SetCustomColour(int i, const wxColour& colour);
     wxColour GetCustomColour(int i);
 

-    void operator=(const wxColourData& data);
+    // Serialize the object to a string and restore it from it
+    wxString ToString() const;
+    bool FromString(const wxString& str);

 
 

-public:
+public: // TODO: make these fields private

     wxColour        m_dataColour;
     wxColour        m_dataColour;

-    wxColour        m_custColours[16];
+    wxColour        m_custColours[NUM_CUSTOM];

     bool            m_chooseFull;
 
 private:
     bool            m_chooseFull;
 
 private: