use wxUSE_DATEPICKCTRL

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

diff --git a/wxPython/src/_printfw.i b/wxPython/src/_printfw.i
index 615cd9e6291491dd418a1a1a5cea8a858c903ab5..64ff548e78d1fccb73031ceb018b08b81c9d41e5 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"));
+

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


@@ -34,14 +32,38 @@ enum wxPrintMode
     wxPRINT_MODE_NONE =    0,
     wxPRINT_MODE_PREVIEW = 1,   // Preview in external application
     wxPRINT_MODE_FILE =    2,   // Print to file
     wxPRINT_MODE_NONE =    0,
     wxPRINT_MODE_PREVIEW = 1,   // Preview in external application
     wxPRINT_MODE_FILE =    2,   // Print to file

-    wxPRINT_MODE_PRINTER = 3    // Send to printer
+    wxPRINT_MODE_PRINTER = 3,   // Send to printer
+    wxPRINT_MODE_STREAM = 4     // Send postscript data into a stream 

 };
 
 };
 

+enum wxPrintBin
+{
+    wxPRINTBIN_DEFAULT,
+
+    wxPRINTBIN_ONLYONE,
+    wxPRINTBIN_LOWER,
+    wxPRINTBIN_MIDDLE,
+    wxPRINTBIN_MANUAL,
+    wxPRINTBIN_ENVELOPE,
+    wxPRINTBIN_ENVMANUAL,
+    wxPRINTBIN_AUTO,
+    wxPRINTBIN_TRACTOR,
+    wxPRINTBIN_SMALLFMT,
+    wxPRINTBIN_LARGEFMT,
+    wxPRINTBIN_LARGECAPACITY,
+    wxPRINTBIN_CASSETTE,
+    wxPRINTBIN_FORMSOURCE,
+
+    wxPRINTBIN_USER,
+};

 
 
 class wxPrintData : public wxObject {
 public:
 
 
 class wxPrintData : public wxObject {
 public:

+    %nokwargs wxPrintData;

     wxPrintData();
     wxPrintData();

+    wxPrintData(const wxPrintData& data);  // for making copies
+    

     ~wxPrintData();
 
     int GetNoCopies();
     ~wxPrintData();
 
     int GetNoCopies();


@@ -56,8 +78,10 @@ public:
     wxPaperSize GetPaperId();
     const wxSize& GetPaperSize();
 
     wxPaperSize GetPaperId();
     const wxSize& GetPaperSize();
 

-    wxPrintQuality GetQuality();
-
+    int GetQuality();
+    wxPrintBin GetBin();
+    wxPrintMode GetPrintMode() const;
+    

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


@@ -67,24 +91,31 @@ 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);
+    void SetBin(wxPrintBin bin);
+    void SetPrintMode(wxPrintMode printMode);
+ 
+    wxString GetFilename() const;
+    void SetFilename( const wxString &filename );

 
 

+    %pythoncode { def __nonzero__(self): return self.Ok() }
+
+
+    // NOTE: These are now inside of #if WXWIN_COMPATIBILITY_2_4, so be
+    //       prepared to remove them...
+    

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

-    const wxString& GetFilename();

     const wxString& GetFontMetricPath();
     double GetPrinterScaleX();
     double GetPrinterScaleY();
     long GetPrinterTranslateX();
     long GetPrinterTranslateY();
     const wxString& GetFontMetricPath();
     double GetPrinterScaleX();
     double GetPrinterScaleY();
     long GetPrinterTranslateX();
     long GetPrinterTranslateY();

-    wxPrintMode GetPrintMode();
-

     void SetPrinterCommand(const wxString& command);
     void SetPrinterOptions(const wxString& options);
     void SetPreviewCommand(const wxString& command);
     void SetPrinterCommand(const wxString& command);
     void SetPrinterOptions(const wxString& options);
     void SetPreviewCommand(const wxString& command);

-    void SetFilename(const wxString& filename);

     void SetFontMetricPath(const wxString& path);
     void SetPrinterScaleX(double x);
     void SetPrinterScaleY(double y);
     void SetFontMetricPath(const wxString& path);
     void SetPrinterScaleX(double x);
     void SetPrinterScaleY(double y);


@@ -92,16 +123,17 @@ public:
     void SetPrinterTranslateX(long x);
     void SetPrinterTranslateY(long y);
     void SetPrinterTranslation(long x, long y);
     void SetPrinterTranslateX(long x);
     void SetPrinterTranslateY(long y);
     void SetPrinterTranslation(long x, long y);

-    void SetPrintMode(wxPrintMode printMode);

 
 

-    %pythoncode { def __nonzero__(self): return self.Ok() }

 };
 
 //---------------------------------------------------------------------------
 
 class wxPageSetupDialogData : public wxObject {
 public:
 };
 
 //---------------------------------------------------------------------------
 
 class wxPageSetupDialogData : public wxObject {
 public:

+    %nokwargs wxPageSetupDialogData;

     wxPageSetupDialogData();
     wxPageSetupDialogData();

+    wxPageSetupDialogData(const wxPageSetupDialogData& data);  // for making copies
+    wxPageSetupDialogData(const wxPrintData& data); 

     ~wxPageSetupDialogData();
 
     void EnableHelp(bool flag);
     ~wxPageSetupDialogData();
 
     void EnableHelp(bool flag);


@@ -109,6 +141,7 @@ public:
     void EnableOrientation(bool flag);
     void EnablePaper(bool flag);
     void EnablePrinter(bool flag);
     void EnableOrientation(bool flag);
     void EnablePaper(bool flag);
     void EnablePrinter(bool flag);

+    

     bool GetDefaultMinMargins();
     bool GetEnableMargins();
     bool GetEnableOrientation();
     bool GetDefaultMinMargins();
     bool GetEnableMargins();
     bool GetEnableOrientation();


@@ -124,11 +157,6 @@ public:
     wxSize GetPaperSize();
 
     wxPrintData& GetPrintData();
     wxSize GetPaperSize();
 
     wxPrintData& GetPrintData();

-//     %addmethods {
-//         %new wxPrintData* GetPrintData() {
-//             return new wxPrintData(self->GetPrintData());  // force a copy
-//         }
-//     }

 
     bool Ok();
 
 
     bool Ok();
 


@@ -140,20 +168,34 @@ public:
     void SetMinMarginBottomRight(const wxPoint& pt);
     void SetPaperId(wxPaperSize id);
     void SetPaperSize(const wxSize& size);
     void SetMinMarginBottomRight(const wxPoint& pt);
     void SetPaperId(wxPaperSize id);
     void SetPaperSize(const wxSize& size);

+    

     void SetPrintData(const wxPrintData& printData);
 
     void SetPrintData(const wxPrintData& printData);
 

+    // Use paper size defined in this object to set the wxPrintData
+    // paper id
+    void CalculateIdFromPaperSize();
+
+    // Use paper id in wxPrintData to set this object's paper size
+    void CalculatePaperSizeFromId();
+

     %pythoncode { def __nonzero__(self): return self.Ok() }
 };
 
 
 
     %pythoncode { def __nonzero__(self): return self.Ok() }
 };
 
 
 

-class wxPageSetupDialog : public wxDialog {
-public:
-    %addtofunc wxPageSetupDialog         "self._setOORInfo(self)"
+// NOTE: Contrary to it's name, this class doesn't derive from wxDialog.  It
+// is a facade in front of a platform-specific (native dialog) provided by the
+// wxPrintFactory.
+
+MustHaveApp(wxPageSetupDialog);

 
 

+class wxPageSetupDialog : public wxObject
+{
+public:

     wxPageSetupDialog(wxWindow* parent, wxPageSetupDialogData* data = NULL);
 
     wxPageSetupDialogData& GetPageSetupData();
     wxPageSetupDialog(wxWindow* parent, wxPageSetupDialogData* data = NULL);
 
     wxPageSetupDialogData& GetPageSetupData();

+    wxPageSetupDialogData& GetPageSetupDialogData();

     int ShowModal();
 };
 
     int ShowModal();
 };
 


@@ -162,7 +204,10 @@ public:
 
 class wxPrintDialogData : public wxObject {
 public:
 
 class wxPrintDialogData : public wxObject {
 public:

+    %nokwargs wxPrintDialogData;

     wxPrintDialogData();
     wxPrintDialogData();

+    wxPrintDialogData(const wxPrintData& printData);
+    wxPrintDialogData(const wxPrintDialogData& printData);  // for making copies

     ~wxPrintDialogData();
 
     int GetFromPage() const;
     ~wxPrintDialogData();
 
     int GetFromPage() const;


@@ -174,7 +219,10 @@ public:
     bool GetSelection() const;
     bool GetCollate() const;
     bool GetPrintToFile() const;
     bool GetSelection() const;
     bool GetCollate() const;
     bool GetPrintToFile() const;

+
+    // WXWIN_COMPATIBILITY_2_4

     bool GetSetupDialog() const;
     bool GetSetupDialog() const;

+    void SetSetupDialog(bool flag);

 
     void SetFromPage(int v);
     void SetToPage(int v);
 
     void SetFromPage(int v);
     void SetToPage(int v);


@@ -185,7 +233,6 @@ public:
     void SetSelection(bool flag);
     void SetCollate(bool flag);
     void SetPrintToFile(bool flag);
     void SetSelection(bool flag);
     void SetCollate(bool flag);
     void SetPrintToFile(bool flag);

-    void SetSetupDialog(bool flag);

 
     void EnablePrintToFile(bool flag);
     void EnableSelection(bool flag);
 
     void EnablePrintToFile(bool flag);
     void EnableSelection(bool flag);


@@ -202,28 +249,34 @@ public:
 
     
     wxPrintData& GetPrintData();
 
     
     wxPrintData& GetPrintData();

-//     %addmethods {
-//         %new wxPrintData* GetPrintData() {
-//             return new wxPrintData(self->GetPrintData());  // force a copy
-//         }
-//     }

     void SetPrintData(const wxPrintData& printData);
 
     %pythoncode { def __nonzero__(self): return self.Ok() }
 };
 
 
     void SetPrintData(const wxPrintData& printData);
 
     %pythoncode { def __nonzero__(self): return self.Ok() }
 };
 
 

-class wxPrintDialog : public wxDialog {
-public:
-    %addtofunc wxPrintDialog         "self._setOORInfo(self)"

 
 

+MustHaveApp(wxPrintDialog);
+
+
+// NOTE: Contrary to it's name, this class doesn't derive from wxDialog.  It
+// is a facade in front of a platform-specific (native dialog) provided by the
+// wxPrintFactory.
+
+class wxPrintDialog : public wxObject {
+public:

     wxPrintDialog(wxWindow* parent, wxPrintDialogData* data = NULL);
 
     wxPrintDialog(wxWindow* parent, wxPrintDialogData* data = NULL);
 

-    wxPrintDialogData& GetPrintDialogData();
+    // TODO?: wxPrintDialog(wxWindow *parent, wxPrintData* data);
+    
+    virtual int ShowModal();
+
+    virtual wxPrintDialogData& GetPrintDialogData();
+    virtual wxPrintData& GetPrintData();

 
     %newobject GetPrintDC;
 
     %newobject GetPrintDC;

-    wxDC* GetPrintDC();
-    int ShowModal();
+    virtual wxDC *GetPrintDC();
+

 };
 
 
 };
 
 


@@ -239,34 +292,41 @@ enum wxPrinterError
 };
 
 
 };
 
 

+MustHaveApp(wxPrinter);
+

 class wxPrinter : public wxObject {
 public:
     wxPrinter(wxPrintDialogData* data = NULL);
     ~wxPrinter();
 
 class wxPrinter : public wxObject {
 public:
     wxPrinter(wxPrintDialogData* data = NULL);
     ~wxPrinter();
 

-    void CreateAbortWindow(wxWindow* parent, wxPyPrintout* printout);
-    wxPrintDialogData& GetPrintDialogData();
-    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);
-    bool GetAbort();
+    virtual wxWindow *CreateAbortWindow(wxWindow *parent, wxPyPrintout *printout);
+    virtual void ReportError(wxWindow *parent, wxPyPrintout *printout, const wxString& message);
+
+    virtual bool Setup(wxWindow *parent);
+    virtual bool Print(wxWindow *parent, wxPyPrintout *printout, bool prompt = true);
+    virtual wxDC* PrintDialog(wxWindow *parent);
+    
+    virtual wxPrintDialogData& GetPrintDialogData() const;

 
 

+    bool GetAbort();

     static wxPrinterError GetLastError();
 };
 
 
 //---------------------------------------------------------------------------
     static wxPrinterError GetLastError();
 };
 
 
 //---------------------------------------------------------------------------

-// Custom wxPrintout class that knows how to call python
+// Custom wxPrintout class that knows how to call python, See implementation in
+// include/sx/wxPython/printfw.h
+

 %{
 
 %{
 

+IMPLEMENT_ABSTRACT_CLASS(wxPyPrintout, wxPrintout);

 
 // 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;
 
     bool found;
 

-    wxPyBeginBlockThreads();
+    bool blocked = wxPyBeginBlockThreads();

     if ((found = wxPyCBH_findCallback(m_myInst, "GetPageInfo"))) {
         PyObject* result = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));
         if (result && PyTuple_Check(result) && PyTuple_Size(result) == 4) {
     if ((found = wxPyCBH_findCallback(m_myInst, "GetPageInfo"))) {
         PyObject* result = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("()"));
         if (result && PyTuple_Check(result) && PyTuple_Size(result) == 4) {


@@ -274,22 +334,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.");


@@ -297,7 +357,7 @@ void wxPyPrintout::GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *p
         }
         Py_DECREF(result);
     }
         }
         Py_DECREF(result);
     }

-    wxPyEndBlockThreads();
+    wxPyEndBlockThreads(blocked);

     if (! found)
         wxPrintout::GetPageInfo(minPage, maxPage, pageFrom, pageTo);
 }
     if (! found)
         wxPrintout::GetPageInfo(minPage, maxPage, pageFrom, pageTo);
 }


@@ -319,10 +379,13 @@ IMP_PYCALLBACK_BOOL_INT(wxPyPrintout, wxPrintout, HasPage);
 %}
 
 
 %}
 
 

+MustHaveApp(wxPyPrintout);
+

 // Now define the custom class for SWIGging
 // Now define the custom class for SWIGging

-%name(Printout) class wxPyPrintout  : public wxObject {
+%rename(Printout) wxPyPrintout;
+class wxPyPrintout  : public wxObject {

 public:
 public:

-    %addtofunc wxPyPrintout   "self._setCallbackInfo(self, Printout)"
+    %pythonAppend wxPyPrintout   "self._setCallbackInfo(self, Printout)"

 
     wxPyPrintout(const wxString& title = wxPyPrintoutTitleStr);
     //~wxPyPrintout();      wxPrintPreview object takes ownership...
 
     wxPyPrintout(const wxString& title = wxPyPrintoutTitleStr);
     //~wxPyPrintout();      wxPrintPreview object takes ownership...


@@ -334,17 +397,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,18 +426,22 @@ 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)");

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

+MustHaveApp(wxPreviewCanvas);
+

 class wxPreviewCanvas: public wxScrolledWindow
 {
 public:
 class wxPreviewCanvas: public wxScrolledWindow
 {
 public:

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

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


@@ -377,9 +452,11 @@ public:
 };
 
 
 };
 
 

+MustHaveApp(wxPreviewFrame);
+

 class wxPreviewFrame : public wxFrame {
 public:
 class wxPreviewFrame : public wxFrame {
 public:

-    %addtofunc wxPreviewFrame   "self._self._setOORInfo(self)"
+    %pythonAppend 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,


@@ -416,10 +493,12 @@ enum {
     wxID_PREVIEW_GOTO
 };
 
     wxID_PREVIEW_GOTO
 };
 

+MustHaveApp(wxPreviewControlBar);
+

 class wxPreviewControlBar: public wxPanel
 {
 public:
 class wxPreviewControlBar: public wxPanel
 {
 public:

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

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


@@ -444,11 +523,17 @@ public:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

+MustHaveApp(wxPrintPreview);
+

 class wxPrintPreview : public wxObject {
 public:
 class wxPrintPreview : public wxObject {
 public:

+    %nokwargs wxPrintPreview;

     wxPrintPreview(wxPyPrintout* printout,
                    wxPyPrintout* printoutForPrinting,
     wxPrintPreview(wxPyPrintout* printout,
                    wxPyPrintout* printoutForPrinting,

-                   wxPrintData* data=NULL);
+                   wxPrintDialogData *data=NULL);
+    wxPrintPreview(wxPyPrintout* printout,
+                  wxPyPrintout* printoutForPrinting,
+                  wxPrintData* data);

 
     virtual bool SetCurrentPage(int pageNum);
     int GetCurrentPage();
 
     virtual bool SetCurrentPage(int pageNum);
     int GetCurrentPage();


@@ -500,30 +585,30 @@ public:
 
 %{
 
 
 %{
 

-#define DEC_PYCALLBACK_BOOL_PREWINDC(CBNAME)                                    \
-    bool CBNAME(wxPreviewCanvas* a, wxDC& b);                                   \
+#define DEC_PYCALLBACK_BOOL_PREWINDC(CBNAME)                                            \
+    bool CBNAME(wxPreviewCanvas* a, wxDC& b);                                           \

     bool base_##CBNAME(wxPreviewCanvas* a, wxDC& b)
 
 
     bool base_##CBNAME(wxPreviewCanvas* a, wxDC& b)
 
 

-#define IMP_PYCALLBACK_BOOL_PREWINDC(CLASS, PCLASS, CBNAME)                     \
-    bool CLASS::CBNAME(wxPreviewCanvas* a, wxDC& b) {                           \
-        bool rval=False;                                                        \
-        bool found;                                                             \
-        wxPyBeginBlockThreads();                                                \
-        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                \
-            PyObject* win = wxPyMake_wxObject(a);                               \
-            PyObject* dc  = wxPyMake_wxObject(&b);                              \
-            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OO)", win, dc));\
-            Py_DECREF(win);                                                     \
-            Py_DECREF(dc);                                                      \
-        }                                                                       \
-        wxPyEndBlockThreads();                                                  \
-        if (! found)                                                            \
-            rval = PCLASS::CBNAME(a, b);                                        \
-        return rval;                                                            \
-    }                                                                           \
-    bool CLASS::base_##CBNAME(wxPreviewCanvas* a, wxDC& b) {                    \
-        return PCLASS::CBNAME(a, b);                                            \
+#define IMP_PYCALLBACK_BOOL_PREWINDC(CLASS, PCLASS, CBNAME)                             \
+    bool CLASS::CBNAME(wxPreviewCanvas* a, wxDC& b) {                                   \
+        bool rval=false;                                                                \
+        bool found;                                                                     \
+        bool blocked = wxPyBeginBlockThreads();                                         \
+        if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                        \
+            PyObject* win = wxPyMake_wxObject(a,false);                                 \
+            PyObject* dc  = wxPyMake_wxObject(&b,false);                                \
+            rval = wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OO)", win, dc));      \
+            Py_DECREF(win);                                                             \
+            Py_DECREF(dc);                                                              \
+        }                                                                               \
+        wxPyEndBlockThreads(blocked);                                                   \
+        if (! found)                                                                    \
+            rval = PCLASS::CBNAME(a, b);                                                \
+        return rval;                                                                    \
+    }                                                                                   \
+    bool CLASS::base_##CBNAME(wxPreviewCanvas* a, wxDC& b) {                            \
+        return PCLASS::CBNAME(a, b);                                                    \

     }
 
 
     }
 
 


@@ -533,6 +618,11 @@ class wxPyPrintPreview : public wxPrintPreview
 {
     DECLARE_CLASS(wxPyPrintPreview)
 public:
 {
     DECLARE_CLASS(wxPyPrintPreview)
 public:

+    wxPyPrintPreview(wxPyPrintout* printout,
+                     wxPyPrintout* printoutForPrinting,
+                     wxPrintDialogData* data=NULL)
+        : wxPrintPreview(printout, printoutForPrinting, data)
+    {}

     wxPyPrintPreview(wxPyPrintout* printout,
                      wxPyPrintout* printoutForPrinting,
                      wxPrintData* data=NULL)
     wxPyPrintPreview(wxPyPrintout* printout,
                      wxPyPrintout* printoutForPrinting,
                      wxPrintData* data=NULL)


@@ -569,14 +659,19 @@ IMP_PYCALLBACK_VOID_        (wxPyPrintPreview, wxPrintPreview, DetermineScaling)
 %}
 
 
 %}
 
 

+MustHaveApp(wxPyPrintPreview);
+

 class wxPyPrintPreview : public wxPrintPreview
 {
 public:
 class wxPyPrintPreview : public wxPrintPreview
 {
 public:

-    %addtofunc wxPyPrintPreview   "self._setCallbackInfo(self, PyPrintPreview)"
-
+    %pythonAppend wxPyPrintPreview   "self._setCallbackInfo(self, PyPrintPreview)"
+    %nokwargs wxPyPrintPreview;
+    wxPyPrintPreview(wxPyPrintout* printout,
+                     wxPyPrintout* printoutForPrinting,
+                     wxPrintDialogData* data=NULL);

     wxPyPrintPreview(wxPyPrintout* printout,
                      wxPyPrintout* printoutForPrinting,
     wxPyPrintPreview(wxPyPrintout* printout,
                      wxPyPrintout* printoutForPrinting,

-                     wxPrintData* data=NULL);
+                     wxPrintData* data);

 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
     
 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
     


@@ -624,10 +719,12 @@ IMP_PYCALLBACK_VOID_(wxPyPreviewFrame, wxPreviewFrame, CreateControlBar);
 %}
 
 
 %}
 
 

+MustHaveApp(wxPyPreviewFrame);
+

 class wxPyPreviewFrame : public wxPreviewFrame
 {
 public:
 class wxPyPreviewFrame : public wxPreviewFrame
 {
 public:

-    %addtofunc wxPyPreviewFrame "self._setCallbackInfo(self, PyPreviewFrame); self._setOORInfo(self)"
+    %pythonAppend wxPyPreviewFrame "self._setCallbackInfo(self, PyPreviewFrame); self._setOORInfo(self)"

 
     wxPyPreviewFrame(wxPrintPreview* preview, wxFrame* parent,
                      const wxString& title,
 
     wxPyPreviewFrame(wxPrintPreview* preview, wxFrame* parent,
                      const wxString& title,


@@ -678,10 +775,12 @@ IMP_PYCALLBACK_VOID_INT(wxPyPreviewControlBar, wxPreviewControlBar, SetZoomContr
 %}
 
 
 %}
 
 

+MustHaveApp(wxPyPreviewControlBar);
+

 class wxPyPreviewControlBar : public wxPreviewControlBar
 {
 public:
 class wxPyPreviewControlBar : public wxPreviewControlBar
 {
 public:

-    %addtofunc wxPyPreviewControlBar   "self._setCallbackInfo(self, PyPreviewControlBar); self._setOORInfo(self)"
+    %pythonAppend wxPyPreviewControlBar   "self._setCallbackInfo(self, PyPreviewControlBar); self._setOORInfo(self)"

 
     wxPyPreviewControlBar(wxPrintPreview *preview,
                           long buttons,
 
     wxPyPreviewControlBar(wxPrintPreview *preview,
                           long buttons,


@@ -699,7 +798,6 @@ public:
     void base_SetZoomControl(int zoom);
 };
 
     void base_SetZoomControl(int zoom);
 };
 

-

 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 %init %{
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 %init %{