X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..f54e5c1a4f6952c62ed4480f7d26feddc20f98ba:/include/wx/cmndata.h diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h index ca69e6e107..31269412d8 100644 --- a/include/wx/cmndata.h +++ b/include/wx/cmndata.h @@ -46,16 +46,18 @@ 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; bool FromString(const wxString& str); -public: // TODO: make these fields private + + // public for backwards compatibility only: don't use directly +public: wxColour m_dataColour; wxColour m_custColours[NUM_CUSTOM]; bool m_chooseFull; @@ -226,7 +228,7 @@ public: wxString GetFilename() const { return m_filename; } void SetFilename( const wxString &filename ) { m_filename = filename; } - void operator=(const wxPrintData& data); + wxPrintData& operator=(const wxPrintData& data); char* GetPrivData() const { return m_privData; } int GetPrivDataLen() const { return m_privDataLen; }