X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/926bb76c2a79fcb83406552e9ca9324fc249ed31..3216dbf5dccab8ed6dc0245b7e5c998738ef51d7:/wxPython/src/printfw.i

diff --git a/wxPython/src/printfw.i b/wxPython/src/printfw.i
index 2ca9a23f41..bd02f63860 100644
--- a/wxPython/src/printfw.i
+++ b/wxPython/src/printfw.i
@@ -16,6 +16,7 @@
 #include "helpers.h"
 #include <wx/print.h>
 #include <wx/printdlg.h>
+#include <wx/dcps.h>
 
 #include "printfw.h"
 %}
@@ -41,7 +42,7 @@
 
 
 
-class wxPrintData {
+class wxPrintData : public wxObject {
 public:
     wxPrintData();
     ~wxPrintData();
@@ -112,7 +113,23 @@ public:
 
 //---------------------------------------------------------------------------
 
-class wxPageSetupDialogData {
+class wxPostScriptDC : public wxDC {
+public:
+    wxPostScriptDC(const wxPrintData& printData);
+    %name(wxPostScriptDC2)wxPostScriptDC(const wxString& output,
+                                         bool interactive = TRUE,
+                                         wxWindow* parent = NULL);
+
+    wxPrintData& GetPrintData();
+    void SetPrintData(const wxPrintData& data);
+
+    static void SetResolution(int ppi);
+    static int GetResolution();
+};
+
+//---------------------------------------------------------------------------
+
+class wxPageSetupDialogData : public wxObject {
 public:
     wxPageSetupDialogData();
     ~wxPageSetupDialogData();
@@ -165,7 +182,7 @@ public:
 //----------------------------------------------------------------------
 
 
-class wxPrintDialogData {
+class wxPrintDialogData : public wxObject {
 public:
     wxPrintDialogData();
     ~wxPrintDialogData();
@@ -219,9 +236,10 @@ 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) {
     bool hadErr = FALSE;
+    bool found;
 
-    bool doSave = wxPyRestoreThread();
-    if (m_myInst.findCallback("GetPageInfo")) {
+    wxPyBeginBlockThreads();
+    if ((found = m_myInst.findCallback("GetPageInfo"))) {
         PyObject* result = m_myInst.callCallbackObj(Py_BuildValue("()"));
         if (result && PyTuple_Check(result) && PyTuple_Size(result) == 4) {
             PyObject* val;
@@ -251,10 +269,9 @@ void wxPyPrintout::GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *p
         }
         Py_DECREF(result);
     }
-    else
+    wxPyEndBlockThreads();
+    if (! found)
         wxPrintout::GetPageInfo(minPage, maxPage, pageFrom, pageTo);
-
-    wxPySaveThread(doSave);
 }
 
 void wxPyPrintout::base_GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) {
@@ -275,12 +292,12 @@ IMP_PYCALLBACK_BOOL_INT(wxPyPrintout, wxPrintout, HasPage);
 
 
 // Now define the custom class for SWIGging
-%name(wxPrintout) class wxPyPrintout {
+%name(wxPrintout) class wxPyPrintout  : public wxObject {
 public:
     wxPyPrintout(const char* title = "Printout");
 
-    void _setSelf(PyObject* self, PyObject* _class);
-    %pragma(python) addtomethod = "__init__:self._setSelf(self, wxPrintout)"
+    void _setCallbackInfo(PyObject* self, PyObject* _class);
+    %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPrintout)"
 
     %addmethods {
         void Destroy() { delete self; }
@@ -304,7 +321,7 @@ public:
 
 //----------------------------------------------------------------------
 
-class wxPrinter {
+class wxPrinter : public wxObject {
 public:
     wxPrinter(wxPrintDialogData* data = NULL);
     ~wxPrinter();
@@ -320,7 +337,7 @@ public:
 
 //----------------------------------------------------------------------
 
-class wxPrintPreview {
+class wxPrintPreview : public wxObject {
 public:
     wxPrintPreview(wxPyPrintout* printout, wxPyPrintout* printoutForPrinting, wxPrintData* data=NULL);
 //    ~wxPrintPreview();   **** ????
@@ -353,7 +370,7 @@ public:
                    long style = wxDEFAULT_FRAME_STYLE,
                    char* name = "frame");
 
-    %pragma(python) addtomethod = "__init__:#wx._StdFrameCallbacks(self)"
+    %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
 
     void Initialize();
 
@@ -364,6 +381,11 @@ public:
 };
 
 //----------------------------------------------------------------------
+
+%init %{
+    wxPyPtrTypeMap_Add("wxPrintout", "wxPyPrintout");
+%}
+
 //----------------------------------------------------------------------
 //----------------------------------------------------------------------