bracket unused function

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

diff --git a/include/wx/htmllbox.h b/include/wx/htmllbox.h
index a8f41d7f76c92f968efcf0c033be6fbe140e991d..f610b8383f868f4bf475c3594b638cc662d87c86 100644 (file)
--- a/include/wx/htmllbox.h
+++ b/include/wx/htmllbox.h
@@ -25,8 +25,8 @@ class WXDLLIMPEXP_FWD_HTML wxHtmlWinParser;
 class WXDLLIMPEXP_FWD_HTML wxHtmlListBoxCache;
 class WXDLLIMPEXP_FWD_HTML wxHtmlListBoxStyle;
 
 class WXDLLIMPEXP_FWD_HTML wxHtmlListBoxCache;
 class WXDLLIMPEXP_FWD_HTML wxHtmlListBoxStyle;
 

-extern WXDLLIMPEXP_DATA_HTML(const wxChar) wxHtmlListBoxNameStr[];
-extern WXDLLIMPEXP_DATA_HTML(const wxChar) wxSimpleHtmlListBoxNameStr[];
+extern WXDLLIMPEXP_DATA_HTML(const char) wxHtmlListBoxNameStr[];
+extern WXDLLIMPEXP_DATA_HTML(const char) wxSimpleHtmlListBoxNameStr[];

 
 // ----------------------------------------------------------------------------
 // wxHtmlListBox
 
 // ----------------------------------------------------------------------------
 // wxHtmlListBox


@@ -185,7 +185,7 @@ private:
 
 
     DECLARE_EVENT_TABLE()
 
 
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxHtmlListBox)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlListBox);

 };
 
 
 };
 
 


@@ -199,6 +199,7 @@ private:
 class WXDLLIMPEXP_HTML wxSimpleHtmlListBox : public wxHtmlListBox,
                                              public wxItemContainer
 {
 class WXDLLIMPEXP_HTML wxSimpleHtmlListBox : public wxHtmlListBox,
                                              public wxItemContainer
 {

+    DECLARE_ABSTRACT_CLASS(wxSimpleHtmlListBox)

 public:
     // wxListbox-compatible constructors
     // ---------------------------------
 public:
     // wxListbox-compatible constructors
     // ---------------------------------


@@ -302,6 +303,14 @@ protected:
     virtual wxString OnGetItem(size_t n) const
         { return m_items[n]; }
 
     virtual wxString OnGetItem(size_t n) const
         { return m_items[n]; }
 

+    virtual void InitEvent(wxCommandEvent& event, int n)
+        {
+            // we're not a virtual control and we can include the string
+            // of the item which was clicked:
+            event.SetString(m_items[n]);
+            wxVListBox::InitEvent(event, n);
+        }
+

     wxArrayString   m_items;
     wxArrayPtrVoid  m_HTMLclientData;
 
     wxArrayString   m_items;
     wxArrayPtrVoid  m_HTMLclientData;
 


@@ -309,7 +318,7 @@ protected:
     // not be named m_clientdata as that clashes with the name of an
     // anonymous struct member in wxEvtHandler, which we derive from.
 
     // not be named m_clientdata as that clashes with the name of an
     // anonymous struct member in wxEvtHandler, which we derive from.
 

-    DECLARE_NO_COPY_CLASS(wxSimpleHtmlListBox)
+    wxDECLARE_NO_COPY_CLASS(wxSimpleHtmlListBox);

 };
 
 #endif // _WX_HTMLLBOX_H_
 };
 
 #endif // _WX_HTMLLBOX_H_