Updated tools

[wxWidgets.git] / wxPython / src / _printfw.i

diff --git a/wxPython/src/_printfw.i b/wxPython/src/_printfw.i
index f91b876a0bc37f0b7398775b93b9d035588f8432..55ddfca1b1cbcfe4d5ecb8c1390c76973d79c8f4 100644 (file)
--- a/wxPython/src/_printfw.i
+++ b/wxPython/src/_printfw.i
@@ -19,13 +19,11 @@
 %{
 #include "wx/wxPython/printfw.h"
 
 %{
 #include "wx/wxPython/printfw.h"
 

-    static const wxChar* wxPrintoutTitleStr = wxT("Printout");
-    DECLARE_DEF_STRING(PrintoutTitleStr);
-    static const wxChar* wxPreviewCanvasNameStr = wxT("previewcanvas");
-    DECLARE_DEF_STRING(PreviewCanvasNameStr);
-

 %}
 
 %}
 

+MAKE_CONST_WXSTRING2(PrintoutTitleStr, wxT("Printout"));
+MAKE_CONST_WXSTRING2(PreviewCanvasNameStr, wxT("previewcanvas"));
+

 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 


@@ -56,7 +54,7 @@ public:
     wxPaperSize GetPaperId();
     const wxSize& GetPaperSize();
 
     wxPaperSize GetPaperId();
     const wxSize& GetPaperSize();
 

-    wxPrintQuality GetQuality();
+    int GetQuality();

 
     void SetNoCopies(int v);
     void SetCollate(bool flag);
 
     void SetNoCopies(int v);
     void SetCollate(bool flag);


@@ -67,7 +65,7 @@ public:
     void SetDuplex(wxDuplexMode duplex);
     void SetPaperId(wxPaperSize sizeId);
     void SetPaperSize(const wxSize& sz);
     void SetDuplex(wxDuplexMode duplex);
     void SetPaperId(wxPaperSize sizeId);
     void SetPaperSize(const wxSize& sz);

-    void SetQuality(wxPrintQuality quality);
+    void SetQuality(int quality);

 
     // PostScript-specific data
     const wxString& GetPrinterCommand();
 
     // PostScript-specific data
     const wxString& GetPrinterCommand();


@@ -376,7 +374,7 @@ public:
 class wxPreviewCanvas: public wxScrolledWindow
 {
 public:
 class wxPreviewCanvas: public wxScrolledWindow
 {
 public:

-    %addtofunc wxPreviewCanvas   "self._self._setOORInfo(self)"
+    %addtofunc wxPreviewCanvas   "self._setOORInfo(self)"

 
     wxPreviewCanvas(wxPrintPreview *preview,
                     wxWindow *parent,
 
     wxPreviewCanvas(wxPrintPreview *preview,
                     wxWindow *parent,


@@ -389,7 +387,7 @@ public:
 
 class wxPreviewFrame : public wxFrame {
 public:
 
 class wxPreviewFrame : public wxFrame {
 public:

-    %addtofunc wxPreviewFrame   "self._self._setOORInfo(self)"
+    %addtofunc wxPreviewFrame   "self._setOORInfo(self)"

 
     wxPreviewFrame(wxPrintPreview* preview, wxFrame* parent, const wxString& title,
                    const wxPoint& pos = wxDefaultPosition,
 
     wxPreviewFrame(wxPrintPreview* preview, wxFrame* parent, const wxString& title,
                    const wxPoint& pos = wxDefaultPosition,


@@ -429,7 +427,7 @@ enum {
 class wxPreviewControlBar: public wxPanel
 {
 public:
 class wxPreviewControlBar: public wxPanel
 {
 public:

-    %addtofunc wxPreviewControlBar   "self._self._setOORInfo(self)"
+    %addtofunc wxPreviewControlBar   "self._setOORInfo(self)"

 
     wxPreviewControlBar(wxPrintPreview *preview,
                         long buttons,
 
     wxPreviewControlBar(wxPrintPreview *preview,
                         long buttons,