compilation/build fixes for wxUniv

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

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index 51d9ca25557301bc37f64e91d84f6938bdae7512..2b4063f3179aa213b10faee87d8837a35449a6fd 100644 (file)
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -16,11 +16,19 @@
 #pragma interface "cmndata.h"
 #endif
 
 #pragma interface "cmndata.h"
 #endif
 

+#include "wx/window.h"

 #include "wx/font.h"
 #include "wx/colour.h"
 #include "wx/gdicmn.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) && !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

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


@@ -54,7 +62,6 @@ class WXDLLEXPORT wxFontData: public wxObject
     DECLARE_DYNAMIC_CLASS(wxFontData)
 public:
     wxFontData();
     DECLARE_DYNAMIC_CLASS(wxFontData)
 public:
     wxFontData();

-    wxFontData(const wxFontData& fontData);

     ~wxFontData();
 
     void SetAllowSymbols(bool flag) { allowSymbols = flag; }
     ~wxFontData();
 
     void SetAllowSymbols(bool flag) { allowSymbols = flag; }


@@ -77,7 +84,13 @@ public:
 
     void SetRange(int minRange, int maxRange) { minSize = minRange; maxSize = maxRange; }
 
 
     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;
 
 public:
     wxColour        fontColour;


@@ -88,6 +101,10 @@ public:
     wxFont          chosenFont;
     int             minSize;
     int             maxSize;
     wxFont          chosenFont;
     int             minSize;
     int             maxSize;

+
+private:
+    wxFontEncoding       m_encoding;
+    wxNativeEncodingInfo m_encodingInfo;

 };
 
 #if wxUSE_PRINTING_ARCHITECTURE
 };
 
 #if wxUSE_PRINTING_ARCHITECTURE


@@ -155,7 +172,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__)) && wxUSE_POSTSCRIPT
+#if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT

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


@@ -165,11 +182,24 @@ class WXDLLEXPORT wxPrintData: public wxObject
     void ConvertFromNative();
     void* GetNativeData() const { return m_devMode; }
     void SetNativeData(void* data) { m_devMode = data; }
     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;
 #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:
 #endif
 
 private:


@@ -221,6 +251,7 @@ class WXDLLEXPORT wxPrintDialogData: public wxObject
     int GetMaxPage() const { return m_printMaxPage; };
     int GetNoCopies() const { return m_printNoCopies; };
     bool GetAllPages() const { return m_printAllPages; };
     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; };
     bool GetCollate() const { return m_printCollate; };
     bool GetPrintToFile() const { return m_printToFile; };
     bool GetSetupDialog() const { return m_printSetupDialog; };


@@ -231,6 +262,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 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; };
     void SetCollate(bool flag) { m_printCollate = flag; };
     void SetPrintToFile(bool flag) { m_printToFile = flag; };
     void SetSetupDialog(bool flag) { m_printSetupDialog = flag; };


@@ -257,6 +289,9 @@ class WXDLLEXPORT wxPrintDialogData: public wxObject
     void ConvertFromNative();
     void SetOwnerWindow(wxWindow* win);
     void* GetNativeData() const { return m_printDlgData; }
     void ConvertFromNative();
     void SetOwnerWindow(wxWindow* win);
     void* GetNativeData() const { return m_printDlgData; }

+#elif defined(__WXMAC__)
+  void ConvertToNative();
+  void ConvertFromNative();

 #endif
 
 #ifdef __WXMSW__
 #endif
 
 #ifdef __WXMSW__


@@ -273,6 +308,7 @@ private:
     bool            m_printAllPages;
     bool            m_printCollate;
     bool            m_printToFile;
     bool            m_printAllPages;
     bool            m_printCollate;
     bool            m_printToFile;

+    bool            m_printSelection;

     bool            m_printEnableSelection;
     bool            m_printEnablePageNumbers;
     bool            m_printEnableHelp;
     bool            m_printEnableSelection;
     bool            m_printEnablePageNumbers;
     bool            m_printEnableHelp;


@@ -342,6 +378,9 @@ public:
     void ConvertFromNative();
     void SetOwnerWindow(wxWindow* win);
     void* GetNativeData() const { return m_pageSetupData; }
     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
 #endif
 
     // Use paper size defined in this object to set the wxPrintData