set eol-style

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

diff --git a/include/wx/pickerbase.h b/include/wx/pickerbase.h
index c1b8bb9b496961e248fd075be1c33ae092dca556..b7a696d7ebc5662eb8372debf1b263202e80a088 100644 (file)
--- a/include/wx/pickerbase.h
+++ b/include/wx/pickerbase.h
@@ -16,8 +16,8 @@
 #include "wx/sizer.h"
 #include "wx/containr.h"
 
 #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 wxChar) wxButtonNameStr[];
 


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