no changes, just remove #if'd out code

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

diff --git a/include/wx/pickerbase.h b/include/wx/pickerbase.h
index b49fc3e7b835eda8d1e689baf7110ac722dd7181..1982838cc28906d4fe7d20f996d241b9573508d3 100644 (file)
--- a/include/wx/pickerbase.h
+++ b/include/wx/pickerbase.h
@@ -16,10 +16,10 @@
 #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 WXDLLIMPEXP_DATA_CORE(const char) wxButtonNameStr[];

 
 // ----------------------------------------------------------------------------
 // wxPickerBase is the base class for the picker controls which support
 
 // ----------------------------------------------------------------------------
 // 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)
 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() {}
 
 


@@ -52,8 +52,6 @@ public:
                     const wxValidator& validator = wxDefaultValidator,
                     const wxString& name = wxButtonNameStr);
 
                     const wxValidator& validator = wxDefaultValidator,
                     const wxString& name = wxButtonNameStr);
 

-    virtual void DoSetToolTip( wxToolTip *tip );
-

 public:     // public API
 
     // margin between the text control and the picker
 public:     // public API
 
     // margin between the text control and the picker


@@ -107,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 &);