X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/584ad2a32fec156c6049145d7ece9a33213aea28..b4affacc1059659eb3772240ee3517df44fb6a44:/include/wx/os2/listbox.h?ds=sidebyside

diff --git a/include/wx/os2/listbox.h b/include/wx/os2/listbox.h
index a1bba2d821..01070daa9e 100644
--- a/include/wx/os2/listbox.h
+++ b/include/wx/os2/listbox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        listbox.h
+// Name:        wx/os2/listbox.h
 // Purpose:     wxListBox class
 // Author:      David Webster
 // Modified by:
@@ -17,12 +17,12 @@
 // ----------------------------------------------------------------------------
 
 #if wxUSE_OWNER_DRAWN
-  class WXDLLEXPORT wxOwnerDrawn;
+    class WXDLLEXPORT wxOwnerDrawn;
 
-  // define the array of list box items
-  #include  <wx/dynarray.h>
+    // define the array of list box items
+    #include  "wx/dynarray.h"
 
-  WX_DEFINE_EXPORTED_ARRAY(wxOwnerDrawn *, wxListBoxItemsArray);
+    WX_DEFINE_EXPORTED_ARRAY_PTR(wxOwnerDrawn *, wxListBoxItemsArray);
 #endif // wxUSE_OWNER_DRAWN
 
 // forward decl for GetSelections()
@@ -106,24 +106,17 @@ public:
     virtual void          Clear(void);
     virtual void          Delete(int n);
 
-    virtual int           GetCount(void) const;
+    virtual size_t        GetCount() const;
     virtual wxString      GetString(int n) const;
-    virtual void          SetString( int             n
-                                    ,const wxString& rsString
-                                   );
-    virtual int           FindString(const wxString& rsString) const;
+    virtual void          SetString(int n, const wxString& rsString);
 
     virtual bool          IsSelected(int n) const;
-    virtual void          SetSelection( int  n
-                                       ,bool bSelect = TRUE
-                                      );
+    virtual void          DoSetSelection(int  n, bool bSelect);
     virtual int           GetSelection(void) const;
     virtual int           GetSelections(wxArrayInt& raSelections) const;
 
     virtual int           DoAppend(const wxString& rsItem);
-    virtual void          DoInsertItems( const wxArrayString& raItems
-                                        ,int                  rPos
-                                       );
+    virtual void          DoInsertItems( const wxArrayString& raItems, int rPos );
     virtual void          DoSetItems( const wxArrayString& raItems
                                      ,void **              ppClientData
                                     );
@@ -161,9 +154,8 @@ protected:
     bool                  HasMultipleSelection(void) const;
     virtual wxSize        DoGetBestSize(void) const;
 
-    int                             m_nNumItems;
-    int                             m_nSelected;
-
+    size_t  m_nNumItems;
+    int     m_nSelected;
 
 #if wxUSE_OWNER_DRAWN
     //
@@ -176,5 +168,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxListBox)
 }; // end of wxListBox
 
-#endif
-    // _WX_LISTBOX_H_
+#endif // _WX_LISTBOX_H_