use wxUSE_DATEPICKCTRL

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

diff --git a/wxPython/src/_printfw.i b/wxPython/src/_printfw.i
index 1e3c1fc7b9170d0f4887bb41b86c15998be44165..64ff548e78d1fccb73031ceb018b08b81c9d41e5 100644 (file)
--- a/wxPython/src/_printfw.i
+++ b/wxPython/src/_printfw.i
@@ -133,6 +133,7 @@ public:
     %nokwargs wxPageSetupDialogData;
     wxPageSetupDialogData();
     wxPageSetupDialogData(const wxPageSetupDialogData& data);  // for making copies
     %nokwargs wxPageSetupDialogData;
     wxPageSetupDialogData();
     wxPageSetupDialogData(const wxPageSetupDialogData& data);  // for making copies

+    wxPageSetupDialogData(const wxPrintData& data); 

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


@@ -140,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();


@@ -155,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();
 


@@ -171,22 +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() }
 };
 
 
 

+// 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);
 
 MustHaveApp(wxPageSetupDialog);
 

-class wxPageSetupDialog : public wxDialog {
+class wxPageSetupDialog : public wxObject
+{

 public:
 public:

-    %pythonAppend wxPageSetupDialog         "self._setOORInfo(self)"
-

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

+    wxPageSetupDialogData& GetPageSetupDialogData();

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


@@ -197,7 +206,8 @@ class wxPrintDialogData : public wxObject {
 public:
     %nokwargs wxPrintDialogData;
     wxPrintDialogData();
 public:
     %nokwargs wxPrintDialogData;
     wxPrintDialogData();

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

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


@@ -372,7 +382,8 @@ IMP_PYCALLBACK_BOOL_INT(wxPyPrintout, wxPrintout, HasPage);
 MustHaveApp(wxPyPrintout);
 
 // Now define the custom class for SWIGging
 MustHaveApp(wxPyPrintout);
 
 // Now define the custom class for SWIGging

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

 public:
     %pythonAppend wxPyPrintout   "self._setCallbackInfo(self, Printout)"
 
 public:
     %pythonAppend wxPyPrintout   "self._setCallbackInfo(self, Printout)"