projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1. added wxGTK::wxToolBar::SetToolShortHelp() and test for it in sample
[wxWidgets.git]
/
include
/
wx
/
msw
/
checklst.h
diff --git
a/include/wx/msw/checklst.h
b/include/wx/msw/checklst.h
index f511a98087bd14949bb5701ffeea5c0f20559bac..24003d4d439b1ce66d3702e5a91e145c945f656c 100644
(file)
--- a/
include/wx/msw/checklst.h
+++ b/
include/wx/msw/checklst.h
@@
-2,7
+2,7
@@
// Name: checklst.h
// Purpose: wxCheckListBox class - a listbox with checkable items
// Author: Vadim Zeitlin
// Name: checklst.h
// Purpose: wxCheckListBox class - a listbox with checkable items
// Author: Vadim Zeitlin
-// Modified by:
+// Modified by:
// Created: 16.11.97
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Created: 16.11.97
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
@@
-16,15
+16,17
@@
#pragma interface "checklst.h"
#endif
#pragma interface "checklst.h"
#endif
-typedef unsigned int uint;
+#include "wx/setup.h"
-#if !USE_OWNER_DRAWN
+#if !
wx
USE_OWNER_DRAWN
#error "wxCheckListBox class requires owner-drawn functionality."
#endif
#error "wxCheckListBox class requires owner-drawn functionality."
#endif
-class wxCheckListBoxItem; // fwd decl, define in checklst.cpp
+#include "wx/listbox.h"
-class wxCheckListBox : public wxListBox
+class wxCheckListBoxItem; // fwd decl, defined in checklst.cpp
+
+class WXDLLEXPORT wxCheckListBox : public wxListBox
{
DECLARE_DYNAMIC_CLASS(wxCheckListBox)
public:
{
DECLARE_DYNAMIC_CLASS(wxCheckListBox)
public:
@@
-33,24
+35,29
@@
public:
wxCheckListBox(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
wxCheckListBox(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
- int nStrings = 0,
+ int nStrings = 0,
const wxString choices[] = NULL,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr);
const wxString choices[] = NULL,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxListBoxNameStr);
-// const wxFont& font = wxNullFont);
+
+ // override base class virtuals
+ virtual void Delete(int n);
+ virtual void InsertItems(int nItems, const wxString items[], int pos);
+
+ virtual bool SetFont( const wxFont &font );
// items may be checked
// items may be checked
- bool
IsChecked(uin
t uiIndex) const;
- void
Check(uin
t uiIndex, bool bCheck = TRUE);
+ bool
IsChecked(size_
t uiIndex) const;
+ void
Check(size_
t uiIndex, bool bCheck = TRUE);
// accessors
// accessors
-
uint
GetItemHeight() const { return m_nItemHeight; }
+
size_t
GetItemHeight() const { return m_nItemHeight; }
protected:
// we create our items ourselves and they have non-standard size,
// so we need to override these functions
protected:
// we create our items ourselves and they have non-standard size,
// so we need to override these functions
- virtual wxOwnerDrawn *CreateItem(
uin
t n);
+ virtual wxOwnerDrawn *CreateItem(
size_
t n);
virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
// pressing space or clicking the check box toggles the item
virtual bool MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
// pressing space or clicking the check box toggles the item
@@
-58,7
+65,7
@@
protected:
void OnLeftClick(wxMouseEvent& event);
private:
void OnLeftClick(wxMouseEvent& event);
private:
-
uin
t m_nItemHeight; // height of checklistbox items (the same for all)
+
size_
t m_nItemHeight; // height of checklistbox items (the same for all)
DECLARE_EVENT_TABLE()
};
DECLARE_EVENT_TABLE()
};