don't use deprecated symbols

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

diff --git a/wxPython/src/cmndlgs.i b/wxPython/src/cmndlgs.i
index c87f85753d0398df1dab9d6344686c3a2d94d5d6..432ba32ac99b62e0d85c3544c62a04f9b101a1cb 100644 (file)
--- a/wxPython/src/cmndlgs.i
+++ b/wxPython/src/cmndlgs.i
@@ -114,21 +114,21 @@ public:
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
 
 
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
 

-    wxString GetDirectory();
-    wxString GetFilename();
-    int GetFilterIndex();
-    wxString GetMessage();
-    wxString GetPath();
-    long GetStyle();
-    wxString GetWildcard();
-    void SetDirectory(const wxString& directory);
-    void SetFilename(const wxString& setfilename);
-    void SetFilterIndex(int filterIndex);

     void SetMessage(const wxString& message);
     void SetPath(const wxString& path);
     void SetMessage(const wxString& message);
     void SetPath(const wxString& path);

-    void SetStyle(long style);
+    void SetDirectory(const wxString& dir);
+    void SetFilename(const wxString& name);

     void SetWildcard(const wxString& wildCard);
     void SetWildcard(const wxString& wildCard);

-    int ShowModal();
+    void SetStyle(long style);
+    void SetFilterIndex(int filterIndex);
+
+    wxString GetMessage() const;
+    wxString GetPath() const;
+    wxString GetDirectory() const;
+    wxString GetFilename() const;
+    wxString GetWildcard() const;
+    long GetStyle() const;
+    int GetFilterIndex() const;

 
     %addmethods {
         PyObject* GetFilenames() {
 
     %addmethods {
         PyObject* GetFilenames() {


@@ -143,6 +143,27 @@ public:
             return wxArrayString2PyList_helper(arr);
         }
     }
             return wxArrayString2PyList_helper(arr);
         }
     }

+
+// TODO
+//     // Utility functions
+
+//     // Parses the wildCard, returning the number of filters.
+//     // Returns 0 if none or if there's a problem,
+//     // The arrays will contain an equal number of items found before the error.
+//     // wildCard is in the form:
+//     // "All files (*)|*|Image Files (*.jpeg *.png)|*.jpg;*.png"
+//     static int ParseWildcard(const wxString& wildCard,
+//                              wxArrayString& descriptions,
+//                              wxArrayString& filters);
+
+//     // Append first extension to filePath from a ';' separated extensionList
+//     // if filePath = "path/foo.bar" just return it as is
+//     // if filePath = "foo[.]" and extensionList = "*.jpg;*.png" return "foo.jpg"
+//     // if the extension is "*.j?g" (has wildcards) or "jpg" then return filePath
+//     static wxString AppendExtension(const wxString &filePath,
+//                                     const wxString &extensionList);
+
+

 };
 
 
 };
 
 


@@ -244,7 +265,7 @@ public:
 
 class wxFontDialog : public wxDialog {
 public:
 
 class wxFontDialog : public wxDialog {
 public:

-    wxFontDialog(wxWindow* parent, wxFontData* data);
+    wxFontDialog(wxWindow* parent, const wxFontData& data);

     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
 
     wxFontData& GetFontData();
     %pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
 
     wxFontData& GetFontData();