Implement setFont on the iOS port of wxStaticText.

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

diff --git a/interface/wx/htmllbox.h b/interface/wx/htmllbox.h
index d34646abd7f9aba65ff3dfcff2533e160c4473be..2f3cdaee16071f6266a7f437c0c14a5caa0ae9c0 100644 (file)
--- a/interface/wx/htmllbox.h
+++ b/interface/wx/htmllbox.h
@@ -2,7 +2,6 @@
 // Name:        htmllbox.h
 // Purpose:     interface of wxHtmlListBox
 // Author:      wxWidgets team
 // Name:        htmllbox.h
 // Purpose:     interface of wxHtmlListBox
 // Author:      wxWidgets team

-// RCS-ID:      $Id$

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -55,7 +54,7 @@ public:
         (it may also be set or changed later with wxVListBox::SetItemCount).
 
         There are no special styles defined for wxHtmlListBox, in particular the
         (it may also be set or changed later with wxVListBox::SetItemCount).
 
         There are no special styles defined for wxHtmlListBox, in particular the

-        wxListBox styles (with the exception of @c wxLB_MULTIPLE) can not be used here.
+        wxListBox styles (with the exception of @c wxLB_MULTIPLE) cannot be used here.

 
         Returns @true on success or @false if the control couldn't be created
     */
 
         Returns @true on success or @false if the control couldn't be created
     */


@@ -182,10 +181,10 @@ protected:
 
     @beginEventEmissionTable
     @event{EVT_LISTBOX(id, func)}
 
     @beginEventEmissionTable
     @event{EVT_LISTBOX(id, func)}

-        Process a wxEVT_COMMAND_LISTBOX_SELECTED event, when an item on the list
+        Process a @c wxEVT_LISTBOX event, when an item on the list

         is selected. See wxCommandEvent.
     @event{EVT_LISTBOX_DCLICK(id, func)}
         is selected. See wxCommandEvent.
     @event{EVT_LISTBOX_DCLICK(id, func)}

-        Process a wxEVT_COMMAND_LISTBOX_DOUBLECLICKED event, when the listbox is
+        Process a @c wxEVT_LISTBOX_DCLICK event, when the listbox is

         double-clicked. See wxCommandEvent.
     @event{EVT_HTML_CELL_CLICKED(id, func)}
         A wxHtmlCell was clicked. See wxHtmlCellEvent.
         double-clicked. See wxCommandEvent.
     @event{EVT_HTML_CELL_CLICKED(id, func)}
         A wxHtmlCell was clicked. See wxHtmlCellEvent.


@@ -197,11 +196,12 @@ protected:
 
     @library{wxhtml}
     @category{ctrl}
 
     @library{wxhtml}
     @category{ctrl}

-    @appearance{simplehtmllistbox.png}
+    @genericAppearance{simplehtmllistbox}

 
     @see wxSimpleHtmlListBox::Create
 */
 
     @see wxSimpleHtmlListBox::Create
 */

-class wxSimpleHtmlListBox : public wxHtmlListBox
+class wxSimpleHtmlListBox : public wxHtmlListBox,
+                            public wxItemContainer

 {
 public:
     /**
 {
 public:
     /**