X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/421a84317fc3d53ac4fd64613f1af2d19018efc5..2458d90b1d5a26dc667c2deac63e499570744f5f:/include/wx/cocoa/combobox.h

diff --git a/include/wx/cocoa/combobox.h b/include/wx/cocoa/combobox.h
index 3ac38165e4..4db5e44998 100644
--- a/include/wx/cocoa/combobox.h
+++ b/include/wx/cocoa/combobox.h
@@ -6,14 +6,12 @@
 // Created:     2003/07/14
 // 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"
-
 //#include "wx/cocoa/NSTableView.h"
 
 // ========================================================================
@@ -40,6 +38,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,6 +59,14 @@ 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();
 
 // ------------------------------------------------------------------------
@@ -63,7 +81,8 @@ public:
     virtual void SetSelection(int);
     // Overlapping methods
     virtual wxString GetStringSelection();
-    virtual void SetStringSelection(wxString& selection);
+    // other methods
+    virtual void SetStringSelection(const wxString& selection);
     // wxItemContainer
     virtual void Clear();
     virtual void Delete(int);
@@ -93,7 +112,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); }
@@ -101,6 +120,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__