fixed wxListBox inheritance

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/motif/listbox.h b/include/wx/motif/listbox.h
index 6f352ec72878209041543fa2a43dd2a6b98c96a9..70715fd9484c8cdd429bef045cc56f9c762cf6ff 100644 (file)
--- a/include/wx/motif/listbox.h
+++ b/include/wx/motif/listbox.h
@@ -26,7 +26,7 @@ class WXDLLEXPORT wxArrayInt;
 WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
 
 // List box item
 WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
 
 // List box item

-class WXDLLEXPORT wxListBox: public wxControlWithItems
+class WXDLLEXPORT wxListBox: public wxListBoxBase

 {
 DECLARE_DYNAMIC_CLASS(wxListBox)
 
 {
 DECLARE_DYNAMIC_CLASS(wxListBox)
 


@@ -87,7 +87,7 @@ public:
 
     // For single or multiple choice list item
     virtual int GetSelections(wxArrayInt& aSelections) const;
 
     // For single or multiple choice list item
     virtual int GetSelections(wxArrayInt& aSelections) const;

-    virtual bool Selected(int n) const ;
+    virtual bool IsSelected(int n) const ;

     virtual wxString GetString(int n) const ;
 
     // Set the specified item at the first visible item
     virtual wxString GetString(int n) const ;
 
     // Set the specified item at the first visible item

diff --git a/src/motif/listbox.cpp b/src/motif/listbox.cpp
index 6587b742b2ceeee6a77e7aa02be505105eaaa458..8b25c36f2a3ca3f5d1d82f7f01bd4265f47ba11a 100644 (file)
--- a/src/motif/listbox.cpp
+++ b/src/motif/listbox.cpp
@@ -414,7 +414,7 @@ void wxListBox::SetSelection(int N, bool select)
     m_inSetValue = FALSE;
 }
 
     m_inSetValue = FALSE;
 }
 

-bool wxListBox::Selected(int N) const
+bool wxListBox::IsSelected(int N) const

 {
     // In Motif, no simple way to determine if the item is selected.
     wxArrayInt theSelections;
 {
     // In Motif, no simple way to determine if the item is selected.
     wxArrayInt theSelections;