projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cast for argument to delete[] - VC6 doesn't want to delete a const pointer
[wxWidgets.git]
/
include
/
wx
/
os2
/
checklst.h
diff --git
a/include/wx/os2/checklst.h
b/include/wx/os2/checklst.h
index 8d53b0097435c4e1345607d4b1a4d26f698f42c2..4ead4b063a48a1efc208846634a106632f4c7de8 100644
(file)
--- a/
include/wx/os2/checklst.h
+++ b/
include/wx/os2/checklst.h
@@
-1,5
+1,5
@@
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
-// Name: checklst.h
+// Name:
wx/os2/
checklst.h
// Purpose: wxCheckListBox class - a listbox with checkable items
// Note: this is an optional class.
// Author: David Webster
// Purpose: wxCheckListBox class - a listbox with checkable items
// Note: this is an optional class.
// Author: David Webster
@@
-7,7
+7,7
@@
// Created: 10/13/99
// RCS-ID: $Id$
// Copyright: (c) David Webster
// Created: 10/13/99
// RCS-ID: $Id$
// Copyright: (c) David Webster
-// Licence: wxWi
dget
s licence
+// Licence: wxWi
ndow
s licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CHECKLST_H_
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CHECKLST_H_
@@
-15,13
+15,11
@@
#include <stddef.h>
#include <stddef.h>
-#include "wx/
setup
.h"
+#include "wx/
defs
.h"
class wxOwnerDrawn; // so the compiler knows, it is a class.
class wxOwnerDrawn; // so the compiler knows, it is a class.
-class wxCheckListBoxItem; // fwd decl, define in checklst.cpp
-
-class WXDLLEXPORT wxCheckListBox : public wxListBox
+class WXDLLIMPEXP_CORE wxCheckListBox : public wxCheckListBoxBase
{
public:
//
{
public:
//
@@
-51,21
+49,15
@@
public:
//
// Override base class virtuals
//
//
// Override base class virtuals
//
- virtual void Delete(int n);
- virtual void InsertItems( int nItems
- ,const wxString asItems[]
- ,int nPos
- );
+ virtual void Delete(unsigned int n);
virtual bool SetFont(const wxFont &rFont);
//
// Items may be checked
//
virtual bool SetFont(const wxFont &rFont);
//
// Items may be checked
//
- bool IsChecked(size_t uiIndex) const;
- void Check( size_t uiIndex
- ,bool bCheck = TRUE
- );
+ bool IsChecked(unsigned int uiIndex) const;
+ void Check(unsigned int uiIndex, bool bCheck = true);
//
// Accessors
//
// Accessors
@@
-80,6
+72,10
@@
protected:
virtual wxOwnerDrawn* CreateItem(size_t n);
virtual long OS2OnMeasure(WXMEASUREITEMSTRUCT* pItem);
virtual wxOwnerDrawn* CreateItem(size_t n);
virtual long OS2OnMeasure(WXMEASUREITEMSTRUCT* pItem);
+ virtual int DoInsertItems(const wxArrayStringsAdapter & items,
+ unsigned int pos,
+ void **clientData, wxClientDataType type);
+
//
// Pressing space or clicking the check box toggles the item
//
//
// Pressing space or clicking the check box toggles the item
//
@@
-87,11
+83,11
@@
protected:
void OnLeftClick(wxMouseEvent& rEvent);
private:
void OnLeftClick(wxMouseEvent& rEvent);
private:
- size_t
m_nItemHeight; // height of checklistbox items (the same for all)
+ size_t m_nItemHeight; // height of checklistbox items (the same for all)
DECLARE_DYNAMIC_CLASS(wxCheckListBox)
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxCheckListBox)
DECLARE_EVENT_TABLE()
-}; // end of CLASS wxCheckListBox
Item
+}; // end of CLASS wxCheckListBox
#endif
// _WX_CHECKLST_H_
#endif
// _WX_CHECKLST_H_