Add *wxTopLevelWindowGTK*RequestUserAttention*int*;

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

diff --git a/include/wx/cocoa/combobox.h b/include/wx/cocoa/combobox.h
index 3ac38165e409e2d7c73bd21bfb20b5ae3bd6891e..d0e7cb6b1a45ab326dc692c6417e7512821acb6f 100644 (file)
--- a/include/wx/cocoa/combobox.h
+++ b/include/wx/cocoa/combobox.h
@@ -1,29 +1,47 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/cocoa/combobox.h
 // Purpose:     wxComboBox class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wx/cocoa/combobox.h
 // Purpose:     wxComboBox class

-// Author:      David Elliott
+// Author:      Ryan Norton

 // Modified by:
 // Modified by:

-// Created:     2003/07/14
+// Created:     2005/02/16

 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_COMBOBOX_H__
 #define __WX_COCOA_COMBOBOX_H__
 
 /////////////////////////////////////////////////////////////////////////////
 
 #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;
+};
+
+//begin combobox.h
+
+#include "wx/dynarray.h"

 
 // ========================================================================
 // wxComboBox
 // ========================================================================
 
 // ========================================================================
 // 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()
 {
     DECLARE_DYNAMIC_CLASS(wxComboBox)
     DECLARE_EVENT_TABLE()

-//    WX_DECLARE_COCOA_OWNER(NSComboBox,NSTextField,NSView)
+    WX_DECLARE_COCOA_OWNER(NSComboBox,NSTextField,NSView)

 // ------------------------------------------------------------------------
 // initialization
 // ------------------------------------------------------------------------
 // ------------------------------------------------------------------------
 // initialization
 // ------------------------------------------------------------------------


@@ -40,6 +58,18 @@ public:
     {
         Create(parent, winid, value, pos, size, n, choices, style, validator, name);
     }
     {
         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,
 
     bool Create(wxWindow *parent, wxWindowID winid,
             const wxString& value = wxEmptyString,


@@ -49,12 +79,23 @@ public:
             long style = 0,
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxComboBoxNameStr);
             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:
     virtual ~wxComboBox();
 
 // ------------------------------------------------------------------------
 // Cocoa callbacks
 // ------------------------------------------------------------------------
 protected:

+    wxArrayPtrVoid m_Datas;
+    virtual void doWxEvent(int nEvent);
+

 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------
 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------


@@ -63,7 +104,6 @@ public:
     virtual void SetSelection(int);
     // Overlapping methods
     virtual wxString GetStringSelection();
     virtual void SetSelection(int);
     // Overlapping methods
     virtual wxString GetStringSelection();

-    virtual void SetStringSelection(wxString& selection);

     // wxItemContainer
     virtual void Clear();
     virtual void Delete(int);
     // wxItemContainer
     virtual void Clear();
     virtual void Delete(int);


@@ -71,7 +111,6 @@ public:
     virtual wxString GetString(int) const;
     virtual void SetString(int, const wxString&);
     virtual int FindString(const wxString&) const;
     virtual wxString GetString(int) const;
     virtual void SetString(int, const wxString&);
     virtual int FindString(const wxString&) const;

-    virtual void Select(int) {}

     virtual int GetSelection() const;
     virtual int DoAppend(const wxString&);
     virtual int DoInsert(const wxString&, int);
     virtual int GetSelection() const;
     virtual int DoAppend(const wxString&);
     virtual int DoInsert(const wxString&, int);


@@ -93,7 +132,7 @@ public:
     {   wxTextCtrl::SetInsertionPointEnd(); }
     virtual long GetInsertionPoint() const
     {   return wxTextCtrl::GetInsertionPoint(); }
     {   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); }
     {   return wxTextCtrl::GetLastPosition(); }
     virtual void Replace(long from, long to, const wxString& value)
     {   wxTextCtrl::Replace(from,to,value); }


@@ -101,6 +140,24 @@ public:
     {   wxTextCtrl::SetSelection(from,to); }
     virtual void SetEditable(bool editable)
     {   wxTextCtrl::SetEditable(editable); }
     {   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__
 };
 
 #endif // __WX_COCOA_COMBOBOX_H__