Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

preserve custom colours between calls to wxGetColourFromUser(), also allow passing a custom wxColourData to it (modified patch 1832582)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-11-18 19:33:34 +00:00
parent 2349ba4cf9
commit e6ef9ea4ed
7 changed files with 162 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/wx/cmndata.h
View File

@@ -26,11 +26,18 @@
class WXDLLIMPEXP_FWD_CORE wxPrintNativeDataBase;
class WXDLLEXPORT wxColourData: public wxObject
class WXDLLEXPORT wxColourData : public wxObject
{
public:
// number of custom colours we store
enum
{
NUM_CUSTOM = 16
};
wxColourData();
wxColourData(const wxColourData& data);
void operator=(const wxColourData&);
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; }
// 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 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_custColours[16];
wxColour m_custColours[NUM_CUSTOM];
bool m_chooseFull;
private: