X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e92ea6291662dd0044f4469bcea03e3040a48f7d..a570e8f8febd7213e789647478298293df4519db:/include/wx/cocoa/combobox.h diff --git a/include/wx/cocoa/combobox.h b/include/wx/cocoa/combobox.h index 2b665585d3..cc262de82d 100644 --- a/include/wx/cocoa/combobox.h +++ b/include/wx/cocoa/combobox.h @@ -1,29 +1,48 @@ ///////////////////////////////////////////////////////////////////////////// // 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: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __WX_COCOA_COMBOBOX_H__ #define __WX_COCOA_COMBOBOX_H__ -#include "wx/textctrl.h" +//Begin NSComboBox.h -//#include "wx/cocoa/NSTableView.h" +#include "wx/hashmap.h" +#include "wx/cocoa/ObjcAssociate.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 wxTextCtrl, public wxComboBoxBase, protected wxCocoaNSComboBox { DECLARE_DYNAMIC_CLASS(wxComboBox) DECLARE_EVENT_TABLE() -// WX_DECLARE_COCOA_OWNER(NSComboBox,NSTextField,NSView) + WX_DECLARE_COCOA_OWNER(NSComboBox,NSTextField,NSView) // ------------------------------------------------------------------------ // initialization // ------------------------------------------------------------------------ @@ -40,6 +59,18 @@ public: { Create(parent, winid, value, pos, size, n, choices, style, validator, name); } + wxComboBox(wxWindow *parent, wxWindowID winid, + const wxString& value, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxComboBoxNameStr) + { + Create(parent, winid, value, pos, size, choices, style, + validator, name); + } bool Create(wxWindow *parent, wxWindowID winid, const wxString& value = wxEmptyString, @@ -49,37 +80,45 @@ public: long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxComboBoxNameStr); + bool Create(wxWindow *parent, wxWindowID winid, + const wxString& value, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxComboBoxNameStr); virtual ~wxComboBox(); // ------------------------------------------------------------------------ // Cocoa callbacks // ------------------------------------------------------------------------ protected: + wxArrayPtrVoid m_Datas; + virtual void doWxEvent(int nEvent); + // ------------------------------------------------------------------------ // Implementation // ------------------------------------------------------------------------ public: // 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 Delete(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; + virtual int DoInsert(const wxString&, unsigned int pos); + virtual void DoSetItemClientData(unsigned int, void*); + virtual void* DoGetItemClientData(unsigned int) const; + virtual void DoSetItemClientObject(unsigned int, wxClientData*); + virtual wxClientData* DoGetItemClientObject(unsigned int) const; // wxComboBoxBase pure virtuals virtual wxString GetValue() const { return wxTextCtrl::GetValue(); } @@ -94,7 +133,7 @@ public: { wxTextCtrl::SetInsertionPointEnd(); } virtual long GetInsertionPoint() const { return wxTextCtrl::GetInsertionPoint(); } - virtual long GetLastPosition() const + virtual wxTextPos GetLastPosition() const { return wxTextCtrl::GetLastPosition(); } virtual void Replace(long from, long to, const wxString& value) { wxTextCtrl::Replace(from,to,value); } @@ -102,6 +141,24 @@ public: { wxTextCtrl::SetSelection(from,to); } virtual void SetEditable(bool editable) { wxTextCtrl::SetEditable(editable); } + virtual bool IsEditable() const + { return !HasFlag(wxCB_READONLY); } + virtual void Undo() + { wxTextCtrl::Undo(); } + virtual void Redo() + { wxTextCtrl::Redo(); } + virtual void SelectAll() + { wxTextCtrl::SelectAll(); } + virtual bool CanCopy() const + { return wxTextCtrl::CanCopy(); } + virtual bool CanCut() const + { return wxTextCtrl::CanCut(); } + virtual bool CanPaste() const + { return wxTextCtrl::CanPaste(); } + virtual bool CanUndo() const + { return wxTextCtrl::CanUndo(); } + virtual bool CanRedo() const + { return wxTextCtrl::CanRedo(); } }; #endif // __WX_COCOA_COMBOBOX_H__