X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..5180055b697078e8c6ec7db485f1f1bfa3e91abd:/include/wx/motif/choice.h

diff --git a/include/wx/motif/choice.h b/include/wx/motif/choice.h
index df445f9e9b..e2ce50b03c 100644
--- a/include/wx/motif/choice.h
+++ b/include/wx/motif/choice.h
@@ -12,76 +12,69 @@
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "choice.h"
 #endif
 
-#include "wx/ctrlsub.h"
+#include "wx/clntdata.h"
+#include "wx/dynarray.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxChoiceNameStr;
+WX_DEFINE_ARRAY(WXWidget, wxWidgetArray);
 
 // Choice item
-class WXDLLEXPORT wxChoice: public wxControlWithItems
+class WXDLLEXPORT wxChoice: public wxChoiceBase
 {
     DECLARE_DYNAMIC_CLASS(wxChoice)
 
 public:
     wxChoice();
     ~wxChoice();
-
+    
     wxChoice(wxWindow *parent, wxWindowID id,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            int n = 0, const wxString choices[] = NULL,
-            long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxChoiceNameStr)
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        int n = 0, const wxString choices[] = NULL,
+        long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxChoiceNameStr)
     {
+        Init();
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
-
+    
     bool Create(wxWindow *parent, wxWindowID id,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            int n = 0, const wxString choices[] = NULL,
-            long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxChoiceNameStr);
-
-    // Virtual functions required by wxControlWithItems.
-    // They are not all implemented yet :-(
+        const wxPoint& pos = wxDefaultPosition,
+        const wxSize& size = wxDefaultSize,
+        int n = 0, const wxString choices[] = NULL,
+        long style = 0,
+        const wxValidator& validator = wxDefaultValidator,
+        const wxString& name = wxChoiceNameStr);
+
+    // implementation of wxControlWithItems
     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 int DoInsert(const wxString& item, int pos);
     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 int GetSelection() const;
     virtual void Delete(int n);
-    virtual void Clear();
-    virtual int GetSelection() const ;
-    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 Clear();
+    virtual void SetString(int n, const wxString& s);
+    virtual wxString GetString(int n) const;
 
+    // implementation of wxChoiceBase
+    virtual void SetSelection(int n);
     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 ChangeBackgroundColour();
@@ -89,20 +82,29 @@ public:
     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 wxStringList&  GetStrings() const { return m_stringList; }
 protected:
-    int           m_noStrings;
+    // minimum size for the text ctrl
+    wxSize GetItemsSize() const;
+    // common part of all contructors
+    void Init();
+
+    size_t        m_noStrings;
     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
-
-
+    wxClientDataDictionary m_clientDataDict;
+     
     virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
+        int width, int height,
+        int sizeFlags = wxSIZE_AUTO);
 };
 
 #endif
-	// _WX_CHOICE_H_
+// _WX_CHOICE_H_