wxPalette unified. Source cleaning.

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

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index a33f276da2d5bffba3f7cae831017a28636f2bc5..e4028e27995d5f539fc94ceae3ee163f03340c73 100644 (file)
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -12,10 +12,6 @@
 #ifndef _WX_CMNDATA_H_BASE_
 #define _WX_CMNDATA_H_BASE_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "cmndata.h"
-#endif
-
 #include "wx/window.h"
 #include "wx/font.h"
 #include "wx/encinfo.h"
@@ -147,12 +143,6 @@ private:
  * Encapsulates printer information (not printer dialog information)
  */
 
-#ifdef __WXMAC__
-
-class wxNativePrintData ;
-
-#endif
-
 enum wxPrintBin
 {
     wxPRINTBIN_DEFAULT,
@@ -182,9 +172,9 @@ public:
     wxPrintData(const wxPrintData& printData);
     ~wxPrintData();
 
-    int GetNoCopies() const { return m_printNoCopies; };
-    bool GetCollate() const { return m_printCollate; };
-    int  GetOrientation() const { return m_printOrientation; };
+    int GetNoCopies() const { return m_printNoCopies; }
+    bool GetCollate() const { return m_printCollate; }
+    int  GetOrientation() const { return m_printOrientation; }
 
     // Is this data OK for showing the print dialog?
     bool Ok() const ;
@@ -199,9 +189,9 @@ public:
     wxPrintBin GetBin() const { return m_bin; }
     wxPrintMode GetPrintMode() const { return m_printMode; }
 
-    void SetNoCopies(int v) { m_printNoCopies = v; };
-    void SetCollate(bool flag) { m_printCollate = flag; };
-    void SetOrientation(int orient) { m_printOrientation = orient; };
+    void SetNoCopies(int v) { m_printNoCopies = v; }
+    void SetCollate(bool flag) { m_printCollate = flag; }
+    void SetOrientation(int orient) { m_printOrientation = orient; }
 
     void SetPrinterName(const wxString& name) { m_printerName = name; }
     void SetColour(bool colour) { m_colour = colour; }
@@ -217,6 +207,11 @@ public:
     
     void operator=(const wxPrintData& data);
 
+    char* GetPrivData() const { return m_privData; }
+    int GetPrivDataLen() const { return m_privDataLen; }
+    void SetPrivData( char *privData, int len );
+   
+
 #if WXWIN_COMPATIBILITY_2_4
     // PostScript-specific data
     wxString GetPrinterCommand() const;
@@ -246,11 +241,6 @@ public:
     // Holds the native print data
     wxPrintNativeDataBase *GetNativeData() const { return m_nativeData; }
 
-public:
-#if defined(__WXMAC__)
-    wxNativePrintData* m_nativePrintData ;
-#endif
-
 private:
     wxPrintBin      m_bin;
     wxPrintMode     m_printMode;
@@ -268,6 +258,9 @@ private:
     
     wxString        m_filename;
     
+    char* m_privData;
+    int   m_privDataLen;
+    
     wxPrintNativeDataBase  *m_nativeData;
 
 private:
@@ -332,11 +325,6 @@ public:
     void operator=(const wxPrintDialogData& data);
     void operator=(const wxPrintData& data); // Sets internal m_printData member
 
-#if defined(__WXMAC__)
-    void ConvertToNative();
-    void ConvertFromNative();
-#endif
-
 private:
     int             m_printFromPage;
     int             m_printToPage;
@@ -415,11 +403,6 @@ public:
     void EnablePrinter(bool flag) { m_enablePrinter = flag; };
     void EnableHelp(bool flag) { m_enableHelp = flag; };
 
-#if defined(__WXMAC__)
-    void ConvertToNative();
-    void ConvertFromNative();
-#endif
-
     // Use paper size defined in this object to set the wxPrintData
     // paper id
     void CalculateIdFromPaperSize();