Fix off by 1 error in wxHTML font size from points calculation.

[wxWidgets.git] / include / wx / os2 / listbox.h

diff --git a/include/wx/os2/listbox.h b/include/wx/os2/listbox.h
index 4c67ca7fcd334ccabe7189bbe3c97b9ea8fae06c..b3160b9286e9ac7967dea9bf05f8e325f7ac231c 100644 (file)
--- a/include/wx/os2/listbox.h
+++ b/include/wx/os2/listbox.h
@@ -17,7 +17,7 @@
 // ----------------------------------------------------------------------------
 
 #if wxUSE_OWNER_DRAWN
 // ----------------------------------------------------------------------------
 
 #if wxUSE_OWNER_DRAWN

-    class WXDLLEXPORT wxOwnerDrawn;
+    class WXDLLIMPEXP_FWD_CORE wxOwnerDrawn;

 
     // define the array of list box items
     #include  "wx/dynarray.h"
 
     // define the array of list box items
     #include  "wx/dynarray.h"


@@ -32,7 +32,7 @@ class wxArrayInt;
 // List box control
 // ----------------------------------------------------------------------------
 
 // List box control
 // ----------------------------------------------------------------------------
 

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

 {
 public:
     // ctors and such
 {
 public:
     // ctors and such


@@ -103,38 +103,22 @@ public:
     //
     // Implement base class pure virtuals
     //
     //
     // Implement base class pure virtuals
     //

-    virtual void          Clear(void);
-    virtual void          Delete(int n);
+    virtual void          DoClear(void);
+    virtual void          DoDeleteOneItem(unsigned int n);

 
 

-    virtual int           GetCount(void) const;
-    virtual wxString      GetString(int n) const;
-    virtual void          SetString(int n, const wxString& rsString);
+    virtual unsigned int  GetCount() const;
+    virtual wxString      GetString(unsigned int n) const;
+    virtual void          SetString(unsigned int n, const wxString& rsString);

 
     virtual bool          IsSelected(int n) const;
 
     virtual bool          IsSelected(int n) const;

-    virtual void          DoSetSelection( int  n
-                                       ,bool bSelect
-                                      );
+    virtual void          DoSetSelection(int  n, bool bSelect);

     virtual int           GetSelection(void) const;
     virtual int           GetSelections(wxArrayInt& raSelections) const;
 
     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          DoSetItems( const wxArrayString& raItems
-                                     ,void **              ppClientData
-                                    );
-

     virtual void          DoSetFirstItem(int n);
 
     virtual void          DoSetFirstItem(int n);
 

-    virtual void          DoSetItemClientData( int   n
-                                              ,void* pClientData
-                                             );
-    virtual void*         DoGetItemClientData(int n) const;
-    virtual void          DoSetItemClientObject( int           n
-                                                ,wxClientData* pClientData
-                                               );
-    virtual wxClientData* DoGetItemClientObject(int n) const;
+    virtual void          DoSetItemClientData(unsigned int n, void* pClientData);
+    virtual void*         DoGetItemClientData(unsigned int n) const;

 
     //
     // wxCheckListBox support
 
     //
     // wxCheckListBox support


@@ -158,9 +142,8 @@ protected:
     bool                  HasMultipleSelection(void) const;
     virtual wxSize        DoGetBestSize(void) const;
 
     bool                  HasMultipleSelection(void) const;
     virtual wxSize        DoGetBestSize(void) const;
 

-    int                             m_nNumItems;
-    int                             m_nSelected;
-
+    unsigned int          m_nNumItems;
+    int                   m_nSelected;

 
 #if wxUSE_OWNER_DRAWN
     //
 
 #if wxUSE_OWNER_DRAWN
     //


@@ -169,7 +152,14 @@ protected:
     wxListBoxItemsArray             m_aItems;
 #endif
 
     wxListBoxItemsArray             m_aItems;
 #endif
 

-private:
+    //
+    // Implement base wxItemContainer virtuals
+    //
+    virtual int           DoInsertItems(const wxArrayStringsAdapter& items,
+                                        unsigned int pos,
+                                        void **clientData,
+                                        wxClientDataType type);
+

     DECLARE_DYNAMIC_CLASS(wxListBox)
 }; // end of wxListBox
 
     DECLARE_DYNAMIC_CLASS(wxListBox)
 }; // end of wxListBox