projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed wxSpinCtrl's client size computation in wxMSW to return something sensible
[wxWidgets.git]
/
src
/
os2
/
checklst.cpp
diff --git
a/src/os2/checklst.cpp
b/src/os2/checklst.cpp
index 8896782c0272efba60f6f36405c9c9ae757661af..c32fc84787a593b1cb7709dcd65b4607e41d69a4 100644
(file)
--- a/
src/os2/checklst.cpp
+++ b/
src/os2/checklst.cpp
@@
-26,14
+26,14
@@
#include "wx/window.h"
#include "wx/dcmemory.h"
#include "wx/dcscreen.h"
#include "wx/window.h"
#include "wx/dcmemory.h"
#include "wx/dcscreen.h"
+ #include "wx/settings.h"
+ #include "wx/listbox.h"
+ #include "wx/bitmap.h"
+ #include "wx/colour.h"
+ #include "wx/font.h"
#endif
#endif
-#include "wx/colour.h"
-#include "wx/font.h"
-#include "wx/bitmap.h"
-#include "wx/listbox.h"
#include "wx/ownerdrw.h"
#include "wx/ownerdrw.h"
-#include "wx/settings.h"
#define INCL_PM
#include <os2.h>
#define INCL_PM
#include <os2.h>
@@
-284,10
+284,13
@@
void wxCheckListBox::Delete(unsigned int n)
m_aItems.RemoveAt(n);
} // end of wxCheckListBox::Delete
m_aItems.RemoveAt(n);
} // end of wxCheckListBox::Delete
-void wxCheckListBox::DoInsertItems(const wxArrayString& items, unsigned int pos)
+int wxCheckListBox::DoInsertItems(const wxArrayStringsAdapter& items,
+ unsigned int pos,
+ void **clientData,
+ wxClientDataType type)
{
// pos is validated in wxListBox
{
// pos is validated in wxListBox
-
wxListBox::DoInsertItems( items, pos
);
+
int result = wxListBox::DoInsertItems( items, pos, clientData, type
);
unsigned int n = items.GetCount();
for (unsigned int i = 0; i < n; i++)
{
unsigned int n = items.GetCount();
for (unsigned int i = 0; i < n; i++)
{
@@
-301,7
+304,8
@@
void wxCheckListBox::DoInsertItems(const wxArrayString& items, unsigned int pos)
MPFROMP(pNewItem)
);
}
MPFROMP(pNewItem)
);
}
-} // end of wxCheckListBox::InsertItems
+ return result;
+} // end of wxCheckListBox::DoInsertItems
bool wxCheckListBox::SetFont ( const wxFont& rFont )
{
bool wxCheckListBox::SetFont ( const wxFont& rFont )
{