fix building/running of tex2rtf

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

diff --git a/wxPython/src/_picker.i b/wxPython/src/_picker.i
index d13755e138d3904fc43c7168117216f2e76019f4..88e616e403077458e6d432d6f7c664612bb7e9ef 100644 (file)
--- a/wxPython/src/_picker.i
+++ b/wxPython/src/_picker.i
@@ -119,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`");
+    

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


@@ -292,6 +302,8 @@ public:
     // Returns the filtered value currently placed in the text control (if present).
     wxString GetTextCtrlValue() 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`");

 };
 
 
 };
 
 


@@ -356,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`");

 };
 
 
 };
 
 


@@ -386,7 +400,7 @@ public:
 
     wxFontPickerCtrl(wxWindow *parent,
                      wxWindowID id=-1,
 
     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,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize,
                      long style = wxFNTP_DEFAULT_STYLE,


@@ -396,7 +410,7 @@ public:
 
     bool Create(wxWindow *parent,
                 wxWindowID id=-1,
 
     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,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxFNTP_DEFAULT_STYLE,


@@ -413,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`");

 };
 
  
 };
 
  


@@ -430,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`");

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