Don't include <CoreFoundation/CFBase.h> because it in turn includes MacTypes.h which...

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

diff --git a/include/wx/htmllbox.h b/include/wx/htmllbox.h
index 6557e4e036d6743abdc516ee97394897e5d7107d..3c1bb035dc84a9659c025ff15428e707b7498948 100644 (file)
--- a/include/wx/htmllbox.h
+++ b/include/wx/htmllbox.h
@@ -69,15 +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);
 

-    // provide a way to set the default encoding (non-Unicode only)
-    void SetEncoding(wxFontEncoding encoding) { m_fontEncoding = encoding; }
-    wxFontEncoding GetEncoding() { return m_fontEncoding; }
-

 #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


@@ -171,9 +167,6 @@ private:
     // HTML parser we use
     wxHtmlWinParser *m_htmlParser;
 
     // HTML parser we use
     wxHtmlWinParser *m_htmlParser;
 

-    // font encoding (used in non-Unicode mode only)
-    wxFontEncoding  m_fontEncoding;
-

 #if wxUSE_FILESYSTEM
     // file system used by m_htmlParser
     wxFileSystem m_filesystem;
 #if wxUSE_FILESYSTEM
     // file system used by m_htmlParser
     wxFileSystem m_filesystem;


@@ -312,8 +305,8 @@ protected:
     // wxSimpleHtmlListBox shouldn't be allowed to call them directly!
     virtual void SetItemCount(size_t count)
         { wxHtmlListBox::SetItemCount(count); }
     // wxSimpleHtmlListBox shouldn't be allowed to call them directly!
     virtual void SetItemCount(size_t count)
         { wxHtmlListBox::SetItemCount(count); }

-    virtual void SetLineCount(size_t count)
-        { wxHtmlListBox::SetLineCount(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]; }