X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88ac883a0d005437c97a60d8195bd5e4719b1154..33e294191341e3ac4ba257a1292991f5519a564e:/include/wx/cmndata.h

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index 6c2c6864a1..03b46f0604 100644
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -16,10 +16,18 @@
 #pragma interface "cmndata.h"
 #endif
 
+#include "wx/window.h"
 #include "wx/font.h"
 #include "wx/colour.h"
+#include "wx/gdicmn.h"
 
-#if (defined(__WXMOTIF__) || defined(__WXGTK__)) && wxUSE_POSTSCRIPT
+#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
 class WXDLLEXPORT wxPrintSetupData;
 #endif
 
@@ -53,7 +61,6 @@ class WXDLLEXPORT wxFontData: public wxObject
     DECLARE_DYNAMIC_CLASS(wxFontData)
 public:
     wxFontData();
-    wxFontData(const wxFontData& fontData);
     ~wxFontData();
 
     void SetAllowSymbols(bool flag) { allowSymbols = flag; }
@@ -76,7 +83,13 @@ public:
 
     void SetRange(int minRange, int maxRange) { minSize = minRange; maxSize = maxRange; }
 
-    void operator=(const wxFontData& data);
+    // encoding info is split into 2 parts: the logical wxWin encoding
+    // (wxFontEncoding) and a structure containing the native parameters for
+    // it (wxNativeEncodingInfo)
+    wxFontEncoding GetEncoding() const { return m_encoding; }
+    void SetEncoding(wxFontEncoding encoding) { m_encoding = encoding; }
+
+    wxNativeEncodingInfo& EncodingInfo() { return m_encodingInfo; }
 
 public:
     wxColour        fontColour;
@@ -87,6 +100,10 @@ public:
     wxFont          chosenFont;
     int             minSize;
     int             maxSize;
+
+private:
+    wxFontEncoding       m_encoding;
+    wxNativeEncodingInfo m_encodingInfo;
 };
 
 #if wxUSE_PRINTING_ARCHITECTURE
@@ -154,21 +171,34 @@ class WXDLLEXPORT wxPrintData: public wxObject
     void operator=(const wxPrintData& data);
 
     // For compatibility
-#if (defined(__WXMOTIF__) || defined(__WXGTK__)) && wxUSE_POSTSCRIPT
+#if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT
     void operator=(const wxPrintSetupData& setupData);
 #endif
 
-#ifdef __WXMSW__
+#if defined(__WXMSW__)
     // Convert to/from the DEVMODE structure
     void ConvertToNative();
     void ConvertFromNative();
     void* GetNativeData() const { return m_devMode; }
     void SetNativeData(void* data) { m_devMode = data; }
+    void* GetNativeDataDevNames() const { return m_devNames; }
+    void SetNativeDataDevNames(void* data) { m_devNames = data; }
+#elif defined(__WXMAC__)
+  void ConvertToNative();
+  void ConvertFromNative();
 #endif
 
 public:
 #ifdef __WXMSW__
     void*           m_devMode;
+    void*           m_devNames;
+#elif defined( __WXMAC__  )
+#if TARGET_CARBON
+    PMPageFormat    m_macPageFormat ;
+    PMPrintSettings m_macPrintSettings ;
+#else
+	THPrint 		m_macPrintInfo ;
+#endif
 #endif
 
 private:
@@ -220,6 +250,7 @@ class WXDLLEXPORT wxPrintDialogData: public wxObject
     int GetMaxPage() const { return m_printMaxPage; };
     int GetNoCopies() const { return m_printNoCopies; };
     bool GetAllPages() const { return m_printAllPages; };
+    bool GetSelection() const { return m_printSelection; };
     bool GetCollate() const { return m_printCollate; };
     bool GetPrintToFile() const { return m_printToFile; };
     bool GetSetupDialog() const { return m_printSetupDialog; };
@@ -230,6 +261,7 @@ class WXDLLEXPORT wxPrintDialogData: public wxObject
     void SetMaxPage(int v) { m_printMaxPage = v; };
     void SetNoCopies(int v) { m_printNoCopies = v; };
     void SetAllPages(bool flag) { m_printAllPages = flag; };
+    void SetSelection(bool flag) { m_printSelection = flag; };
     void SetCollate(bool flag) { m_printCollate = flag; };
     void SetPrintToFile(bool flag) { m_printToFile = flag; };
     void SetSetupDialog(bool flag) { m_printSetupDialog = flag; };
@@ -256,6 +288,9 @@ class WXDLLEXPORT wxPrintDialogData: public wxObject
     void ConvertFromNative();
     void SetOwnerWindow(wxWindow* win);
     void* GetNativeData() const { return m_printDlgData; }
+#elif defined(__WXMAC__)
+  void ConvertToNative();
+  void ConvertFromNative();
 #endif
 
 #ifdef __WXMSW__
@@ -272,6 +307,7 @@ private:
     bool            m_printAllPages;
     bool            m_printCollate;
     bool            m_printToFile;
+    bool            m_printSelection;
     bool            m_printEnableSelection;
     bool            m_printEnablePageNumbers;
     bool            m_printEnableHelp;
@@ -341,6 +377,9 @@ public:
     void ConvertFromNative();
     void SetOwnerWindow(wxWindow* win);
     void* GetNativeData() const { return m_pageSetupData; }
+#elif defined(__WXMAC__)
+  void ConvertToNative();
+  void ConvertFromNative();
 #endif
 
     // Use paper size defined in this object to set the wxPrintData