log wxChoice events in the same format as wxComboBox ones to make it simpler to compa...

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

diff --git a/wxPython/src/_printfw.i b/wxPython/src/_printfw.i
index d6a702a12c4d8a4fdcad35f746e9335d0aaad3f3..cebbc4c996bc4467f4057ced09f8c52197d9ad53 100644 (file)
--- a/wxPython/src/_printfw.i
+++ b/wxPython/src/_printfw.i
@@ -341,6 +341,7 @@ public:
 
     bool GetAbort();
     static wxPrinterError GetLastError();
 
     bool GetAbort();
     static wxPrinterError GetLastError();

+

 };
 
 
 };
 
 


@@ -414,10 +415,14 @@ MustHaveApp(wxPyPrintout);
 class wxPyPrintout  : public wxObject {
 public:
     %pythonAppend wxPyPrintout   "self._setCallbackInfo(self, Printout)"
 class wxPyPrintout  : public wxObject {
 public:
     %pythonAppend wxPyPrintout   "self._setCallbackInfo(self, Printout)"

+    %typemap(out) wxPyPrintout*;    // turn off this typemap

 
     wxPyPrintout(const wxString& title = wxPyPrintoutTitleStr);
 
     wxPyPrintout(const wxString& title = wxPyPrintoutTitleStr);

-    //~wxPyPrintout();      wxPrintPreview object takes ownership...
+    ~wxPyPrintout();      

     
     

+    // Turn it back on again
+    %typemap(out) wxPyPrintout* { $result = wxPyMake_wxObject($1, $owner); }
+

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


@@ -491,14 +496,17 @@ MustHaveApp(wxPreviewFrame);
 
 class wxPreviewFrame : public wxFrame {
 public:
 
 class wxPreviewFrame : public wxFrame {
 public:

+    %disownarg(wxPrintPreview*);
+    

     %pythonAppend wxPreviewFrame   "self._setOORInfo(self)"
     %pythonAppend wxPreviewFrame   "self._setOORInfo(self)"

-

     wxPreviewFrame(wxPrintPreview* preview, wxFrame* parent, const wxString& title,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize&  size = wxDefaultSize,
                    long style = wxDEFAULT_FRAME_STYLE,
                    const wxString& name = wxPyFrameNameStr);
 
     wxPreviewFrame(wxPrintPreview* preview, wxFrame* parent, const wxString& title,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize&  size = wxDefaultSize,
                    long style = wxDEFAULT_FRAME_STYLE,
                    const wxString& name = wxPyFrameNameStr);
 

+    %cleardisown(wxPrintPreview*);
+

     void Initialize();
     void CreateControlBar();
     void CreateCanvas();
     void Initialize();
     void CreateControlBar();
     void CreateCanvas();


@@ -562,6 +570,8 @@ MustHaveApp(wxPrintPreview);
 
 class wxPrintPreview : public wxObject {
 public:
 
 class wxPrintPreview : public wxObject {
 public:

+    %disownarg(wxPyPrintout*);
+    

     %nokwargs wxPrintPreview;
     wxPrintPreview(wxPyPrintout* printout,
                    wxPyPrintout* printoutForPrinting,
     %nokwargs wxPrintPreview;
     wxPrintPreview(wxPyPrintout* printout,
                    wxPyPrintout* printoutForPrinting,


@@ -570,6 +580,8 @@ public:
                   wxPyPrintout* printoutForPrinting,
                   wxPrintData* data);
 
                   wxPyPrintout* printoutForPrinting,
                   wxPrintData* data);
 

+    ~wxPrintPreview();
+    

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


@@ -577,6 +589,8 @@ public:
     wxPyPrintout *GetPrintout();
     wxPyPrintout *GetPrintoutForPrinting();
 
     wxPyPrintout *GetPrintout();
     wxPyPrintout *GetPrintoutForPrinting();
 

+    %cleardisown(wxPyPrintout*);
+    

     void SetFrame(wxFrame *frame);
     void SetCanvas(wxPreviewCanvas *canvas);
 
     void SetFrame(wxFrame *frame);
     void SetCanvas(wxPreviewCanvas *canvas);
 


@@ -695,6 +709,8 @@ MustHaveApp(wxPyPrintPreview);
 class wxPyPrintPreview : public wxPrintPreview
 {
 public:
 class wxPyPrintPreview : public wxPrintPreview
 {
 public:

+    %disownarg(wxPyPrintout*);
+

     %pythonAppend wxPyPrintPreview   "self._setCallbackInfo(self, PyPrintPreview)"
     %nokwargs wxPyPrintPreview;
     wxPyPrintPreview(wxPyPrintout* printout,
     %pythonAppend wxPyPrintPreview   "self._setCallbackInfo(self, PyPrintPreview)"
     %nokwargs wxPyPrintPreview;
     wxPyPrintPreview(wxPyPrintout* printout,


@@ -704,6 +720,8 @@ public:
                      wxPyPrintout* printoutForPrinting,
                      wxPrintData* data);
 
                      wxPyPrintout* printoutForPrinting,
                      wxPrintData* data);
 

+    %cleardisown(wxPyPrintout*);
+    

     void _setCallbackInfo(PyObject* self, PyObject* _class);
     
     bool SetCurrentPage(int pageNum);
     void _setCallbackInfo(PyObject* self, PyObject* _class);
     
     bool SetCurrentPage(int pageNum);