Use native DisclosureTriangle control for wxCollapsiblePane, II

[wxWidgets.git] / src / palmos / choice.cpp

diff --git a/src/palmos/choice.cpp b/src/palmos/choice.cpp
index e0b31045ce33a58484b73bb9878456ef8459def3..7fbc1096f1190d75d91323128d3cd3e510c8915c 100644 (file)
--- a/src/palmos/choice.cpp
+++ b/src/palmos/choice.cpp
@@ -25,8 +25,9 @@
 
 #if wxUSE_CHOICE
 
 
 #if wxUSE_CHOICE
 

+#include "wx/choice.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/choice.h"

     #include "wx/utils.h"
     #include "wx/log.h"
     #include "wx/brush.h"
     #include "wx/utils.h"
     #include "wx/log.h"
     #include "wx/brush.h"


@@ -84,7 +85,7 @@ wxEND_HANDLERS_TABLE()
 
 wxCONSTRUCTOR_4( wxChoice , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size )
 #else
 
 wxCONSTRUCTOR_4( wxChoice , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size )
 #else

-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControlWithItems)

 #endif
 
 // ============================================================================
 #endif
 
 // ============================================================================


@@ -149,21 +150,19 @@ wxChoice::~wxChoice()
 // adding/deleting items to/from the list
 // ----------------------------------------------------------------------------
 
 // adding/deleting items to/from the list
 // ----------------------------------------------------------------------------
 

-int wxChoice::DoAppend(const wxString& item)
-{
-    return 0;
-}
-
-int wxChoice::DoInsert(const wxString& item, unsigned int pos)
+int wxChoice::DoInsertItems(const wxArrayStringsAdapter& items,
+                            unsigned int pos,
+                            void **clientData,
+                            wxClientDataType type)

 {
     return 0;
 }
 
 {
     return 0;
 }
 

-void wxChoice::Delete(unsigned int n)
+void wxChoice::DoDeleteOneItem(unsigned int n)

 {
 }
 
 {
 }
 

-void wxChoice::Clear()
+void wxChoice::DoClear()

 {
 }
 
 {
 }
 


@@ -215,15 +214,6 @@ void* wxChoice::DoGetItemClientData(unsigned int n) const
     return (void *)NULL;
 }
 
     return (void *)NULL;
 }
 

-void wxChoice::DoSetItemClientObject(unsigned int n, wxClientData* clientData )
-{
-}
-
-wxClientData* wxChoice::DoGetItemClientObject(unsigned int n) const
-{
-    return (wxClientData *)DoGetItemClientData(n);
-}
-

 // ----------------------------------------------------------------------------
 // wxMSW specific helpers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxMSW specific helpers
 // ----------------------------------------------------------------------------