projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix compuation of dirty cells when the columns are reordered, this didn't work at...
[wxWidgets.git]
/
include
/
wx
/
cmndata.h
diff --git
a/include/wx/cmndata.h
b/include/wx/cmndata.h
index 630415f4c359b166405906d506265c0abb003dee..31269412d8b4f96231e8f610a3c5194d4ac397e9 100644
(file)
--- a/
include/wx/cmndata.h
+++ b/
include/wx/cmndata.h
@@
-26,7
+26,7
@@
class WXDLLIMPEXP_FWD_CORE wxPrintNativeDataBase;
class WXDLLIMPEXP_FWD_CORE wxPrintNativeDataBase;
-class WXDLL
EXPORT
wxColourData : public wxObject
+class WXDLL
IMPEXP_CORE
wxColourData : public wxObject
{
public:
// number of custom colours we store
{
public:
// number of custom colours we store
@@
-46,16
+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; }
- //
These functions modify colours in an internal array of NUM_CUSTOM custom
- // c
olours
+ //
SetCustomColour() modifies colours in an internal array of NUM_CUSTOM
+ // c
ustom colours;
void SetCustomColour(int i, const wxColour& colour);
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);
// 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;
wxColour m_dataColour;
wxColour m_custColours[NUM_CUSTOM];
bool m_chooseFull;
@@
-64,7
+66,7
@@
private:
DECLARE_DYNAMIC_CLASS(wxColourData)
};
DECLARE_DYNAMIC_CLASS(wxColourData)
};
-class WXDLL
EXPORT
wxFontData : public wxObject
+class WXDLL
IMPEXP_CORE
wxFontData : public wxObject
{
public:
wxFontData();
{
public:
wxFontData();
@@
-181,7
+183,7
@@
enum wxPrintBin
const int wxPRINTMEDIA_DEFAULT = 0;
const int wxPRINTMEDIA_DEFAULT = 0;
-class WXDLL
EXPORT
wxPrintData: public wxObject
+class WXDLL
IMPEXP_CORE
wxPrintData: public wxObject
{
public:
wxPrintData();
{
public:
wxPrintData();
@@
-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; }
@@
-274,7
+276,7
@@
private:
* from the dialog.
*/
* from the dialog.
*/
-class WXDLL
EXPORT
wxPrintDialogData: public wxObject
+class WXDLL
IMPEXP_CORE
wxPrintDialogData: public wxObject
{
public:
wxPrintDialogData();
{
public:
wxPrintDialogData();
@@
-349,7
+351,7
@@
private:
// Compatibility with old name
#define wxPageSetupData wxPageSetupDialogData
// Compatibility with old name
#define wxPageSetupData wxPageSetupDialogData
-class WXDLL
EXPORT
wxPageSetupDialogData: public wxObject
+class WXDLL
IMPEXP_CORE
wxPageSetupDialogData: public wxObject
{
public:
wxPageSetupDialogData();
{
public:
wxPageSetupDialogData();