don't remove handlers from wxPendingEvents list, they now do it themselves when they...

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

diff --git a/src/palmos/listbox.cpp b/src/palmos/listbox.cpp
index 6876e0668f0f65df0ddfb9b2fb9bd21776453fac..34d50d070c24ddf13321c77bd87cc295ac92987f 100644 (file)
--- a/src/palmos/listbox.cpp
+++ b/src/palmos/listbox.cpp
@@ -28,9 +28,9 @@
     #include "wx/dc.h"
     #include "wx/utils.h"
     #include "wx/log.h"
     #include "wx/dc.h"
     #include "wx/utils.h"
     #include "wx/log.h"

+    #include "wx/window.h"

 #endif
 
 #endif
 

-#include "wx/window.h"

 #include "wx/palmos/private.h"
 
 #if wxUSE_OWNER_DRAWN
 #include "wx/palmos/private.h"
 
 #if wxUSE_OWNER_DRAWN


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

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

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


@@ -177,20 +177,11 @@ void wxListBox::DoSetFirstItem(int N)
 {
 }
 
 {
 }
 

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

 {
 }
 
 {
 }
 

-int wxListBox::DoAppend(const wxString& item)
-{
-    return 0;
-}
-
-void wxListBox::DoSetItems(const wxArrayString& choices, void** clientData)
-{
-}
-
-void wxListBox::Clear()
+void wxListBox::DoClear()

 {
 }
 
 {
 }
 


@@ -207,20 +198,11 @@ bool wxListBox::IsSelected(int N) const
     return false;
 }
 
     return false;
 }
 

-wxClientData* wxListBox::DoGetItemClientObject(unsigned int n) const
-{
-    return (wxClientData *)DoGetItemClientData(n);
-}
-

 void *wxListBox::DoGetItemClientData(unsigned int n) const
 {
     return (void *)NULL;
 }
 
 void *wxListBox::DoGetItemClientData(unsigned int n) const
 {
     return (void *)NULL;
 }
 

-void wxListBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
-{
-}
-

 void wxListBox::DoSetItemClientData(unsigned int n, void *clientData)
 {
 }
 void wxListBox::DoSetItemClientData(unsigned int n, void *clientData)
 {
 }


@@ -243,11 +225,13 @@ wxString wxListBox::GetString(unsigned int n) const
     return wxEmptyString;
 }
 
     return wxEmptyString;
 }
 

-void
-wxListBox::DoInsertItems(const wxArrayString& items, unsigned int pos)
+int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,
+                             unsigned int pos,
+                             void **clientData,
+                             wxClientDataType type)

 {
 {

+    return 0;

 }
 }

-

 void wxListBox::SetString(unsigned int n, const wxString& s)
 {
 }
 void wxListBox::SetString(unsigned int n, const wxString& s)
 {
 }