add a critical section protecting ms_prev variables (replaces patch 1819224)

[wxWidgets.git] / include / wx / cocoa / combobox.h

diff --git a/include/wx/cocoa/combobox.h b/include/wx/cocoa/combobox.h
index e7d8e342c6a5bed3d5a66fe0faeb1aaa979137a0..3a8a9e2d710321a2577caadfb4900f4d11e907ae 100644 (file)
--- a/include/wx/cocoa/combobox.h
+++ b/include/wx/cocoa/combobox.h
@@ -17,6 +17,8 @@
 #include "wx/hashmap.h"
 #include "wx/cocoa/ObjcAssociate.h"
 
+#include "wx/textctrl.h"
+
 DECLARE_WXCOCOA_OBJC_CLASS(NSComboBox);
 
 WX_DECLARE_OBJC_HASHMAP(NSComboBox);
@@ -28,6 +30,7 @@ public:
     void DisassociateNSComboBox(WX_NSComboBox cocoaNSComboBox);
 
     virtual void doWxEvent(int nEvent) = 0;
+    virtual ~wxCocoaNSComboBox() { }
 };
 
 //begin combobox.h
@@ -37,11 +40,12 @@ public:
 // ========================================================================
 // wxComboBox
 // ========================================================================
-class WXDLLEXPORT wxComboBox : public wxTextCtrl, public wxComboBoxBase, protected wxCocoaNSComboBox
+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(NSTextField,NSControl,NSView)
 // ------------------------------------------------------------------------
 // initialization
 // ------------------------------------------------------------------------
@@ -96,68 +100,55 @@ 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();
     // wxItemContainer
-    virtual void Clear();
-    virtual void Delete(int);
-    virtual int GetCount() const;
-    virtual wxString GetString(int) const;
-    virtual void SetString(int, const wxString&);
+    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 wxTextPos 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 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(); }
+    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__