compilation fixed for wxDataViewCtrl: almost no class was properly exported in wxGTK...

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

diff --git a/include/wx/pickerbase.h b/include/wx/pickerbase.h
index a559708c2aa50724efd06bd2c8c0de4fe686204e..b7a696d7ebc5662eb8372debf1b263202e80a088 100644 (file)
--- a/include/wx/pickerbase.h
+++ b/include/wx/pickerbase.h
@@ -14,8 +14,10 @@
 
 #include "wx/control.h"
 #include "wx/sizer.h"
 
 #include "wx/control.h"
 #include "wx/sizer.h"

+#include "wx/containr.h"

 
 

-class WXDLLIMPEXP_CORE wxTextCtrl;
+class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
+class WXDLLIMPEXP_FWD_CORE wxToolTip;

 
 extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[];
 
 
 extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[];
 


@@ -35,19 +37,20 @@ class WXDLLIMPEXP_CORE wxPickerBase : public wxControl
 public:
     // ctor: text is the associated text control
     wxPickerBase() : m_text(NULL), m_picker(NULL), m_sizer(NULL)
 public:
     // ctor: text is the associated text control
     wxPickerBase() : m_text(NULL), m_picker(NULL), m_sizer(NULL)

-        { m_container.SetContainerWindow(this); }
+        { WX_INIT_CONTROL_CONTAINER(); }

     virtual ~wxPickerBase() {}
 
 
     // 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
     virtual ~wxPickerBase() {}
 
 
     // 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
 


@@ -57,13 +60,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)


@@ -97,12 +105,16 @@ public:     // public API
     wxControl *GetPickerCtrl()
         { return m_picker; }
 
     wxControl *GetPickerCtrl()
         { return m_picker; }
 

-public:     // methods that derived class must/may override
-
+    // methods that derived class must/may override

     virtual void UpdatePickerFromTextCtrl() = 0;
     virtual void UpdateTextCtrlFromPicker() = 0;
 
     virtual void UpdatePickerFromTextCtrl() = 0;
     virtual void UpdateTextCtrlFromPicker() = 0;
 

-protected:        // utility functions
+protected:
+    // overridden base class methods
+#if wxUSE_TOOLTIPS
+    virtual void DoSetToolTip(wxToolTip *tip);
+#endif // wxUSE_TOOLTIPS
+

 
     // event handlers
     void OnTextCtrlDelete(wxWindowDestroyEvent &);
 
     // event handlers
     void OnTextCtrlDelete(wxWindowDestroyEvent &);