addind nonowned window implementation

[wxWidgets.git] / include / wx / motif / choice.h

diff --git a/include/wx/motif/choice.h b/include/wx/motif/choice.h
index 34d562dc7413945a222092c5c9f987b20ee1681d..7532c50ba256c8f099463fa5f0f93273a4cb1840 100644 (file)
--- a/include/wx/motif/choice.h
+++ b/include/wx/motif/choice.h
@@ -28,7 +28,7 @@ class WXDLLEXPORT wxChoice: public wxChoiceBase
 
 public:
     wxChoice();
 
 public:
     wxChoice();

-    ~wxChoice();
+    virtual ~wxChoice();

 
     wxChoice(wxWindow *parent, wxWindowID id,
         const wxPoint& pos = wxDefaultPosition,
 
     wxChoice(wxWindow *parent, wxWindowID id,
         const wxPoint& pos = wxDefaultPosition,


@@ -72,15 +72,9 @@ public:
 
     // implementation of wxControlWithItems
     virtual unsigned int GetCount() const;
 
     // implementation of wxControlWithItems
     virtual unsigned int GetCount() const;

-    virtual int DoAppend(const wxString& item);
-    virtual int DoInsert(const wxString& item, unsigned int pos);
-    virtual void DoSetItemClientData(unsigned int n, void* clientData);
-    virtual void* DoGetItemClientData(unsigned int n) const;
-    virtual void DoSetItemClientObject(unsigned int n, wxClientData* clientData);
-    virtual wxClientData* DoGetItemClientObject(unsigned int n) const;

     virtual int GetSelection() const;
     virtual int GetSelection() const;

-    virtual void Delete(unsigned int n);
-    virtual void Clear();
+    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;
 
     virtual void SetString(unsigned int n, const wxString& s);
     virtual wxString GetString(unsigned int n) const;
 


@@ -118,12 +112,15 @@ protected:
     wxWidgetArray m_widgetArray;
     WXWidget      m_formWidget;
     wxStringList  m_stringList;
     wxWidgetArray m_widgetArray;
     WXWidget      m_formWidget;
     wxStringList  m_stringList;

-    wxClientDataDictionary m_clientDataDict;

 
     virtual void DoSetSize(int x, int y,
         int width, int height,
         int sizeFlags = wxSIZE_AUTO);
 
     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_