wxStyledTextCtrl can now be built and used when wxUSE_UNICODE==1.

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

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index 4bc6a83a3958af45d9b9ae927bd47098edaf6a74..008338a9449c8d9cb963ab3cee2aea20fcb62adf 100644 (file)
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -21,14 +21,7 @@
 #include "wx/colour.h"
 #include "wx/gdicmn.h"
 
-#if defined(__WXMAC__) && defined(TARGET_CARBON) && !defined(__UNIX__)
-  #if PM_USE_SESSION_APIS
-    #include <PMCore.h>
-  #endif
-    #include <PMApplication.h>
-#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
 
@@ -42,11 +35,12 @@ public:
 
     void SetChooseFull(bool flag) { chooseFull = flag; }
     bool GetChooseFull() const { return chooseFull; }
-    void SetColour(wxColour& colour) { dataColour = colour; }
-    wxColour &GetColour() { return dataColour; }
+    void SetColour(const wxColour& colour) { dataColour = colour; }
+    const wxColour& GetColour() const { return dataColour; }
+    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);
@@ -172,7 +166,7 @@ class WXDLLEXPORT wxPrintData: public wxObject
     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
 
@@ -190,16 +184,12 @@ class WXDLLEXPORT wxPrintData: public wxObject
 #endif
 
 public:
-#ifdef __WXMSW__
+#if defined(__WXMSW__)
     void*           m_devMode;
     void*           m_devNames;
-#elif defined( __WXMAC__  )
-  #if TARGET_CARBON
+#elif defined(__WXMAC__)
     void*           m_macPageFormat ;
     void*           m_macPrintSettings ;
-  #else
-       void*               m_macPrintInfo ;
-  #endif
 #endif
 
 private:
@@ -354,7 +344,7 @@ public:
     // 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);