Block all events in wxSpinCtrl::SetValue etc.

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

diff --git a/include/wx/htmllbox.h b/include/wx/htmllbox.h
index 9e5a4b44b7a58aaf9c666f67eec620d54ba5a2ef..0cc43ef289c00eb85f881451aec1bdda2cb8a379 100644 (file)
--- a/include/wx/htmllbox.h
+++ b/include/wx/htmllbox.h
@@ -20,13 +20,13 @@
     #include "wx/filesys.h"
 #endif // wxUSE_FILESYSTEM
 
     #include "wx/filesys.h"
 #endif // wxUSE_FILESYSTEM
 

-class WXDLLIMPEXP_HTML wxHtmlCell;
-class WXDLLIMPEXP_HTML wxHtmlWinParser;
-class WXDLLIMPEXP_HTML wxHtmlListBoxCache;
-class WXDLLIMPEXP_HTML wxHtmlListBoxStyle;
+class WXDLLIMPEXP_FWD_HTML wxHtmlCell;
+class WXDLLIMPEXP_FWD_HTML wxHtmlWinParser;
+class WXDLLIMPEXP_FWD_HTML wxHtmlListBoxCache;
+class WXDLLIMPEXP_FWD_HTML wxHtmlListBoxStyle;

 
 

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

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


@@ -69,12 +69,11 @@ public:
     virtual ~wxHtmlListBox();
 
     // override some base class virtuals
     virtual ~wxHtmlListBox();
 
     // override some base class virtuals

-    virtual void RefreshLine(size_t line);
-    virtual void RefreshLines(size_t from, size_t to);
+    virtual void RefreshRow(size_t line);
+    virtual void RefreshRows(size_t from, size_t to);

     virtual void RefreshAll();
     virtual void SetItemCount(size_t count);
 
     virtual void RefreshAll();
     virtual void SetItemCount(size_t count);
 

-

 #if wxUSE_FILESYSTEM
     // retrieve the file system used by the wxHtmlWinParser: if you use
     // relative paths in your HTML, you should use its ChangePathTo() method
 #if wxUSE_FILESYSTEM
     // retrieve the file system used by the wxHtmlWinParser: if you use
     // relative paths in your HTML, you should use its ChangePathTo() method


@@ -114,8 +113,7 @@ protected:
 
     // This method may be overriden to handle clicking on a link in
     // the listbox. By default, clicking links is ignored.
 
     // This method may be overriden to handle clicking on a link in
     // the listbox. By default, clicking links is ignored.

-    virtual void OnLinkClicked(size_t WXUNUSED(n),
-                               const wxHtmlLinkInfo& WXUNUSED(link)) { }
+    virtual void OnLinkClicked(size_t n, const wxHtmlLinkInfo& link);

 
     // event handlers
     void OnSize(wxSizeEvent& event);
 
     // event handlers
     void OnSize(wxSizeEvent& event);


@@ -242,13 +240,13 @@ public:
                 long style = wxHLB_DEFAULT_STYLE,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxSimpleHtmlListBoxNameStr);
                 long style = wxHLB_DEFAULT_STYLE,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxSimpleHtmlListBoxNameStr);

-                
+

     virtual ~wxSimpleHtmlListBox();
 
     // these must be overloaded otherwise the compiler will complain
     // about  wxItemContainerImmutable::[G|S]etSelection being pure virtuals...
     void SetSelection(int n)
     virtual ~wxSimpleHtmlListBox();
 
     // these must be overloaded otherwise the compiler will complain
     // about  wxItemContainerImmutable::[G|S]etSelection being pure virtuals...
     void SetSelection(int n)

-        { return wxVListBox::SetSelection(n); }
+        { wxVListBox::SetSelection(n); }

     int GetSelection() const
         { return wxVListBox::GetSelection(); }
 
     int GetSelection() const
         { return wxVListBox::GetSelection(); }
 


@@ -291,14 +289,14 @@ protected:
     virtual int DoInsert(const wxString& item, unsigned int pos);
 
     virtual void DoSetItemClientData(unsigned int n, void *clientData)
     virtual int DoInsert(const wxString& item, unsigned int pos);
 
     virtual void DoSetItemClientData(unsigned int n, void *clientData)

-        { m_clientData[n] = clientData; }
+        { m_HTMLclientData[n] = clientData; }

 
     virtual void *DoGetItemClientData(unsigned int n) const
 
     virtual void *DoGetItemClientData(unsigned int n) const

-        { return m_clientData[n]; }
+        { return m_HTMLclientData[n]; }

     virtual void DoSetItemClientObject(unsigned int n, wxClientData *clientData)
     virtual void DoSetItemClientObject(unsigned int n, wxClientData *clientData)

-        { m_clientData[n] = (void *)clientData; }
+        { m_HTMLclientData[n] = (void *)clientData; }

     virtual wxClientData *DoGetItemClientObject(unsigned int n) const
     virtual wxClientData *DoGetItemClientObject(unsigned int n) const

-        { return (wxClientData *)m_clientData[n]; }
+        { return (wxClientData *)m_HTMLclientData[n]; }

 
     // calls wxHtmlListBox::SetItemCount() and RefreshAll()
     void UpdateCount();
 
     // calls wxHtmlListBox::SetItemCount() and RefreshAll()
     void UpdateCount();


@@ -306,15 +304,19 @@ protected:
     // overload these functions just to change their visibility: users of
     // wxSimpleHtmlListBox shouldn't be allowed to call them directly!
     virtual void SetItemCount(size_t count)
     // overload these functions just to change their visibility: users of
     // wxSimpleHtmlListBox shouldn't be allowed to call them directly!
     virtual void SetItemCount(size_t count)

-        { return wxHtmlListBox::SetItemCount(count); }
-    virtual void SetLineCount(size_t count)
-        { return wxHtmlListBox::SetLineCount(count); }
+        { wxHtmlListBox::SetItemCount(count); }
+    virtual void SetRowCount(size_t count)
+        { wxHtmlListBox::SetRowCount(count); }

 
     virtual wxString OnGetItem(size_t n) const
         { return m_items[n]; }
 
 
     virtual wxString OnGetItem(size_t n) const
         { return m_items[n]; }
 

-    wxArrayString m_items;
-    wxArrayPtrVoid m_clientData;
+    wxArrayString   m_items;
+    wxArrayPtrVoid  m_HTMLclientData;
+
+    // Note: For the benefit of old compilers (like gcc-2.8) this should
+    // 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)
 };
 
     DECLARE_NO_COPY_CLASS(wxSimpleHtmlListBox)
 };