compilation fixes after the last commit

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

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index 03b46f0604066e2dadd0f089d1b5998010385f20..2c8c64b7c8ad4df5df9f1f63a09b23e519bf3b3a 100644 (file)
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -21,13 +21,7 @@
 #include "wx/colour.h"
 #include "wx/gdicmn.h"
 
 #include "wx/colour.h"
 #include "wx/gdicmn.h"
 

-#if defined(__WXMAC__) && defined(TARGET_CARBON)
-  #if !defined(__UNIX__)
-    #include <PMApplication.h>
-  #endif
-#endif
-
-#if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT
+#if (defined(__WXMOTIF__) || defined(__WXX11__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT

 class WXDLLEXPORT wxPrintSetupData;
 #endif
 
 class WXDLLEXPORT wxPrintSetupData;
 #endif
 


@@ -41,11 +35,11 @@ public:
 
     void SetChooseFull(bool flag) { chooseFull = flag; }
     bool GetChooseFull() const { return chooseFull; }
 
     void SetChooseFull(bool flag) { chooseFull = flag; }
     bool GetChooseFull() const { return chooseFull; }

-    void SetColour(wxColour& colour) { dataColour = colour; }
+    void SetColour(const wxColour& colour) { dataColour = colour; }

     wxColour &GetColour() { return dataColour; }
 
     // Array of 16 custom colours
     wxColour &GetColour() { return dataColour; }
 
     // Array of 16 custom colours

-    void SetCustomColour(int i, wxColour& colour);
+    void SetCustomColour(int i, const wxColour& colour);

     wxColour GetCustomColour(int i);
 
     void operator=(const wxColourData& data);
     wxColour GetCustomColour(int i);
 
     void operator=(const wxColourData& data);


@@ -171,7 +165,7 @@ class WXDLLEXPORT wxPrintData: public wxObject
     void operator=(const wxPrintData& data);
 
     // For compatibility
     void operator=(const wxPrintData& data);
 
     // For compatibility

-#if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT
+#if (defined(__WXMOTIF__) || defined(__WXX11__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT

     void operator=(const wxPrintSetupData& setupData);
 #endif
 
     void operator=(const wxPrintSetupData& setupData);
 #endif
 


@@ -189,16 +183,12 @@ class WXDLLEXPORT wxPrintData: public wxObject
 #endif
 
 public:
 #endif
 
 public:

-#ifdef __WXMSW__
+#if defined(__WXMSW__)

     void*           m_devMode;
     void*           m_devNames;
     void*           m_devMode;
     void*           m_devNames;

-#elif defined( __WXMAC__  )
-#if TARGET_CARBON
-    PMPageFormat    m_macPageFormat ;
-    PMPrintSettings m_macPrintSettings ;
-#else
-       THPrint                 m_macPrintInfo ;
-#endif
+#elif defined(__WXMAC__)
+    void*           m_macPageFormat ;
+    void*           m_macPrintSettings ;

 #endif
 
 private:
 #endif
 
 private:


@@ -353,7 +343,7 @@ public:
     // paper size id member as well.
     void SetPaperSize(const wxSize& sz);
 
     // paper size id member as well.
     void SetPaperSize(const wxSize& sz);
 

-    void SetPaperId(wxPaperSize& id) { m_printData.SetPaperId(id); };
+    void SetPaperId(wxPaperSize id) { m_printData.SetPaperId(id); };

 
     // Sets the wxPrintData id, plus the paper width/height if found in the paper database.
     void SetPaperSize(wxPaperSize id);
 
     // Sets the wxPrintData id, plus the paper width/height if found in the paper database.
     void SetPaperSize(wxPaperSize id);