X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/os2/combobox.h diff --git a/include/wx/os2/combobox.h b/include/wx/os2/combobox.h index 25f9e37db7..233d0f0d02 100644 --- a/include/wx/os2/combobox.h +++ b/include/wx/os2/combobox.h @@ -1,23 +1,25 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: combobox.h +// Name: wx/os2/combobox.h // Purpose: wxComboBox class // Author: David Webster // Modified by: // Created: 10/13/99 // RCS-ID: $Id$ // Copyright: (c) David Webster -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_COMBOBOX_H_ #define _WX_COMBOBOX_H_ #include "wx/choice.h" +#include "wx/textentry.h" #if wxUSE_COMBOBOX // Combobox item -class WXDLLEXPORT wxComboBox : public wxChoice +class WXDLLIMPEXP_CORE wxComboBox : public wxChoice, + public wxTextEntry { public: @@ -94,35 +96,26 @@ class WXDLLEXPORT wxComboBox : public wxChoice ,const wxString& rsName = wxComboBoxNameStr ); - // - // List functions: see wxChoice - // - inline wxString GetValue(void) const { return GetLabel(); } - virtual void SetValue(const wxString& rsValue); - - // - // Clipboard operations - // - virtual void Copy(); - virtual void Cut(); - virtual void Paste(); - - virtual void SetInsertionPoint(long lPos); - virtual void SetInsertionPointEnd(void); - virtual long GetInsertionPoint(void) const; - virtual long GetLastPosition(void) const; - virtual void Replace( long lFrom - ,long lTo - ,const wxString& rsValue - ); - virtual void Remove( long lFrom - ,long lTo - ); + // See wxComboBoxBase discussion of IsEmpty(). + bool IsListEmpty() const { return wxItemContainer::IsEmpty(); } + bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); } + + // resolve ambiguities among virtual functions inherited from both base + // classes + virtual void Clear(); + virtual wxString GetValue() const; + virtual void SetValue(const wxString& value); + virtual wxString GetStringSelection() const + { return wxChoice::GetStringSelection(); } + inline virtual void SetSelection(int n) { wxChoice::SetSelection(n); } - virtual void SetSelection( long lFrom - ,long lTo - ); - virtual void SetEditable(bool bEditable); + virtual void SetSelection(long from, long to) + { wxTextEntry::SetSelection(from, to); } + virtual int GetSelection() const { return wxChoice::GetSelection(); } + virtual void GetSelection(long *from, long *to) const + { wxTextEntry::GetSelection(from, to); } + + virtual bool IsEditable() const; virtual bool OS2Command( WXUINT uParam ,WXWORD wId @@ -132,14 +125,11 @@ class WXDLLEXPORT wxComboBox : public wxChoice ,WXLPARAM lParam ); -protected: - virtual void DoSetSize( int nX - ,int nY - ,int nWidth - ,int nHeight - ,int nSizeFlags = wxSIZE_AUTO - ); private: + // implement wxTextEntry pure virtual methods + virtual wxWindow *GetEditableWindow() { return this; } + virtual WXHWND GetEditHWND() const { return m_hWnd; } + DECLARE_DYNAMIC_CLASS(wxComboBox) }; // end of CLASS wxComboBox