Fix missing and broken interface items for Phoenix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/interface/wx/print.h b/interface/wx/print.h
index 0ac160abc2dd82379addb9f4821a8eec780e6590..b0f5a70c52d3ecbb35054be30fb5ea779f8a4846 100644 (file)
--- a/interface/wx/print.h
+++ b/interface/wx/print.h
@@ -6,6 +6,37 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+enum wxPrinterError
+{
+    wxPRINTER_NO_ERROR = 0,
+    wxPRINTER_CANCELLED,
+    wxPRINTER_ERROR
+};
+
+#define wxPREVIEW_PRINT        1
+#define wxPREVIEW_PREVIOUS     2
+#define wxPREVIEW_NEXT         4
+#define wxPREVIEW_ZOOM         8
+#define wxPREVIEW_FIRST       16
+#define wxPREVIEW_LAST        32
+#define wxPREVIEW_GOTO        64
+
+#define wxPREVIEW_DEFAULT  (wxPREVIEW_PREVIOUS|wxPREVIEW_NEXT|wxPREVIEW_ZOOM\
+                            |wxPREVIEW_FIRST|wxPREVIEW_GOTO|wxPREVIEW_LAST)
+
+// Ids for controls
+#define wxID_PREVIEW_CLOSE      1
+#define wxID_PREVIEW_NEXT       2
+#define wxID_PREVIEW_PREVIOUS   3
+#define wxID_PREVIEW_PRINT      4
+#define wxID_PREVIEW_ZOOM       5
+#define wxID_PREVIEW_FIRST      6
+#define wxID_PREVIEW_LAST       7
+#define wxID_PREVIEW_GOTO       8
+#define wxID_PREVIEW_ZOOM_IN    9
+#define wxID_PREVIEW_ZOOM_OUT   10
+
+
 /**
     @class wxPreviewControlBar
 
@@ -282,8 +313,8 @@ public:
         the preview frame so that the user can print directly from the preview interface.
 
         @remarks
-        Do not explicitly delete the printout objects once this destructor has been
-        called, since they will be deleted in the wxPrintPreview constructor.
+        Do not explicitly delete the printout objects once this constructor has been
+        called, since they will be deleted in the wxPrintPreview destructor.
         The same does not apply to the @a data argument.
 
         Use IsOk() to check whether the wxPrintPreview object was created correctly.
@@ -291,6 +322,9 @@ public:
     wxPrintPreview(wxPrintout* printout,
                    wxPrintout* printoutForPrinting = NULL,
                    wxPrintDialogData* data = NULL);
+    wxPrintPreview(wxPrintout* printout,
+                   wxPrintout* printoutForPrinting,
+                   wxPrintData* data);
 
     /**
         Destructor.
@@ -298,7 +332,7 @@ public:
         Deletes both print preview objects, so do not destroy these objects
         in your application.
     */
-    ~wxPrinter();
+    ~wxPrintPreview();
 
     /**
         Gets the preview window used for displaying the print preview image.

diff --git a/interface/wx/printdlg.h b/interface/wx/printdlg.h
index 22ce950bf8b821d45fe6001c60250bbc571c6b87..630e03a0af3e7ee995730d3ff2d2f62878dfd82a 100644 (file)
--- a/interface/wx/printdlg.h
+++ b/interface/wx/printdlg.h
@@ -18,7 +18,7 @@
 
     @see @ref overview_printing, @ref overview_cmndlg_print
 */
-class wxPrintDialog : public wxDialog
+class wxPrintDialog : public wxObject
 {
 public:
     /**
@@ -30,6 +30,7 @@ public:
         @see wxPrintDialogData
     */
     wxPrintDialog(wxWindow* parent, wxPrintDialogData* data = NULL);
+    wxPrintDialog(wxWindow *parent, wxPrintData* data);
 
     /**
         Destructor.
@@ -54,6 +55,12 @@ public:
     */
     virtual wxPrintDialogData& GetPrintDialogData();
 
+    /**
+       Returns the @ref overview_printing_printdata "print data" associated
+       with the print dialog.
+    */
+    virtual wxPrintData& GetPrintData();
+
     /**
         Shows the dialog, returning @c wxID_OK if the user pressed OK, and @c
         wxID_CANCEL otherwise.
@@ -89,7 +96,7 @@ public:
 
     @see @ref overview_printing, wxPrintDialog, wxPageSetupDialogData
 */
-class wxPageSetupDialog : public wxDialog
+class wxPageSetupDialog : public wxObject
 {
 public:
     /**