Implement SelectAll for OSX WebKit.

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

diff --git a/include/wx/pickerbase.h b/include/wx/pickerbase.h
index e8c6cf0d8ea9e23d854aa8e699018f52dbc9ed7e..56a30d087387234a2263ef308bcd185088957701 100644 (file)
--- a/include/wx/pickerbase.h
+++ b/include/wx/pickerbase.h
@@ -19,7 +19,7 @@
 class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
 class WXDLLIMPEXP_FWD_CORE wxToolTip;
 
 class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
 class WXDLLIMPEXP_FWD_CORE wxToolTip;
 

-extern WXDLLEXPORT_DATA(const char) 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


@@ -32,12 +32,12 @@ extern WXDLLEXPORT_DATA(const char) wxButtonNameStr[];
 
 #define wxPB_USE_TEXTCTRL           0x0002
 
 
 #define wxPB_USE_TEXTCTRL           0x0002
 

-class WXDLLIMPEXP_CORE wxPickerBase : public wxControl
+class WXDLLIMPEXP_CORE wxPickerBase : public wxNavigationEnabled<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)

-        { WX_INIT_CONTROL_CONTAINER(); }
+        { }

     virtual ~wxPickerBase() {}
 
 
     virtual ~wxPickerBase() {}
 
 


@@ -121,8 +121,6 @@ protected:
     void OnTextCtrlUpdate(wxCommandEvent &);
     void OnTextCtrlKillFocus(wxFocusEvent &);
 
     void OnTextCtrlUpdate(wxCommandEvent &);
     void OnTextCtrlKillFocus(wxFocusEvent &);
 

-    void OnSize(wxSizeEvent &);
-

     // returns the set of styles for the attached wxTextCtrl
     // from given wxPickerBase's styles
     virtual long GetTextCtrlStyle(long style) const
     // returns the set of styles for the attached wxTextCtrl
     // from given wxPickerBase's styles
     virtual long GetTextCtrlStyle(long style) const


@@ -178,10 +176,6 @@ protected:
 
 private:
     DECLARE_ABSTRACT_CLASS(wxPickerBase)
 
 private:
     DECLARE_ABSTRACT_CLASS(wxPickerBase)

-    DECLARE_EVENT_TABLE()
-
-    // This class must be something just like a panel...
-    WX_DECLARE_CONTROL_CONTAINER();

 };
 
 
 };