Applied second part of patch #1570448, use the device origin for where

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

diff --git a/wxPython/src/_picker.i b/wxPython/src/_picker.i
index 089711b0a4bf3960922f676d33c9f484ef47c690..d3ca422fcf230d81e77d06790782919d1c1e76ad 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,
  };


@@ -77,6 +69,33 @@ The value passed to this function must be >= 1.", "");
         "Returns the proportion between the text control and the picker.", "");
 
 
         "Returns the proportion between the text control and the picker.", "");
 
 

+    DocDeclStr(
+        void , SetPickerCtrlProportion(int prop),
+        "Sets the proportion value of the picker.", "");
+    
+    DocDeclStr(
+        int , GetPickerCtrlProportion() const,
+        "Gets the proportion value of 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,
         "Returns true if this class has a valid text control (i.e. if the
     DocDeclStr(
         bool , HasTextCtrl() const,
         "Returns true if this class has a valid text control (i.e. if the


@@ -100,6 +119,16 @@ etc).", "");
         wxControl *, GetPickerCtrl(),
         "", "");
 
         wxControl *, GetPickerCtrl(),
         "", "");
 

+
+    %property(InternalMargin, GetInternalMargin, SetInternalMargin, doc="See `GetInternalMargin` and `SetInternalMargin`");
+    %property(PickerCtrl, GetPickerCtrl, doc="See `GetPickerCtrl`");
+    %property(PickerCtrlProportion, GetPickerCtrlProportion, SetPickerCtrlProportion, doc="See `GetPickerCtrlProportion` and `SetPickerCtrlProportion`");
+    %property(TextCtrl, GetTextCtrl, doc="See `GetTextCtrl`");
+    %property(TextCtrlProportion, GetTextCtrlProportion, SetTextCtrlProportion, doc="See `GetTextCtrlProportion` and `SetTextCtrlProportion`");
+
+    %property(TextCtrlGrowable, IsTextCtrlGrowable, SetTextCtrlGrowable, doc="See `IsTextCtrlGrowable` and `SetTextCtrlGrowable`");
+    %property(PickerCtrlGrowable, IsPickerCtrlGrowable, SetPickerCtrlGrowable, doc="See `IsPickerCtrlGrowable` and `SetPickerCtrlGrowable`");
+    

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -181,6 +210,7 @@ public:
         void , SetColour(const wxColour& col),
         "Set the displayed colour.", "");
 
         void , SetColour(const wxColour& col),
         "Set the displayed colour.", "");
 

+    %property(Colour, GetColour, SetColour, doc="See `GetColour` and `SetColour`");

 };
 
 
 };
 
 


@@ -197,6 +227,8 @@ public:
 
     wxColour GetColour() const;
     void SetColour(const wxColour &c);
 
     wxColour GetColour() const;
     void SetColour(const wxColour &c);

+
+    %property(Colour, GetColour, SetColour, doc="See `GetColour` and `SetColour`");

 };
 
 
 };
 
 


@@ -264,6 +296,14 @@ 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;
+
+    %property(Path, GetPath, SetPath, doc="See `GetPath` and `SetPath`");
+    %property(TextCtrlValue, GetTextCtrlValue, doc="See `GetTextCtrlValue`");

 };
 
 
 };
 
 


@@ -300,6 +340,16 @@ 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;
+
+    %property(Path, GetPath, SetPath, doc="See `GetPath` and `SetPath`");
+    %property(TextCtrlValue, GetTextCtrlValue, doc="See `GetTextCtrlValue`");
+    

 };
 
 
 };
 
 


@@ -318,6 +368,8 @@ public:
 
     wxString GetPath() const { return m_path; }
     void SetPath(const wxString &p) { m_path = p; }
 
     wxString GetPath() const { return m_path; }
     void SetPath(const wxString &p) { m_path = p; }

+
+    %property(Path, GetPath, SetPath, doc="See `GetPath` and `SetPath`");

 };
 
 
 };
 
 


@@ -375,6 +427,9 @@ public:
     // set/get the max pointsize
     void SetMaxPointSize(unsigned int max);
     unsigned int GetMaxPointSize() const;
     // set/get the max pointsize
     void SetMaxPointSize(unsigned int max);
     unsigned int GetMaxPointSize() const;

+    
+    %property(MaxPointSize, GetMaxPointSize, SetMaxPointSize, doc="See `GetMaxPointSize` and `SetMaxPointSize`");
+    %property(SelectedFont, GetSelectedFont, SetSelectedFont, doc="See `GetSelectedFont` and `SetSelectedFont`");

 };
 
  
 };
 
  


@@ -392,6 +447,8 @@ public:
 
     wxFont GetFont() const;
     void SetFont(const wxFont &c);
 
     wxFont GetFont() const;
     void SetFont(const wxFont &c);

+    
+    %property(Font, GetFont, SetFont, doc="See `GetFont` and `SetFont`");

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------