X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a2dc658bbaa0f323293eb78dc098e87fb52ebe9c..3f434666bf9476e7fc6c27de94075211db5f1417:/include/wx/pickerbase.h

diff --git a/include/wx/pickerbase.h b/include/wx/pickerbase.h
index b49fc3e7b8..e8c6cf0d8e 100644
--- a/include/wx/pickerbase.h
+++ b/include/wx/pickerbase.h
@@ -16,10 +16,10 @@
 #include "wx/sizer.h"
 #include "wx/containr.h"
 
-class WXDLLIMPEXP_CORE wxTextCtrl;
-class WXDLLEXPORT wxToolTip;
+class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
+class WXDLLIMPEXP_FWD_CORE wxToolTip;
 
-extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[];
+extern WXDLLEXPORT_DATA(const char) wxButtonNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxPickerBase is the base class for the picker controls which support
@@ -37,7 +37,7 @@ class WXDLLIMPEXP_CORE wxPickerBase : public wxControl
 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() {}
 
 
@@ -52,8 +52,6 @@ public:
                     const wxValidator& validator = wxDefaultValidator,
                     const wxString& name = wxButtonNameStr);
 
-    virtual void DoSetToolTip( wxToolTip *tip );
-
 public:     // public API
 
     // margin between the text control and the picker
@@ -107,12 +105,16 @@ public:     // public API
     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;
 
-protected:        // utility functions
+protected:
+    // overridden base class methods
+#if wxUSE_TOOLTIPS
+    virtual void DoSetToolTip(wxToolTip *tip);
+#endif // wxUSE_TOOLTIPS
+
 
     // event handlers
     void OnTextCtrlDelete(wxWindowDestroyEvent &);