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

removed non-const wxFontData::GetColour()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-11-21 21:28:40 +00:00
parent 50a32a83d7
commit aae53500af
2 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/changes.txt
View File

@@ -2,6 +2,12 @@
wxWidgets Change Log - For more verbose changes, see the manual wxWidgets Change Log - For more verbose changes, see the manual
--------------------------------------------------------------- ---------------------------------------------------------------
INCOMPATIBLE CHANGES SINCE 2.6.x
================================
- wxFontData::GetColour() now returns a const colour
2.7.0 2.7.0
----- -----

34
include/wx/cmndata.h
View File

@@ -54,24 +54,24 @@ private:
DECLARE_DYNAMIC_CLASS(wxColourData) DECLARE_DYNAMIC_CLASS(wxColourData)
}; };
class WXDLLEXPORT wxFontData: public wxObject class WXDLLEXPORT wxFontData : public wxObject
{ {
public: public:
wxFontData(); wxFontData();
~wxFontData(); virtual ~wxFontData();
wxFontData(const wxFontData& data) wxFontData(const wxFontData& data)
: wxObject() : wxObject(),
, m_fontColour(data.m_fontColour) m_fontColour(data.m_fontColour),
, m_showHelp(data.m_showHelp) m_showHelp(data.m_showHelp),
, m_allowSymbols(data.m_allowSymbols) m_allowSymbols(data.m_allowSymbols),
, m_enableEffects(data.m_enableEffects) m_enableEffects(data.m_enableEffects),
, m_initialFont(data.m_initialFont) m_initialFont(data.m_initialFont),
, m_chosenFont(data.m_chosenFont) m_chosenFont(data.m_chosenFont),
, m_minSize(data.m_minSize) m_minSize(data.m_minSize),
, m_maxSize(data.m_maxSize) m_maxSize(data.m_maxSize),
, m_encoding(data.m_encoding) m_encoding(data.m_encoding),
, m_encodingInfo(data.m_encodingInfo) m_encodingInfo(data.m_encodingInfo)
{ {
} }
@@ -86,8 +86,8 @@ public:
m_chosenFont = data.m_chosenFont; m_chosenFont = data.m_chosenFont;
m_minSize = data.m_minSize; m_minSize = data.m_minSize;
m_maxSize = data.m_maxSize; m_maxSize = data.m_maxSize;
m_encoding = data.m_encoding; m_encoding = data.m_encoding;
m_encodingInfo = data.m_encodingInfo; m_encodingInfo = data.m_encodingInfo;
return *this; return *this;
} }
@@ -95,7 +95,7 @@ public:
bool GetAllowSymbols() const { return m_allowSymbols; } bool GetAllowSymbols() const { return m_allowSymbols; }
void SetColour(const wxColour& colour) { m_fontColour = colour; } void SetColour(const wxColour& colour) { m_fontColour = colour; }
wxColour &GetColour() { return m_fontColour; } const wxColour& GetColour() const { return m_fontColour; }
void SetShowHelp(bool flag) { m_showHelp = flag; } void SetShowHelp(bool flag) { m_showHelp = flag; }
bool GetShowHelp() const { return m_showHelp; } bool GetShowHelp() const { return m_showHelp; }
@@ -119,6 +119,8 @@ public:
wxNativeEncodingInfo& EncodingInfo() { return m_encodingInfo; } wxNativeEncodingInfo& EncodingInfo() { return m_encodingInfo; }
// public for backwards compatibility only: don't use directly
public: public:
wxColour m_fontColour; wxColour m_fontColour;
bool m_showHelp; bool m_showHelp;