Updated tools

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

diff --git a/wxPython/src/_printfw.i b/wxPython/src/_printfw.i
index d872d1f2e2415b53ac435742d68a7c53a4a9753b..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();


@@ -246,7 +244,7 @@ public:
 
     void CreateAbortWindow(wxWindow* parent, wxPyPrintout* printout);
     wxPrintDialogData& GetPrintDialogData();
 
     void CreateAbortWindow(wxWindow* parent, wxPyPrintout* printout);
     wxPrintDialogData& GetPrintDialogData();

-    bool Print(wxWindow *parent, wxPyPrintout *printout, int prompt=TRUE);
+    bool Print(wxWindow *parent, wxPyPrintout *printout, int prompt=True);

     wxDC* PrintDialog(wxWindow *parent);
     void ReportError(wxWindow *parent, wxPyPrintout *printout, const wxString& message);
     bool Setup(wxWindow *parent);
     wxDC* PrintDialog(wxWindow *parent);
     void ReportError(wxWindow *parent, wxPyPrintout *printout, const wxString& message);
     bool Setup(wxWindow *parent);


@@ -263,7 +261,7 @@ public:
 
 // Since this one would be tough and ugly to do with the Macros...
 void wxPyPrintout::GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) {
 
 // Since this one would be tough and ugly to do with the Macros...
 void wxPyPrintout::GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) {

-    bool hadErr = FALSE;
+    bool hadErr = False;

     bool found;
 
     wxPyBeginBlockThreads();
     bool found;
 
     wxPyBeginBlockThreads();


@@ -274,22 +272,22 @@ void wxPyPrintout::GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *p
 
             val = PyTuple_GetItem(result, 0);
             if (PyInt_Check(val))    *minPage = PyInt_AsLong(val);
 
             val = PyTuple_GetItem(result, 0);
             if (PyInt_Check(val))    *minPage = PyInt_AsLong(val);

-            else hadErr = TRUE;
+            else hadErr = True;

 
             val = PyTuple_GetItem(result, 1);
             if (PyInt_Check(val))    *maxPage = PyInt_AsLong(val);
 
             val = PyTuple_GetItem(result, 1);
             if (PyInt_Check(val))    *maxPage = PyInt_AsLong(val);

-            else hadErr = TRUE;
+            else hadErr = True;

 
             val = PyTuple_GetItem(result, 2);
             if (PyInt_Check(val))    *pageFrom = PyInt_AsLong(val);
 
             val = PyTuple_GetItem(result, 2);
             if (PyInt_Check(val))    *pageFrom = PyInt_AsLong(val);

-            else hadErr = TRUE;
+            else hadErr = True;

 
             val = PyTuple_GetItem(result, 3);
             if (PyInt_Check(val))    *pageTo = PyInt_AsLong(val);
 
             val = PyTuple_GetItem(result, 3);
             if (PyInt_Check(val))    *pageTo = PyInt_AsLong(val);

-            else hadErr = TRUE;
+            else hadErr = True;

         }
         else
         }
         else

-            hadErr = TRUE;
+            hadErr = True;

 
         if (hadErr) {
             PyErr_SetString(PyExc_TypeError, "GetPageInfo should return a tuple of 4 integers.");
 
         if (hadErr) {
             PyErr_SetString(PyExc_TypeError, "GetPageInfo should return a tuple of 4 integers.");


@@ -334,17 +332,25 @@ public:
     wxDC* GetDC();
     void SetDC(wxDC *dc);
 
     wxDC* GetDC();
     void SetDC(wxDC *dc);
 

-    void GetPageSizePixels(int *OUTPUT, int *OUTPUT);

     void SetPageSizePixels(int w, int  h);
     void SetPageSizePixels(int w, int  h);

+    DocDeclA(
+        void, GetPageSizePixels(int *OUTPUT, int *OUTPUT),
+        "GetPageSizePixels() -> (w, h)");

 
     void SetPageSizeMM(int w, int  h);
 
     void SetPageSizeMM(int w, int  h);

-    void GetPageSizeMM(int *OUTPUT, int *OUTPUT);
+    DocDeclA(
+        void, GetPageSizeMM(int *OUTPUT, int *OUTPUT),
+        "GetPageSizeMM() -> (w, h)");

     
     void SetPPIScreen(int x, int y);
     
     void SetPPIScreen(int x, int y);

-    void GetPPIScreen(int *OUTPUT, int *OUTPUT);
+    DocDeclA(
+        void, GetPPIScreen(int *OUTPUT, int *OUTPUT),
+        "GetPPIScreen() -> (x,y)");

     
     void SetPPIPrinter(int x, int y);
     
     void SetPPIPrinter(int x, int y);

-    void GetPPIPrinter(int *OUTPUT, int *OUTPUT);
+    DocDeclA(
+        void, GetPPIPrinter(int *OUTPUT, int *OUTPUT),
+        "GetPPIPrinter() -> (x,y)");

 
     bool IsPreview();
     void SetIsPreview(bool p);
 
     bool IsPreview();
     void SetIsPreview(bool p);


@@ -355,8 +361,10 @@ public:
     void base_OnBeginPrinting();
     void base_OnEndPrinting();
     void base_OnPreparePrinting();
     void base_OnBeginPrinting();
     void base_OnEndPrinting();
     void base_OnPreparePrinting();

-    void base_GetPageInfo(int *OUTPUT, int *OUTPUT, int *OUTPUT, int *OUTPUT);

     bool base_HasPage(int page);
     bool base_HasPage(int page);

+    DocDeclA(
+        void, base_GetPageInfo(int *OUTPUT, int *OUTPUT, int *OUTPUT, int *OUTPUT),
+        "base_GetPageInfo() -> (minPage, maxPage, pageFrom, pageTo)");

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -366,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,


@@ -379,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,


@@ -419,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,


@@ -507,7 +515,7 @@ public:
 
 #define IMP_PYCALLBACK_BOOL_PREWINDC(CLASS, PCLASS, CBNAME)                     \
     bool CLASS::CBNAME(wxPreviewCanvas* a, wxDC& b) {                           \
 
 #define IMP_PYCALLBACK_BOOL_PREWINDC(CLASS, PCLASS, CBNAME)                     \
     bool CLASS::CBNAME(wxPreviewCanvas* a, wxDC& b) {                           \

-        bool rval=FALSE;                                                        \
+        bool rval=False;                                                        \

         bool found;                                                             \
         wxPyBeginBlockThreads();                                                \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
         bool found;                                                             \
         wxPyBeginBlockThreads();                                                \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \