X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb5e0af035b25afec4bebf8585c1f32766636599..b854b7b82e033d1dbd9d300402df50ec5e1e8b74:/utils/wxPython/src/cmndlgs.i

diff --git a/utils/wxPython/src/cmndlgs.i b/utils/wxPython/src/cmndlgs.i
index dc6dae7be1..5b51790333 100644
--- a/utils/wxPython/src/cmndlgs.i
+++ b/utils/wxPython/src/cmndlgs.i
@@ -17,7 +17,7 @@
 #include <wx/colordlg.h>
 #include <wx/dirdlg.h>
 #include <wx/fontdlg.h>
-#include <wx/printdlg.h>
+#include <wx/progdlg.h>
 %}
 
 //----------------------------------------------------------------------
@@ -30,7 +30,9 @@
 %import misc.i
 %import gdi.i
 %import windows.i
+%import frames.i
 
+%pragma(python) code = "import wx"
 
 //----------------------------------------------------------------------
 
@@ -52,18 +54,15 @@ class wxColourDialog : public wxDialog {
 public:
     wxColourDialog(wxWindow* parent, wxColourData* data = NULL);
 
-#ifdef __WXMSW__
+    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
+
     wxColourData& GetColourData();
-#else
-    wxColourData GetColourData();
-#endif
     int ShowModal();
 };
 
 
 //----------------------------------------------------------------------
 
-#ifdef __WXMSW__
 class wxDirDialog : public wxDialog {
 public:
     wxDirDialog(wxWindow* parent,
@@ -72,6 +71,8 @@ public:
                 long style = 0,
                 const wxPoint& pos = wxPyDefaultPosition);
 
+    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
+
     wxString GetPath();
     wxString GetMessage();
     long GetStyle();
@@ -79,7 +80,6 @@ public:
     void SetPath(const wxString& path);
     int ShowModal();
 };
-#endif
 
 //----------------------------------------------------------------------
 
@@ -93,6 +93,8 @@ public:
                  long style = 0,
                  const wxPoint& pos = wxPyDefaultPosition);
 
+    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
+
     wxString GetDirectory();
     wxString GetFilename();
     int GetFilterIndex();
@@ -134,6 +136,8 @@ public:
         }
     }
 
+    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
+
     int GetSelection();
     wxString GetStringSelection();
     void SetSelection(int sel);
@@ -152,6 +156,8 @@ public:
                       long style = wxOK | wxCANCEL | wxCENTRE,
                       const wxPoint& pos = wxPyDefaultPosition);
 
+    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
+
     wxString GetValue();
     void SetValue(const wxString& value);
     int ShowModal();
@@ -184,98 +190,12 @@ class wxFontDialog : public wxDialog {
 public:
     wxFontDialog(wxWindow* parent, wxFontData* data = NULL);
 
-    wxFontData& GetFontData();
-    int ShowModal();
-};
-
-
-//----------------------------------------------------------------------
-
-#ifdef __WXMSW__
-class wxPageSetupData {
-public:
-    wxPageSetupData();
-    ~wxPageSetupData();
-
-    void EnableHelp(bool flag);
-    void EnableMargins(bool flag);
-    void EnableOrientation(bool flag);
-    void EnablePaper(bool flag);
-    void EnablePrinter(bool flag);
-    wxPoint GetPaperSize();
-    wxPoint GetMarginTopLeft();
-    wxPoint GetMarginBottomRight();
-    wxPoint GetMinMarginTopLeft();
-    wxPoint GetMinMarginBottomRight();
-    int GetOrientation();
-    bool GetDefaultMinMargins();
-    bool GetEnableMargins();
-    bool GetEnableOrientation();
-    bool GetEnablePaper();
-    bool GetEnablePrinter();
-    bool GetEnableHelp();
-    bool GetDefaultInfo();
-    void SetPaperSize(const wxPoint& size);
-    void SetMarginTopLeft(const wxPoint& pt);
-    void SetMarginBottomRight(const wxPoint& pt);
-    void SetMinMarginTopLeft(const wxPoint& pt);
-    void SetMinMarginBottomRight(const wxPoint& pt);
-    void SetOrientation(int orientation);
-    void SetDefaultMinMargins(bool flag);
-    void SetDefaultInfo(bool flag);
-};
-
+    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
 
-class wxPageSetupDialog : public wxDialog {
-public:
-    wxPageSetupDialog(wxWindow* parent, wxPageSetupData* data = NULL);
-
-    wxPageSetupData& GetPageSetupData();
+    wxFontData& GetFontData();
     int ShowModal();
 };
-#endif
-
-//----------------------------------------------------------------------
-
-#ifdef __WXMSW__
-class wxPrintData {
-public:
-    wxPrintData();
-    ~wxPrintData();
-
-    void EnableHelp(bool flag);
-    void EnablePageNumbers(bool flag);
-    void EnablePrintToFile(bool flag);
-    void EnableSelection(bool flag);
-    bool GetAllPages();
-    bool GetCollate();
-    int GetFromPage();
-    int GetMaxPage();
-    int GetMinPage();
-    int GetNoCopies();
-    int GetOrientation();
-    int GetToPage();
-    void SetCollate(bool flag);
-    void SetFromPage(int page);
-    void SetMaxPage(int page);
-    void SetMinPage(int page);
-    void SetOrientation(int orientation);
-    void SetNoCopies(int n);
-    void SetPrintToFile(bool flag);
-    void SetSetupDialog(bool flag);
-    void SetToPage(int page);
-};
-
-
-class wxPrintDialog : public wxDialog {
-public:
-    wxPrintDialog(wxWindow* parent, wxPrintData* data = NULL);
 
-    wxPrintData& GetPrintData();
-    wxDC* GetPrintDC();
-    int ShowModal();
-};
-#endif
 
 //----------------------------------------------------------------------
 
@@ -287,29 +207,24 @@ public:
                     long style = wxOK | wxCANCEL | wxCENTRE,
                     const wxPoint& pos = wxPyDefaultPosition);
 
+    %pragma(python) addtomethod = "__init__:wx._StdDialogCallbacks(self)"
+
     int ShowModal();
 };
 
 //----------------------------------------------------------------------
 
+class wxProgressDialog : public wxFrame {
+public:
+    wxProgressDialog(const wxString& title,
+                     const wxString& message,
+                     int maximum = 100,
+                     wxWindow* parent = NULL,
+                     int style = wxPD_AUTO_HIDE | wxPD_APP_MODAL );
+
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// $Log$
-// Revision 1.3  1998/08/18 19:48:13  RD
-// more wxGTK compatibility things.
-//
-// It builds now but there are serious runtime problems...
-//
-// Revision 1.2  1998/08/15 07:36:25  RD
-// - Moved the header in the .i files out of the code that gets put into
-// the .cpp files.  It caused CVS conflicts because of the RCS ID being
-// different each time.
-//
-// - A few minor fixes.
-//
-// Revision 1.1  1998/08/09 08:25:49  RD
-// Initial version
-//
-//
+    bool Update(int value = -1, const char* newmsg = NULL);
+    void Resume();
+}
 
+//----------------------------------------------------------------------