Don't define __STRICT_ANSI__, we should build both with and without it.

[wxWidgets.git] / include / wx / htmllbox.h

diff --git a/include/wx/htmllbox.h b/include/wx/htmllbox.h
index 45a1765b589de3a4d28326cc3e91231942c9d21b..27c3a36c301a3a066444aaa02125802090288ebc 100644 (file)
--- a/include/wx/htmllbox.h
+++ b/include/wx/htmllbox.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     31.05.03
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     31.05.03

-// RCS-ID:      $Id$

 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -196,9 +195,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 +253,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
     // -----------------