Changes needed for building with Python 2.5

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

diff --git a/wxPython/src/_picker.i b/wxPython/src/_picker.i
index 089711b0a4bf3960922f676d33c9f484ef47c690..78eb6632c2344988337a8c5457645de249226dcf 100644 (file)
--- a/wxPython/src/_picker.i
+++ b/wxPython/src/_picker.i
@@ -16,14 +16,6 @@
 //---------------------------------------------------------------------------
 %newgroup
 
 //---------------------------------------------------------------------------
 %newgroup
 

-%{
-#include <wx/pickerbase.h>
-#include <wx/clrpicker.h>
-#include <wx/filepicker.h>
-#include <wx/fontpicker.h>    
-%}
-
-

 enum {
      wxPB_USE_TEXTCTRL,
  };
 enum {
      wxPB_USE_TEXTCTRL,
  };


@@ -76,6 +68,23 @@ The value passed to this function must be >= 1.", "");
         int , GetTextCtrlProportion() const,
         "Returns the proportion between the text control and the picker.", "");
 
         int , GetTextCtrlProportion() const,
         "Returns the proportion between the text control and the picker.", "");
 

+    DocDeclStr(
+        bool , IsTextCtrlGrowable() const,
+        "", "");
+
+    DocDeclStr(
+        void , SetTextCtrlGrowable(bool grow = true),
+        "", "");
+    
+
+    DocDeclStr(
+        bool , IsPickerCtrlGrowable() const,
+        "", "");
+    
+    DocDeclStr(
+        void , SetPickerCtrlGrowable(bool grow = true),
+        "", "");
+        

 
     DocDeclStr(
         bool , HasTextCtrl() const,
 
     DocDeclStr(
         bool , HasTextCtrl() const,


@@ -264,6 +273,12 @@ public:
     wxString GetPath() const;
     void SetPath(const wxString &str);
 
     wxString GetPath() const;
     void SetPath(const wxString &str);
 

+    // return true if the given path is valid for this control
+    bool CheckPath(const wxString& path) const;
+
+    // Returns the filtered value currently placed in the text control (if present).
+    wxString GetTextCtrlValue() const;
+

 };
 
 
 };
 
 


@@ -300,6 +315,12 @@ public:
 
     wxString GetPath() const;
     void SetPath(const wxString &str);
 
     wxString GetPath() const;
     void SetPath(const wxString &str);

+    
+    // return true if the given path is valid for this control
+    bool CheckPath(const wxString& path) const;
+
+    // Returns the filtered value currently placed in the text control (if present).
+    wxString GetTextCtrlValue() const;

 };
 
 
 };