X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03e11df5470fd64d9d9a669d0b50b84c2d714736..43330cc9deda567a4713d42fb05bffb624781fb3:/include/wx/cmndata.h

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index 03b46f0604..7e7e16ce55 100644
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -21,13 +21,7 @@
 #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(__WXMGL__) || defined(__WXX11__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT
 class WXDLLEXPORT wxPrintSetupData;
 #endif
 
@@ -41,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);
@@ -63,6 +58,37 @@ public:
     wxFontData();
     ~wxFontData();
 
+    wxFontData(const wxFontData& data)
+        : wxObject()
+        , fontColour(data.fontColour)
+        , showHelp(data.showHelp)
+        , allowSymbols(data.allowSymbols)
+        , enableEffects(data.enableEffects)
+        , initialFont(data.initialFont)
+        , chosenFont(data.chosenFont)
+        , minSize(data.minSize)
+        , maxSize(data.maxSize)
+        , m_encoding(data.m_encoding)
+        , m_encodingInfo(data.m_encodingInfo)
+    {
+    }
+
+    wxFontData& operator=(const wxFontData& data)
+    {
+        wxObject::operator=(data);
+        fontColour     = data.fontColour;
+        showHelp       = data.showHelp;
+        allowSymbols   = data.allowSymbols;
+        enableEffects  = data.enableEffects;
+        initialFont    = data.initialFont;
+        chosenFont     = data.chosenFont;
+        minSize        = data.minSize;
+        maxSize        = data.maxSize;
+        m_encoding     = data.m_encoding;
+        m_encodingInfo = data.m_encodingInfo;
+        return *this;
+    }
+                          
     void SetAllowSymbols(bool flag) { allowSymbols = flag; }
     bool GetAllowSymbols() const { return allowSymbols; }
 
@@ -124,6 +150,9 @@ class WXDLLEXPORT wxPrintData: public wxObject
     bool GetCollate() const { return m_printCollate; };
     int  GetOrientation() const { return m_printOrientation; };
 
+    // Is this data OK for showing the print dialog?
+    bool Ok() const ;
+
     const wxString& GetPrinterName() const { return m_printerName; }
     bool GetColour() const { return m_colour; }
     wxDuplexMode GetDuplex() const { return m_duplexMode; }
@@ -171,7 +200,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(__WXMGL__) || defined(__WXX11__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT
     void operator=(const wxPrintSetupData& setupData);
 #endif
 
@@ -189,16 +218,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
-    PMPageFormat    m_macPageFormat ;
-    PMPrintSettings m_macPrintSettings ;
-#else
-	THPrint 		m_macPrintInfo ;
-#endif
+#elif defined(__WXMAC__)
+    void*           m_macPageFormat ;
+    void*           m_macPrintSettings ;
 #endif
 
 private:
@@ -276,6 +301,9 @@ class WXDLLEXPORT wxPrintDialogData: public wxObject
     bool GetEnablePageNumbers() const { return m_printEnablePageNumbers; };
     bool GetEnableHelp() const { return m_printEnableHelp; };
 
+    // Is this data OK for showing the print dialog?
+    bool Ok() const { return m_printData.Ok() ; }
+
     wxPrintData& GetPrintData() { return m_printData; }
     void SetPrintData(const wxPrintData& printData) { m_printData = printData; }
 
@@ -349,11 +377,14 @@ public:
     bool GetDefaultInfo() const { return m_getDefaultInfo; };
     bool GetEnableHelp() const { return m_enableHelp; };
 
+    // Is this data OK for showing the page setup dialog?
+    bool Ok() const { return m_printData.Ok() ; }
+
     // If a corresponding paper type is found in the paper database, will set the m_printData
     // 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);
@@ -389,8 +420,8 @@ public:
     // Use paper id in wxPrintData to set this object's paper size
     void CalculatePaperSizeFromId();
 
-    void operator=(const wxPageSetupData& data);
-    void operator=(const wxPrintData& data);
+    wxPageSetupDialogData& operator=(const wxPageSetupData& data);
+    wxPageSetupDialogData& operator=(const wxPrintData& data);
 
     wxPrintData& GetPrintData() { return m_printData; }
     void SetPrintData(const wxPrintData& printData) { m_printData = printData; }