save a reference to the bitmap so it doesn't get destroyed before the

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

diff --git a/wxPython/src/_picker.i b/wxPython/src/_picker.i
index 5314d3686bacf7a5b6f78261b8492d519ab355c9..88e616e403077458e6d432d6f7c664612bb7e9ef 100644 (file)
--- a/wxPython/src/_picker.i
+++ b/wxPython/src/_picker.i
@@ -119,6 +119,16 @@ etc).", "");
         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`");
+    
 };
 
 //---------------------------------------------------------------------------
@@ -200,6 +210,7 @@ public:
         void , SetColour(const wxColour& col),
         "Set the displayed colour.", "");
 
+    %property(Colour, GetColour, SetColour, doc="See `GetColour` and `SetColour`");
 };
 
 
@@ -216,6 +227,8 @@ public:
 
     wxColour GetColour() const;
     void SetColour(const wxColour &c);
+
+    %property(Colour, GetColour, SetColour, doc="See `GetColour` and `SetColour`");
 };
 
 
@@ -289,6 +302,8 @@ public:
     // 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`");
 };
 
 
@@ -331,6 +346,10 @@ public:
 
     // 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`");
+    
 };
 
 
@@ -349,6 +368,8 @@ public:
 
     wxString GetPath() const { return m_path; }
     void SetPath(const wxString &p) { m_path = p; }
+
+    %property(Path, GetPath, SetPath, doc="See `GetPath` and `SetPath`");
 };
 
 
@@ -379,7 +400,7 @@ public:
 
     wxFontPickerCtrl(wxWindow *parent,
                      wxWindowID id=-1,
-                     const wxFont& initial = *wxNORMAL_FONT,
+                     const wxFont& initial = wxNullFont,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxFNTP_DEFAULT_STYLE,
@@ -389,7 +410,7 @@ public:
 
     bool Create(wxWindow *parent,
                 wxWindowID id=-1,
-                const wxFont& initial = *wxNORMAL_FONT,
+                const wxFont& initial = wxNullFont,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxFNTP_DEFAULT_STYLE,
@@ -406,6 +427,9 @@ public:
     // 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`");
 };
 
  
@@ -423,6 +447,8 @@ public:
 
     wxFont GetFont() const;
     void SetFont(const wxFont &c);
+    
+    %property(Font, GetFont, SetFont, doc="See `GetFont` and `SetFont`");
 };
 
 //---------------------------------------------------------------------------