X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d6b9cc87c0bad90c4016a58699842b3939fc362c..ca77701441e39245dcbfce903049e76f166979e5:/include/wx/msw/combobox.h?ds=sidebyside diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h index 8da813e43e..ac803c17ed 100644 --- a/include/wx/msw/combobox.h +++ b/include/wx/msw/combobox.h @@ -13,6 +13,7 @@ #define _WX_COMBOBOX_H_ #include "wx/choice.h" +#include "wx/textentry.h" #if wxUSE_COMBOBOX @@ -20,10 +21,11 @@ // Combobox control // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxComboBox: public wxChoice +class WXDLLIMPEXP_CORE wxComboBox : public wxChoice, + public wxTextEntry { public: - wxComboBox() { } + wxComboBox() { Init(); } wxComboBox(wxWindow *parent, wxWindowID id, const wxString& value = wxEmptyString, @@ -34,8 +36,11 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxComboBoxNameStr) { + Init(); Create(parent, id, value, pos, size, n, choices, style, validator, name); + } + wxComboBox(wxWindow *parent, wxWindowID id, const wxString& value, const wxPoint& pos, @@ -45,6 +50,8 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxComboBoxNameStr) { + Init(); + Create(parent, id, value, pos, size, choices, style, validator, name); } @@ -68,46 +75,33 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxComboBoxNameStr); - // List functions: see wxChoice + // See wxComboBoxBase discussion of IsEmpty(). + bool IsListEmpty() const { return wxItemContainer::IsEmpty(); } + bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); } - // Text field functions + // resolve ambiguities among virtual functions inherited from both base + // classes + virtual void Clear(); virtual wxString GetValue() const; virtual void SetValue(const wxString& value); - - // Clipboard operations - virtual void Copy(); - virtual void Cut(); - virtual void Paste(); - virtual bool CanCopy() const; - virtual bool CanCut() const; - virtual bool CanPaste() const; - virtual void SetInsertionPoint(long pos); - virtual void SetInsertionPointEnd(); - virtual long GetInsertionPoint() const; - virtual wxTextPos GetLastPosition() const; - virtual void Replace(long from, long to, const wxString& value); - virtual void Remove(long from, long to); + virtual wxString GetStringSelection() const + { return wxChoice::GetStringSelection(); } + virtual void Popup() { MSWDoPopupOrDismiss(true); } + virtual void Dismiss() { MSWDoPopupOrDismiss(false); } virtual void SetSelection(int n) { wxChoice::SetSelection(n); } - virtual void SetSelection(long from, long to); + 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; - virtual void SetEditable(bool editable); - - virtual void Undo(); - virtual void Redo(); - virtual bool CanUndo() const; - virtual bool CanRedo() const; - virtual void SelectAll(); + virtual bool ContainsHWND(WXHWND hWnd) const; + virtual void GetSelection(long *from, long *to) const; + virtual bool IsEditable() const; - virtual bool HasSelection() const; // implementation only from now on virtual bool MSWCommand(WXUINT param, WXWORD id); bool MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam); virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); bool MSWShouldPreProcessMessage(WXMSG *pMsg); - - WXHWND GetEditHWND() const; // Standard event handling void OnCut(wxCommandEvent& event); @@ -126,18 +120,53 @@ public: void OnUpdateDelete(wxUpdateUIEvent& event); void OnUpdateSelectAll(wxUpdateUIEvent& event); -protected: virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const; +#if wxUSE_UXTHEME + // override wxTextEntry method to work around Windows bug + virtual bool SetHint(const wxString& hint); +#endif // wxUSE_UXTHEME + +protected: #if wxUSE_TOOLTIPS virtual void DoSetToolTip(wxToolTip *tip); #endif + virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const; + + // this is the implementation of GetEditHWND() which can also be used when + // we don't have the edit control, it simply returns NULL then + // + // try not to use this function unless absolutely necessary (as in the + // message handling code where the edit control might not be created yet + // for the messages we receive during the control creation) as normally + // just testing for IsEditable() and using GetEditHWND() should be enough + WXHWND GetEditHWNDIfAvailable() const; + + virtual void EnableTextChangedEvents(bool enable) + { + m_allowTextEvents = enable; + } + private: + // there are the overridden wxTextEntry methods which should only be called + // when we do have an edit control so they assert if this is not the case + virtual wxWindow *GetEditableWindow(); + virtual WXHWND GetEditHWND() const; + + // common part of all ctors + void Init() + { + m_allowTextEvents = true; + } + + // normally true, false if text events are currently disabled + bool m_allowTextEvents; + DECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox) DECLARE_EVENT_TABLE() }; #endif // wxUSE_COMBOBOX -#endif - // _WX_COMBOBOX_H_ + +#endif // _WX_COMBOBOX_H_