prevent overload abiguity in wxPyPrintPreview ctor

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

diff --git a/wxPython/src/_printfw.i b/wxPython/src/_printfw.i
index 3db79113025fd629dec6897afb5affd20a421747..fb390d0979adc9fca292b93684ec72e6a718d3eb 100644 (file)
--- a/wxPython/src/_printfw.i
+++ b/wxPython/src/_printfw.i
@@ -625,7 +625,7 @@ public:
     bool CLASS::CBNAME(wxPreviewCanvas* a, wxDC& b) {                                   \
         bool rval=false;                                                                \
         bool found;                                                                     \
     bool CLASS::CBNAME(wxPreviewCanvas* a, wxDC& b) {                                   \
         bool rval=false;                                                                \
         bool found;                                                                     \

-        wxPyBlock_t blocked = wxPyBeginBlockThreads();                                         \
+        wxPyBlock_t blocked = wxPyBeginBlockThreads();                                  \

         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                        \
             PyObject* win = wxPyMake_wxObject(a,false);                                 \
             PyObject* dc  = wxPyMake_wxObject(&b,false);                                \
         if ((found = wxPyCBH_findCallback(m_myInst, #CBNAME))) {                        \
             PyObject* win = wxPyMake_wxObject(a,false);                                 \
             PyObject* dc  = wxPyMake_wxObject(&b,false);                                \


@@ -656,7 +656,7 @@ public:
     {}
     wxPyPrintPreview(wxPyPrintout* printout,
                      wxPyPrintout* printoutForPrinting,
     {}
     wxPyPrintPreview(wxPyPrintout* printout,
                      wxPyPrintout* printoutForPrinting,

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

         : wxPrintPreview(printout, printoutForPrinting, data)
     {}
 
         : wxPrintPreview(printout, printoutForPrinting, data)
     {}