Digital Mars needs CCS_RIGHT

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

diff --git a/include/wx/pickerbase.h b/include/wx/pickerbase.h
index 705924b3621aefafb9079791e2fa772400a2099f..417767664c0238e820f5c31101ea47516f0f4ccb 100644 (file)
--- a/include/wx/pickerbase.h
+++ b/include/wx/pickerbase.h
@@ -13,6 +13,8 @@
 #define _WX_PICKERBASE_H_BASE_
 
 #include "wx/control.h"
 #define _WX_PICKERBASE_H_BASE_
 
 #include "wx/control.h"

+#include "wx/sizer.h"
+#include "wx/containr.h"

 
 class WXDLLIMPEXP_CORE wxTextCtrl;
 
 
 class WXDLLIMPEXP_CORE wxTextCtrl;
 


@@ -40,12 +42,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,33 +60,42 @@ 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
     bool IsTextCtrlGrowable() const

-        { return GetTextCtrlItem()->GetFlag() & wxGROW; }
+        { return (GetTextCtrlItem()->GetFlag() & wxGROW) != 0; }

     void SetTextCtrlGrowable(bool grow = true)
     {
         int f = GetDefaultTextCtrlFlag();
     void SetTextCtrlGrowable(bool grow = true)
     {
         int f = GetDefaultTextCtrlFlag();

-        if (grow)
-            GetTextCtrlItem()->SetFlag(f | wxGROW);
+        if ( grow )
+            f |= wxGROW;

         else
         else

-            GetTextCtrlItem()->SetFlag(f & ~wxGROW);
+            f &= ~wxGROW;
+
+        GetTextCtrlItem()->SetFlag(f);

     }
 
     bool IsPickerCtrlGrowable() const
     }
 
     bool IsPickerCtrlGrowable() const

-        { return GetPickerCtrlItem()->GetFlag() & wxGROW; }
+        { return (GetPickerCtrlItem()->GetFlag() & wxGROW) != 0; }

     void SetPickerCtrlGrowable(bool grow = true)
     {
         int f = GetDefaultPickerCtrlFlag();
     void SetPickerCtrlGrowable(bool grow = true)
     {
         int f = GetDefaultPickerCtrlFlag();

-        if (grow)
-            GetPickerCtrlItem()->SetFlag(f | wxGROW);
+        if ( grow )
+            f |= wxGROW;

         else
         else

-            GetPickerCtrlItem()->SetFlag(f & ~wxGROW);
+            f &= ~wxGROW;
+
+        GetPickerCtrlItem()->SetFlag(f);

     }
 
     bool HasTextCtrl() const
     }
 
     bool HasTextCtrl() const