X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5360828db9ece34c6c7dc81ec7b4a294e6cd5cd5..56b79cb98da2e2e3024fce6f6313546577c34821:/include/wx/cmndata.h?ds=sidebyside

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index 82768cc4e3..7cfa51d570 100644
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -18,6 +18,7 @@
 
 #include "wx/window.h"
 #include "wx/font.h"
+#include "wx/fontutil.h"
 #include "wx/colour.h"
 #include "wx/gdicmn.h"
 
@@ -55,7 +56,6 @@ class WXDLLEXPORT wxFontData: public wxObject
     DECLARE_DYNAMIC_CLASS(wxFontData)
 public:
     wxFontData();
-    wxFontData(const wxFontData& fontData);
     ~wxFontData();
 
     void SetAllowSymbols(bool flag) { allowSymbols = flag; }
@@ -78,7 +78,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;
@@ -89,6 +95,10 @@ public:
     wxFont          chosenFont;
     int             minSize;
     int             maxSize;
+
+private:
+    wxFontEncoding       m_encoding;
+    wxNativeEncodingInfo m_encodingInfo;
 };
 
 #if wxUSE_PRINTING_ARCHITECTURE
@@ -166,11 +176,19 @@ class WXDLLEXPORT wxPrintData: public wxObject
     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__  )
+	THPrint 		m_macPrintInfo ;
 #endif
 
 private:
@@ -260,10 +278,15 @@ 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__
     void*           m_printDlgData;
+#elif defined( __WXMAC__  )
+	THPrint 		m_macPrintInfo ;
 #endif
 
 private:
@@ -346,6 +369,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
@@ -363,6 +389,8 @@ public:
 
 #if defined(__WIN95__)
     void*           m_pageSetupData;
+#elif defined( __WXMAC__  )
+	THPrint 	m_macPageSetupInfo ;
 #endif
 
 private: