projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't use the hack with adding hidden columns to the native control because it doesn...
[wxWidgets.git]
/
include
/
wx
/
cmndata.h
diff --git
a/include/wx/cmndata.h
b/include/wx/cmndata.h
index 36ec15df725d836d2a6b2428b5c9a8eb0bbf6262..31269412d8b4f96231e8f610a3c5194d4ac397e9 100644
(file)
--- a/
include/wx/cmndata.h
+++ b/
include/wx/cmndata.h
@@
-55,7
+55,9
@@
public:
wxString ToString() const;
bool FromString(const wxString& str);
wxString ToString() const;
bool FromString(const wxString& str);
-private:
+
+ // public for backwards compatibility only: don't use directly
+public:
wxColour m_dataColour;
wxColour m_custColours[NUM_CUSTOM];
bool m_chooseFull;
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; }
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; }
char* GetPrivData() const { return m_privData; }
int GetPrivDataLen() const { return m_privDataLen; }