simplified definition

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

diff --git a/wxPython/src/printfw.i b/wxPython/src/printfw.i
index bd02f638606ea74b42ae68b41da57958c44b9470..05293bade129b121701c634737f17044d1dc2889 100644 (file)
--- a/wxPython/src/printfw.i
+++ b/wxPython/src/printfw.i
@@ -23,6 +23,16 @@
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

+%{
+    // Put some wx default wxChar* values into wxStrings.
+    static const wxChar* wxPrintoutTitleStr = wxT("Printout");
+    DECLARE_DEF_STRING(PrintoutTitleStr);
+
+    DECLARE_DEF_STRING(FrameNameStr);
+%}
+
+//----------------------------------------------------------------------
+

 %include typemaps.i
 %include my_typemaps.i
 
 %include typemaps.i
 %include my_typemaps.i
 


@@ -51,6 +61,8 @@ public:
     bool GetCollate();
     int  GetOrientation();
 
     bool GetCollate();
     int  GetOrientation();
 

+    bool Ok();
+

     const wxString& GetPrinterName();
     bool GetColour();
     wxDuplexMode GetDuplex();
     const wxString& GetPrinterName();
     bool GetColour();
     wxDuplexMode GetDuplex();


@@ -116,9 +128,9 @@ public:
 class wxPostScriptDC : public wxDC {
 public:
     wxPostScriptDC(const wxPrintData& printData);
 class wxPostScriptDC : public wxDC {
 public:
     wxPostScriptDC(const wxPrintData& printData);

-    %name(wxPostScriptDC2)wxPostScriptDC(const wxString& output,
-                                         bool interactive = TRUE,
-                                         wxWindow* parent = NULL);
+//     %name(wxPostScriptDC2)wxPostScriptDC(const wxString& output,
+//                                          bool interactive = TRUE,
+//                                          wxWindow* parent = NULL);

 
     wxPrintData& GetPrintData();
     void SetPrintData(const wxPrintData& data);
 
     wxPrintData& GetPrintData();
     void SetPrintData(const wxPrintData& data);


@@ -157,6 +169,9 @@ public:
             return new wxPrintData(self->GetPrintData());  // force a copy
         }
     }
             return new wxPrintData(self->GetPrintData());  // force a copy
         }
     }

+
+    bool Ok();
+

     void SetDefaultInfo(bool flag);
     void SetDefaultMinMargins(bool flag);
     void SetMarginTopLeft(const wxPoint& pt);
     void SetDefaultInfo(bool flag);
     void SetDefaultMinMargins(bool flag);
     void SetMarginTopLeft(const wxPoint& pt);


@@ -204,6 +219,9 @@ public:
     }
     bool GetPrintToFile();
     int GetToPage();
     }
     bool GetPrintToFile();
     int GetToPage();

+
+    bool Ok();
+

     void SetCollate(bool flag);
     void SetFromPage(int page);
     void SetMaxPage(int page);
     void SetCollate(bool flag);
     void SetFromPage(int page);
     void SetMaxPage(int page);


@@ -294,7 +312,7 @@ IMP_PYCALLBACK_BOOL_INT(wxPyPrintout, wxPrintout, HasPage);
 // Now define the custom class for SWIGging
 %name(wxPrintout) class wxPyPrintout  : public wxObject {
 public:
 // Now define the custom class for SWIGging
 %name(wxPrintout) class wxPyPrintout  : public wxObject {
 public:

-    wxPyPrintout(const char* title = "Printout");
+    wxPyPrintout(const wxString& title = wxPyPrintoutTitleStr);

 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
     %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPrintout)"
 
     void _setCallbackInfo(PyObject* self, PyObject* _class);
     %pragma(python) addtomethod = "__init__:self._setCallbackInfo(self, wxPrintout)"


@@ -331,7 +349,7 @@ public:
     wxPrintDialogData& GetPrintDialogData();
     bool Print(wxWindow *parent, wxPyPrintout *printout, int prompt=TRUE);
     wxDC* PrintDialog(wxWindow *parent);
     wxPrintDialogData& GetPrintDialogData();
     bool Print(wxWindow *parent, wxPyPrintout *printout, int prompt=TRUE);
     wxDC* PrintDialog(wxWindow *parent);

-    void ReportError(wxWindow *parent, wxPyPrintout *printout, char* message);
+    void ReportError(wxWindow *parent, wxPyPrintout *printout, const wxString& message);

     bool Setup(wxWindow *parent);
 };
 
     bool Setup(wxWindow *parent);
 };
 


@@ -368,7 +386,7 @@ public:
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize&  size = wxDefaultSize,
                    long style = wxDEFAULT_FRAME_STYLE,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize&  size = wxDefaultSize,
                    long style = wxDEFAULT_FRAME_STYLE,

-                   char* name = "frame");
+                   const wxString& name = wxPyFrameNameStr);

 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
 
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"