projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixing c++11 build
[wxWidgets.git]
/
include
/
wx
/
htmllbox.h
diff --git
a/include/wx/htmllbox.h
b/include/wx/htmllbox.h
index 45a1765b589de3a4d28326cc3e91231942c9d21b..1a941159ddb0f9f4898d8f81209e9177a15dc23a 100644
(file)
--- a/
include/wx/htmllbox.h
+++ b/
include/wx/htmllbox.h
@@
-196,9
+196,10
@@
private:
#define wxHLB_DEFAULT_STYLE wxBORDER_SUNKEN
#define wxHLB_MULTIPLE wxLB_MULTIPLE
#define wxHLB_DEFAULT_STYLE wxBORDER_SUNKEN
#define wxHLB_MULTIPLE wxLB_MULTIPLE
-class WXDLLIMPEXP_HTML wxSimpleHtmlListBox :
public wxHtmlListBox,
- public wxItemContainer
+class WXDLLIMPEXP_HTML wxSimpleHtmlListBox :
+ public wxWindowWithItems<wxHtmlListBox, wxItemContainer>
{
{
+ DECLARE_ABSTRACT_CLASS(wxSimpleHtmlListBox)
public:
// wxListbox-compatible constructors
// ---------------------------------
public:
// wxListbox-compatible constructors
// ---------------------------------
@@
-253,9
+254,6
@@
public:
int GetSelection() const
{ return wxVListBox::GetSelection(); }
int GetSelection() const
{ return wxVListBox::GetSelection(); }
- // see ctrlsub.h for more info about this:
- wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
-
// accessing strings
// -----------------
// accessing strings
// -----------------