X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ef74b15f769a43096fbd590e804caef53977701..ff1e1474ed73101f6d8bbb1f229f2204a83b9950:/include/wx/pickerbase.h?ds=sidebyside

diff --git a/include/wx/pickerbase.h b/include/wx/pickerbase.h
index c1b8bb9b49..1982838cc2 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 WXDLLIMPEXP_DATA_CORE(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() {}