Make wxPORTRAIT and wxLANDSCAPE elements of wxPrintOrientation enum.

Change wxPrintData::SetOrientation() to take wxPrintOrientation instead of
int.

Closes #11393.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index a642866566e7649b85d2bf31973896908d58f887..680b9e952262f0b310f460d45b5ee5f5f4820b49 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -360,6 +360,8 @@ Deprecated methods and their replacements
 - wxValidator::SetBellOnError() incorrectly interpreted its argument (it
   disabled the bell when it was true) and was replaced by SuppressBellOnError()
   with more expected semantics.
 - wxValidator::SetBellOnError() incorrectly interpreted its argument (it
   disabled the bell when it was true) and was replaced by SuppressBellOnError()
   with more expected semantics.

+- wxPORTRAIT and wxLANDSCAPE are now elements of wxPrintOrientation enum and
+  wxPrintData::SetOrientation(int) takes wxPrintOrientation and not int.

 
 
 Major new features in this release
 
 
 Major new features in this release

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index 31269412d8b4f96231e8f610a3c5194d4ac397e9..b37b38fa0b6e9f97a1b6f0d3f86929edd5f996b1 100644 (file)
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -192,7 +192,7 @@ public:
 
     int GetNoCopies() const { return m_printNoCopies; }
     bool GetCollate() const { return m_printCollate; }
 
     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?
     bool IsOrientationReversed() const { return m_printOrientationReversed; }
 
     // Is this data OK for showing the print dialog?


@@ -212,7 +212,11 @@ public:
 
     void SetNoCopies(int v) { m_printNoCopies = v; }
     void SetCollate(bool flag) { m_printCollate = flag; }
 
     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; }
     void SetOrientationReversed(bool reversed) { m_printOrientationReversed = reversed; }
 
     void SetPrinterName(const wxString& name) { m_printerName = name; }


@@ -247,7 +251,7 @@ private:
     wxPrintMode     m_printMode;
 
     int             m_printNoCopies;
     wxPrintMode     m_printMode;
 
     int             m_printNoCopies;

-    int             m_printOrientation;
+    wxPrintOrientation m_printOrientation;

     bool            m_printOrientationReversed;
     bool            m_printCollate;
 
     bool            m_printOrientationReversed;
     bool            m_printCollate;
 

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 0769ee204fdee3f14eabaa77d149fa4c2a0e3038..7f43f5391adc3417e3b6f154782dc23edf0bae24 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -2543,10 +2543,11 @@ typedef enum
 } wxPaperSize;
 
 /* Printing orientation */
 } wxPaperSize;
 
 /* Printing orientation */

-#ifndef wxPORTRAIT
-#define wxPORTRAIT      1
-#define wxLANDSCAPE     2
-#endif
+enum wxPrintOrientation
+{
+   wxPORTRAIT = 1,
+   wxLANDSCAPE
+};

 
 /* Duplex printing modes
  */
 
 /* Duplex printing modes
  */

diff --git a/include/wx/motif/dcprint.h b/include/wx/motif/dcprint.h
index 1292a44ea15678d975e7416342300d2f703142f0..b100108001cc4bb0e5d36bb10a3f05add5240462 100644 (file)
--- a/include/wx/motif/dcprint.h
+++ b/include/wx/motif/dcprint.h
@@ -21,7 +21,7 @@ public:
     wxPrinterDCImpl(const wxString& driver, const wxString& device,
                     const wxString& output,
                     bool interactive = true,
     wxPrinterDCImpl(const wxString& driver, const wxString& device,
                     const wxString& output,
                     bool interactive = true,

-                    int orientation = wxPORTRAIT);
+                    wxPrintOrientation orientation = wxPORTRAIT);

     virtual ~wxPrinterDC();
 
     wxRect GetPaperRect() const;
     virtual ~wxPrinterDC();
 
     wxRect GetPaperRect() const;

diff --git a/include/wx/palmos/dcprint.h b/include/wx/palmos/dcprint.h
index b0b7b6b28f6e1f62f4f5c5662b89c216608b48db..9ca354363034ef32479624a90ef86dd6b26e2982 100644 (file)
--- a/include/wx/palmos/dcprint.h
+++ b/include/wx/palmos/dcprint.h
@@ -21,7 +21,7 @@ class WXDLLIMPEXP_CORE wxPrinterDC : public wxDC
 {
 public:
     // Create a printer DC (obsolete function: use wxPrintData version now)
 {
 public:
     // Create a printer DC (obsolete function: use wxPrintData version now)

-    wxPrinterDC(const wxString& driver, const wxString& device, const wxString& output, bool interactive = TRUE, int orientation = wxPORTRAIT);
+    wxPrinterDC(const wxString& driver, const wxString& device, const wxString& output, bool interactive = TRUE, wxPrintOrientation orientation = wxPORTRAIT);

 
     // Create from print data
     wxPrinterDC(const wxPrintData& data);
 
     // Create from print data
     wxPrinterDC(const wxPrintData& data);

diff --git a/include/wx/x11/dcprint.h b/include/wx/x11/dcprint.h
index cfb2809b07c2367d3cfa45edcc486aed4dc69577..c532a5faf12250c0d9985b69687499b684744ca6 100644 (file)
--- a/include/wx/x11/dcprint.h
+++ b/include/wx/x11/dcprint.h
@@ -20,7 +20,7 @@ public:
     DECLARE_CLASS(wxPrinterDC)
 
     // Create a printer DC
     DECLARE_CLASS(wxPrinterDC)
 
     // Create a printer DC

-    wxPrinterDC(const wxString& driver, const wxString& device, const wxString& output, bool interactive = TRUE, int orientation = wxPORTRAIT);
+    wxPrinterDC(const wxString& driver, const wxString& device, const wxString& output, bool interactive = TRUE, wxPrintOrientation orientation = wxPORTRAIT);

 
     virtual ~wxPrinterDC();
 };
 
     virtual ~wxPrinterDC();
 };

diff --git a/interface/wx/cmndata.h b/interface/wx/cmndata.h
index 81c8a126b509b1573b803c5a3b008ab9c520b4e0..4f00278e74a7746b0bc86dc44731d1c7076c02fb 100644 (file)
--- a/interface/wx/cmndata.h
+++ b/interface/wx/cmndata.h
@@ -567,7 +567,7 @@ public:
     /**
         Gets the orientation. This can be wxLANDSCAPE or wxPORTRAIT.
     */
     /**
         Gets the orientation. This can be wxLANDSCAPE or wxPORTRAIT.
     */

-    int GetOrientation() const;
+    wxPrintOrientation GetOrientation() const;

 
     /**
         Returns the paper size id.
 
     /**
         Returns the paper size id.


@@ -634,7 +634,7 @@ public:
     /**
         Sets the orientation. This can be wxLANDSCAPE or wxPORTRAIT.
     */
     /**
         Sets the orientation. This can be wxLANDSCAPE or wxPORTRAIT.
     */

-    void SetOrientation(int orientation);
+    void SetOrientation(wxPrintOrientation orientation);

 
     /**
         Sets the paper id. This indicates the type of paper to be used. For a
 
     /**
         Sets the paper id. This indicates the type of paper to be used. For a

diff --git a/interface/wx/defs.h b/interface/wx/defs.h
index 4c8b47a5d65dda144c012d96cc27564ab142632a..a21ccaa248fef4044a374bed582d62b1cb1b9832 100644 (file)
--- a/interface/wx/defs.h
+++ b/interface/wx/defs.h
@@ -778,6 +778,15 @@ enum wxPaperSize
     wxPAPER_PENV_10_ROTATED     ///< PRC Envelope #10 Rotated 458 x 324 m
 };
 
     wxPAPER_PENV_10_ROTATED     ///< PRC Envelope #10 Rotated 458 x 324 m
 };
 

+/**
+    Printing orientation
+*/
+
+enum wxPrintOrientation
+{
+   wxPORTRAIT,
+   wxLANDSCAPE
+};

 
 /**
     Duplex printing modes.
 
 /**
     Duplex printing modes.

diff --git a/src/msw/dcprint.cpp b/src/msw/dcprint.cpp
index 16402f760e61a4401a362fa783f122d4fcaa90cb..9ca81119cbe74b2853c5ff5b781e776bc201fdd8 100644 (file)
--- a/src/msw/dcprint.cpp
+++ b/src/msw/dcprint.cpp
@@ -83,7 +83,7 @@ wxPrinterDC::wxPrinterDC(const wxString& driver_name,
                          const wxString& device_name,
                          const wxString& file,
                          bool interactive,
                          const wxString& device_name,
                          const wxString& file,
                          bool interactive,

-                         int orientation)
+                         wxPrintOrientation orientation)

 {
     m_isInteractive = interactive;
 
 {
     m_isInteractive = interactive;
 

diff --git a/src/msw/printdlg.cpp b/src/msw/printdlg.cpp
index 2d6717597a190ff1dd6430b58ed0e5572f57b4cf..205009999b142ba4ae042073a06f56b97b4fe203 100644 (file)
--- a/src/msw/printdlg.cpp
+++ b/src/msw/printdlg.cpp
@@ -201,7 +201,7 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
 
     //// Orientation
     if (devMode->dmFields & DM_ORIENTATION)
 
     //// Orientation
     if (devMode->dmFields & DM_ORIENTATION)

-        data.SetOrientation( devMode->dmOrientation );
+        data.SetOrientation( (wxPrintOrientation)devMode->dmOrientation );

 
     //// Collation
     if (devMode->dmFields & DM_COLLATE)
 
     //// Collation
     if (devMode->dmFields & DM_COLLATE)

diff --git a/src/palmos/dcprint.cpp b/src/palmos/dcprint.cpp
index 058a2d1fe32bec4b49f57a02a95887f0dda37f8f..e39bb02e6078a123d74f1c94121ca5bc3f1d327a 100644 (file)
--- a/src/palmos/dcprint.cpp
+++ b/src/palmos/dcprint.cpp
@@ -62,7 +62,7 @@ wxPrinterDC::wxPrinterDC(const wxString& driver_name,
                          const wxString& device_name,
                          const wxString& file,
                          bool interactive,
                          const wxString& device_name,
                          const wxString& file,
                          bool interactive,

-                         int orientation)
+                         wxPrintOrientation orientation)

 {
 }
 
 {
 }