X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83df96d63a52ebb08b9e32549dc255354b4a18d0..616c0d1f3ac084bb92f0a75dc48812e8647f1b22:/include/wx/motif/choice.h

diff --git a/include/wx/motif/choice.h b/include/wx/motif/choice.h
index 821f16096a..0f5ada2308 100644
--- a/include/wx/motif/choice.h
+++ b/include/wx/motif/choice.h
@@ -1,34 +1,35 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        choice.h
+// Name:        wx/motif/choice.h
 // Purpose:     wxChoice class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 
-#ifdef __GNUG__
-#pragma interface "choice.h"
-#endif
+#include "wx/clntdata.h"
 
-#include "wx/ctrlsub.h"
+#ifndef wxWIDGET_ARRAY_DEFINED
+    #define wxWIDGET_ARRAY_DEFINED
 
-WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
+    #include "wx/dynarray.h"
+    WX_DEFINE_ARRAY_PTR(WXWidget, wxWidgetArray);
+#endif
 
 // Choice item
-class WXDLLEXPORT wxChoice: public wxControlWithItems
+class WXDLLIMPEXP_CORE wxChoice: public wxChoiceBase
 {
     DECLARE_DYNAMIC_CLASS(wxChoice)
-        
+
 public:
     wxChoice();
-    ~wxChoice();
-    
+    virtual ~wxChoice();
+
     wxChoice(wxWindow *parent, wxWindowID id,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
@@ -37,9 +38,22 @@ public:
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxChoiceNameStr)
     {
+        Init();
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
-    
+
+    wxChoice(wxWindow *parent, wxWindowID id,
+        const wxPoint& pos,
+        const wxSize& size,
+        const wxArrayString& choices,
+        long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxChoiceNameStr)
+    {
+        Init();
+        Create(parent, id, pos, size, choices, style, validator, name);
+    }
+
     bool Create(wxWindow *parent, wxWindowID id,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
@@ -47,61 +61,65 @@ public:
         long style = 0,
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxChoiceNameStr);
-    
-    // Virtual functions required by wxControlWithItems.
-    // They are not all implemented yet :-(
-    virtual int GetCount() const;
-    virtual int DoAppend(const wxString& item);
-    virtual void DoInsertItems(const wxArrayString& items, int pos);
-    virtual void DoSetItems(const wxArrayString& items, void **clientData);
-    virtual void DoSetFirstItem(int n);
-    virtual void DoSetItemClientData(int n, void* clientData);
-    virtual void* DoGetItemClientData(int n) const;
-    virtual void DoSetItemClientObject(int n, wxClientData* clientData);
-    virtual wxClientData* DoGetItemClientObject(int n) const;
-    virtual void Select(int n);
-    virtual void SetString(int n, const wxString& s);
-    
-    // Original API
-    virtual void Append(const wxString& item);
-    virtual void Delete(int n);
-    virtual void Clear();
-    virtual int GetSelection() const ;
+
+    bool Create(wxWindow *parent, wxWindowID id,
+        const wxPoint& pos,
+        const wxSize& size,
+        const wxArrayString& choices,
+        long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxChoiceNameStr);
+
+    // implementation of wxControlWithItems
+    virtual unsigned int GetCount() const;
+    virtual int GetSelection() const;
+    virtual void DoDeleteOneItem(unsigned int n);
+    virtual void DoClear();
+    virtual void SetString(unsigned int n, const wxString& s);
+    virtual wxString GetString(unsigned int n) const;
+
+    // implementation of wxChoiceBase
     virtual void SetSelection(int n);
-    virtual int FindString(const wxString& s) const;
-    virtual wxString GetString(int n) const ;
-    
-    virtual wxString GetStringSelection() const ;
-    virtual bool SetStringSelection(const wxString& sel);
-    
-    virtual int Number() const { return m_noStrings; }
-    virtual void Command(wxCommandEvent& event);
-    
     virtual void SetColumns(int n = 1 );
     virtual int GetColumns() const ;
-    
+
+    // Original API
+    virtual void Command(wxCommandEvent& event);
+
     void SetFocus();
-    
+
     // Implementation
-    virtual void ChangeFont(bool keepOriginalSize = TRUE);
+    virtual void ChangeFont(bool keepOriginalSize = true);
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     WXWidget GetTopWidget() const { return m_formWidget; }
     WXWidget GetMainWidget() const { return m_buttonWidget; }
-    
+
+    virtual wxSize DoGetBestSize() const;
+
+    // implementation, for wxChoiceCallback
+    const wxWidgetArray& GetWidgets() const { return m_widgetArray; }
+    const wxArrayString&  GetStrings() const { return m_stringArray; }
 protected:
-    int           m_noStrings;
+    // minimum size for the text ctrl
+    wxSize GetItemsSize() const;
+    // common part of all contructors
+    void Init();
+
     WXWidget      m_menuWidget;
     WXWidget      m_buttonWidget;
-    WXWidget*     m_widgetList ;
+    wxWidgetArray m_widgetArray;
     WXWidget      m_formWidget;
-    wxStringList  m_stringList;
-    wxList        m_clientList;    // contains the client data for the items
-     
+    wxArrayString m_stringArray;
+
     virtual void DoSetSize(int x, int y,
         int width, int height,
         int sizeFlags = wxSIZE_AUTO);
+
+    // implementation of wxControlWithItems
+    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
+                              unsigned int pos,
+                              void **clientData, wxClientDataType type);
 };
 
-#endif
-// _WX_CHOICE_H_
+#endif // _WX_CHOICE_H_