fix printf() argument type in GetOsInfo()

[wxWidgets.git] / include / wx / pickerbase.h

diff --git a/include/wx/pickerbase.h b/include/wx/pickerbase.h
index ff262683e97934fffe21b6ae4b05059b78318724..9cf2822c602467a78c0cc7593c341bd1139f08ae 100644 (file)
--- a/include/wx/pickerbase.h
+++ b/include/wx/pickerbase.h
@@ -13,6 +13,7 @@
 #define _WX_PICKERBASE_H_BASE_
 
 #include "wx/control.h"
 #define _WX_PICKERBASE_H_BASE_
 
 #include "wx/control.h"

+#include "wx/sizer.h"

 
 class WXDLLIMPEXP_CORE wxTextCtrl;
 
 
 class WXDLLIMPEXP_CORE wxTextCtrl;
 


@@ -40,12 +41,14 @@ public:
 
     // if present, intercepts wxPB_USE_TEXTCTRL style and creates the text control
     // The 3rd argument is the initial wxString to display in the text control
 
     // if present, intercepts wxPB_USE_TEXTCTRL style and creates the text control
     // The 3rd argument is the initial wxString to display in the text control

-    bool CreateBase(wxWindow *parent, wxWindowID id,
-        const wxString& text = wxEmptyString,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxButtonNameStr);
+    bool CreateBase(wxWindow *parent,
+                    wxWindowID id,
+                    const wxString& text = wxEmptyString,
+                    const wxPoint& pos = wxDefaultPosition,
+                    const wxSize& size = wxDefaultSize,
+                    long style = 0,
+                    const wxValidator& validator = wxDefaultValidator,
+                    const wxString& name = wxButtonNameStr);

 
 
 public:     // public API
 
 
 public:     // public API


@@ -56,13 +59,18 @@ public:     // public API
     int GetInternalMargin() const
         { return GetTextCtrlItem()->GetBorder(); }
 
     int GetInternalMargin() const
         { return GetTextCtrlItem()->GetBorder(); }
 

-    // proportion of the text control respect the picker
-    // (which has a fixed proportion value of 1)
+    // proportion of the text control

     void SetTextCtrlProportion(int prop)
         { GetTextCtrlItem()->SetProportion(prop); m_sizer->Layout(); }
     int GetTextCtrlProportion() const
         { return GetTextCtrlItem()->GetProportion(); }
 
     void SetTextCtrlProportion(int prop)
         { GetTextCtrlItem()->SetProportion(prop); m_sizer->Layout(); }
     int GetTextCtrlProportion() const
         { return GetTextCtrlItem()->GetProportion(); }
 

+    // proportion of the picker control
+    void SetPickerCtrlProportion(int prop)
+        { GetPickerCtrlItem()->SetProportion(prop); m_sizer->Layout(); }
+    int GetPickerCtrlProportion() const
+        { return GetPickerCtrlItem()->GetProportion(); }
+

     bool IsTextCtrlGrowable() const
         { return (GetTextCtrlItem()->GetFlag() & wxGROW) != 0; }
     void SetTextCtrlGrowable(bool grow = true)
     bool IsTextCtrlGrowable() const
         { return (GetTextCtrlItem()->GetFlag() & wxGROW) != 0; }
     void SetTextCtrlGrowable(bool grow = true)