Compilation fixes for old SDKs (VC6) after recent commit.

[wxWidgets.git] / include / wx / cmndata.h

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index 1540716412b29433af511f970f092aaeea3f4042..b37b38fa0b6e9f97a1b6f0d3f86929edd5f996b1 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);
 
-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;
@@ -190,7 +192,7 @@ public:
 
     int GetNoCopies() const { return m_printNoCopies; }
     bool GetCollate() const { return m_printCollate; }
-    int  GetOrientation() const { return m_printOrientation; }
+    wxPrintOrientation GetOrientation() const { return m_printOrientation; }
     bool IsOrientationReversed() const { return m_printOrientationReversed; }
 
     // Is this data OK for showing the print dialog?
@@ -210,7 +212,11 @@ public:
 
     void SetNoCopies(int v) { m_printNoCopies = v; }
     void SetCollate(bool flag) { m_printCollate = flag; }
-    void SetOrientation(int orient) { m_printOrientation = orient; }
+
+    // Please use the overloaded method below
+    wxDEPRECATED_INLINE(void SetOrientation(int orient),
+                        m_printOrientation = (wxPrintOrientation)orient; )
+    void SetOrientation(wxPrintOrientation orient) { m_printOrientation = orient; }
     void SetOrientationReversed(bool reversed) { m_printOrientationReversed = reversed; }
 
     void SetPrinterName(const wxString& name) { m_printerName = name; }
@@ -226,7 +232,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; }
@@ -245,7 +251,7 @@ private:
     wxPrintMode     m_printMode;
 
     int             m_printNoCopies;
-    int             m_printOrientation;
+    wxPrintOrientation m_printOrientation;
     bool            m_printOrientationReversed;
     bool            m_printCollate;