corrections to dynamic loading for Darwin

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

diff --git a/wxPython/src/printfw.i b/wxPython/src/printfw.i
index 524950497d8d8823ff49d6fb9a9129dfa2c6b09a..bd02f638606ea74b42ae68b41da57958c44b9470 100644 (file)
--- 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 "helpers.h"
 #include <wx/print.h>
 #include <wx/printdlg.h>

+#include <wx/dcps.h>

 
 #include "printfw.h"
 %}
 
 #include "printfw.h"
 %}


@@ -112,6 +113,22 @@ public:
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

+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();
 class wxPageSetupDialogData : public wxObject {
 public:
     wxPageSetupDialogData();


@@ -221,7 +238,7 @@ void wxPyPrintout::GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *p
     bool hadErr = FALSE;
     bool found;
 
     bool hadErr = FALSE;
     bool found;
 

-    wxPyTState* state = wxPyBeginBlockThreads();
+    wxPyBeginBlockThreads();

     if ((found = m_myInst.findCallback("GetPageInfo"))) {
         PyObject* result = m_myInst.callCallbackObj(Py_BuildValue("()"));
         if (result && PyTuple_Check(result) && PyTuple_Size(result) == 4) {
     if ((found = m_myInst.findCallback("GetPageInfo"))) {
         PyObject* result = m_myInst.callCallbackObj(Py_BuildValue("()"));
         if (result && PyTuple_Check(result) && PyTuple_Size(result) == 4) {


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

-    wxPyEndBlockThreads(state);
+    wxPyEndBlockThreads();

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