X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/cocoa/combobox.h diff --git a/include/wx/cocoa/combobox.h b/include/wx/cocoa/combobox.h index 80c212bc48..3a8a9e2d71 100644 --- a/include/wx/cocoa/combobox.h +++ b/include/wx/cocoa/combobox.h @@ -1,29 +1,51 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/cocoa/combobox.h // Purpose: wxComboBox class -// Author: David Elliott +// Author: Ryan Norton // Modified by: -// Created: 2003/07/14 +// Created: 2005/02/16 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __WX_COCOA_COMBOBOX_H__ #define __WX_COCOA_COMBOBOX_H__ +//Begin NSComboBox.h + +#include "wx/hashmap.h" +#include "wx/cocoa/ObjcAssociate.h" + #include "wx/textctrl.h" -//#include "wx/cocoa/NSTableView.h" +DECLARE_WXCOCOA_OBJC_CLASS(NSComboBox); + +WX_DECLARE_OBJC_HASHMAP(NSComboBox); +class wxCocoaNSComboBox +{ + WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSComboBox) +public: + void AssociateNSComboBox(WX_NSComboBox cocoaNSComboBox); + void DisassociateNSComboBox(WX_NSComboBox cocoaNSComboBox); + + virtual void doWxEvent(int nEvent) = 0; + virtual ~wxCocoaNSComboBox() { } +}; + +//begin combobox.h + +#include "wx/dynarray.h" // ======================================================================== // wxComboBox // ======================================================================== -class WXDLLEXPORT wxComboBox: public wxTextCtrl, public wxComboBoxBase //, protected wxCocoaNSTableView +class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase, protected wxCocoaNSComboBox, protected wxCocoaNSTextField { DECLARE_DYNAMIC_CLASS(wxComboBox) DECLARE_EVENT_TABLE() -// WX_DECLARE_COCOA_OWNER(NSComboBox,NSTextField,NSView) + WX_DECLARE_COCOA_OWNER(NSComboBox,NSTextField,NSView) + WX_DECLARE_COCOA_OWNER(NSTextField,NSControl,NSView) // ------------------------------------------------------------------------ // initialization // ------------------------------------------------------------------------ @@ -75,53 +97,58 @@ public: // Cocoa callbacks // ------------------------------------------------------------------------ protected: + wxArrayPtrVoid m_Datas; + virtual void doWxEvent(int nEvent); + + virtual void Cocoa_didChangeText() + {} // ------------------------------------------------------------------------ // Implementation // ------------------------------------------------------------------------ public: + void Clear() // HACK + { wxComboBoxBase::Clear(); } + // wxCombobox methods - virtual void SetSelection(int); + virtual void SetSelection(int pos); // Overlapping methods virtual wxString GetStringSelection(); - // other methods - virtual void SetStringSelection(const wxString& selection); // wxItemContainer - virtual void Clear(); - virtual void Delete(int); - virtual int GetCount() const; - virtual wxString GetString(int) const; - virtual void SetString(int, const wxString&); - virtual int FindString(const wxString&) const; - virtual void Select(int) {} + virtual void DoClear(); + virtual void DoDeleteOneItem(unsigned int n); + virtual unsigned int GetCount() const; + virtual wxString GetString(unsigned int) const; + virtual void SetString(unsigned int pos, const wxString&); + virtual int FindString(const wxString& s, bool bCase = false) const; virtual int GetSelection() const; - virtual int DoAppend(const wxString&); - virtual int DoInsert(const wxString&, int); - virtual void DoSetItemClientData(int, void*); - virtual void* DoGetItemClientData(int) const; - virtual void DoSetItemClientObject(int, wxClientData*); - virtual wxClientData* DoGetItemClientObject(int) const; - // wxComboBoxBase pure virtuals - virtual wxString GetValue() const - { return wxTextCtrl::GetValue(); } - virtual void SetValue(const wxString& value) - { return wxTextCtrl::SetValue(value); } - virtual void Cut() { wxTextCtrl::Cut(); } - virtual void Copy() { wxTextCtrl::Copy(); } - virtual void Paste() { wxTextCtrl::Paste(); } - virtual void SetInsertionPoint(long pos) - { wxTextCtrl::SetInsertionPoint(pos); } - virtual void SetInsertionPointEnd() - { wxTextCtrl::SetInsertionPointEnd(); } - virtual long GetInsertionPoint() const - { return wxTextCtrl::GetInsertionPoint(); } - virtual long GetLastPosition() const - { return wxTextCtrl::GetLastPosition(); } - virtual void Replace(long from, long to, const wxString& value) - { wxTextCtrl::Replace(from,to,value); } - virtual void SetSelection(long from, long to) - { wxTextCtrl::SetSelection(from,to); } - virtual void SetEditable(bool editable) - { wxTextCtrl::SetEditable(editable); } + virtual int DoInsertItems(const wxArrayStringsAdapter& items, + unsigned int pos, + void **clientData, wxClientDataType type); + virtual void DoSetItemClientData(unsigned int, void*); + virtual void* DoGetItemClientData(unsigned int) const; + virtual bool IsSorted() const { return HasFlag(wxCB_SORT); } + +// ------------------------------------------------------------------------ +// wxTextEntryBase virtual implementations: +// ------------------------------------------------------------------------ + // FIXME: This needs to be moved to some sort of common code. + virtual void WriteText(const wxString&); + virtual wxString GetValue() const; + virtual void Remove(long, long); + virtual void Cut(); + virtual void Copy(); + virtual void Paste(); + virtual void Undo(); + virtual void Redo(); + virtual bool CanUndo() const; + virtual bool CanRedo() const; + virtual void SetInsertionPoint(long pos); + virtual long GetInsertionPoint() const; + virtual wxTextPos GetLastPosition() const; + virtual void SetSelection(long from, long to); + virtual void GetSelection(long *from, long *to) const; + virtual bool IsEditable() const; + virtual void SetEditable(bool editable); }; #endif // __WX_COCOA_COMBOBOX_H__