only define wxUSE_NATIVE_STATUSBAR for the ports which have it (MSW and Mac)

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

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index d495c8d63c3bbc7ef5deaeeaac397bc0a9857ebf..95f2b7dc142183a1e1b3ad0d292593717cc4ef32 100644 (file)
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -217,6 +217,29 @@ public:
     
     void operator=(const wxPrintData& data);
 
     
     void operator=(const wxPrintData& data);
 

+#if WXWIN_COMPATIBILITY_2_4
+    // PostScript-specific data
+    wxString GetPrinterCommand() const;
+    wxString GetPrinterOptions() const;
+    wxString GetPreviewCommand() const;
+    wxString GetFontMetricPath() const;
+    double GetPrinterScaleX() const;
+    double GetPrinterScaleY() const;
+    long GetPrinterTranslateX() const;
+    long GetPrinterTranslateY() const;
+
+    void SetPrinterCommand(const wxString& command);
+    void SetPrinterOptions(const wxString& options);
+    void SetPreviewCommand(const wxString& command);
+    void SetFontMetricPath(const wxString& path);
+    void SetPrinterScaleX(double x);
+    void SetPrinterScaleY(double y);
+    void SetPrinterScaling(double x, double y);
+    void SetPrinterTranslateX(long x);
+    void SetPrinterTranslateY(long y);
+    void SetPrinterTranslation(long x, long y);
+#endif
+

     // Convert between wxPrintData and native data
     void ConvertToNative();
     void ConvertFromNative();
     // Convert between wxPrintData and native data
     void ConvertToNative();
     void ConvertFromNative();


@@ -275,8 +298,9 @@ public:
     bool GetSelection() const { return m_printSelection; };
     bool GetCollate() const { return m_printCollate; };
     bool GetPrintToFile() const { return m_printToFile; };
     bool GetSelection() const { return m_printSelection; };
     bool GetCollate() const { return m_printCollate; };
     bool GetPrintToFile() const { return m_printToFile; };

+#if WXWIN_COMPATIBILITY_2_4

     bool GetSetupDialog() const { return m_printSetupDialog; };
     bool GetSetupDialog() const { return m_printSetupDialog; };

-
+#endif

     void SetFromPage(int v) { m_printFromPage = v; };
     void SetToPage(int v) { m_printToPage = v; };
     void SetMinPage(int v) { m_printMinPage = v; };
     void SetFromPage(int v) { m_printFromPage = v; };
     void SetToPage(int v) { m_printToPage = v; };
     void SetMinPage(int v) { m_printMinPage = v; };


@@ -286,8 +310,9 @@ public:
     void SetSelection(bool flag) { m_printSelection = flag; };
     void SetCollate(bool flag) { m_printCollate = flag; };
     void SetPrintToFile(bool flag) { m_printToFile = flag; };
     void SetSelection(bool flag) { m_printSelection = flag; };
     void SetCollate(bool flag) { m_printCollate = flag; };
     void SetPrintToFile(bool flag) { m_printToFile = flag; };

+#if WXWIN_COMPATIBILITY_2_4

     void SetSetupDialog(bool flag) { m_printSetupDialog = flag; };
     void SetSetupDialog(bool flag) { m_printSetupDialog = flag; };

-
+#endif

     void EnablePrintToFile(bool flag) { m_printEnablePrintToFile = flag; };
     void EnableSelection(bool flag) { m_printEnableSelection = flag; };
     void EnablePageNumbers(bool flag) { m_printEnablePageNumbers = flag; };
     void EnablePrintToFile(bool flag) { m_printEnablePrintToFile = flag; };
     void EnableSelection(bool flag) { m_printEnableSelection = flag; };
     void EnablePageNumbers(bool flag) { m_printEnablePageNumbers = flag; };


@@ -307,21 +332,11 @@ public:
     void operator=(const wxPrintDialogData& data);
     void operator=(const wxPrintData& data); // Sets internal m_printData member
 
     void operator=(const wxPrintDialogData& data);
     void operator=(const wxPrintData& data); // Sets internal m_printData member
 

-#ifdef __WXMSW__
-    // Convert to/from the PRINTDLG structure
-    void ConvertToNative();
-    void ConvertFromNative();
-    void SetOwnerWindow(wxWindow* win);
-    void* GetNativeData() const { return m_printDlgData; }
-#elif defined(__WXMAC__)
+#if defined(__WXMAC__)

     void ConvertToNative();
     void ConvertFromNative();
 #endif
 
     void ConvertToNative();
     void ConvertFromNative();
 #endif
 

-#ifdef __WXMSW__
-    void*           m_printDlgData;
-#endif
-

 private:
     int             m_printFromPage;
     int             m_printToPage;
 private:
     int             m_printFromPage;
     int             m_printToPage;


@@ -336,7 +351,9 @@ private:
     bool            m_printEnablePageNumbers;
     bool            m_printEnableHelp;
     bool            m_printEnablePrintToFile;
     bool            m_printEnablePageNumbers;
     bool            m_printEnableHelp;
     bool            m_printEnablePrintToFile;

+#if WXWIN_COMPATIBILITY_2_4

     bool            m_printSetupDialog;
     bool            m_printSetupDialog;

+#endif

     wxPrintData     m_printData;
 
 private:
     wxPrintData     m_printData;
 
 private:


@@ -398,13 +415,7 @@ public:
     void EnablePrinter(bool flag) { m_enablePrinter = flag; };
     void EnableHelp(bool flag) { m_enableHelp = flag; };
 
     void EnablePrinter(bool flag) { m_enablePrinter = flag; };
     void EnableHelp(bool flag) { m_enableHelp = flag; };
 

-#if defined(__WIN95__)
-    // Convert to/from the PAGESETUPDLG structure
-    void ConvertToNative();
-    void ConvertFromNative();
-    void SetOwnerWindow(wxWindow* win);
-    void* GetNativeData() const { return m_pageSetupData; }
-#elif defined(__WXMAC__)
+#if defined(__WXMAC__)

     void ConvertToNative();
     void ConvertFromNative();
 #endif
     void ConvertToNative();
     void ConvertFromNative();
 #endif


@@ -422,10 +433,6 @@ public:
     wxPrintData& GetPrintData() { return m_printData; }
     void SetPrintData(const wxPrintData& printData) { m_printData = printData; }
 
     wxPrintData& GetPrintData() { return m_printData; }
     void SetPrintData(const wxPrintData& printData) { m_printData = printData; }
 

-#if defined(__WIN95__)
-    void*           m_pageSetupData;
-#endif
-

 private:
     wxSize          m_paperSize; // The dimensions selected by the user (on return, same as in wxPrintData?)
     wxPoint         m_minMarginTopLeft;
 private:
     wxSize          m_paperSize; // The dimensions selected by the user (on return, same as in wxPrintData?)
     wxPoint         m_minMarginTopLeft;