Add GDK_PIXBUF_DISABLE_DEPRECATED, it should build with it now. Will keep an eye...

[wxWidgets.git] / include / wx / html / htmlwin.h

diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index 2561691e36c0611f54597a5af67c8d0ef47cb92d..719173bedbaf763cd890b3a9608dc83542465bb1 100644 (file)
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -269,9 +269,13 @@ protected:
     void StopAutoScrolling();
 #endif // wxUSE_CLIPBOARD
 
     void StopAutoScrolling();
 #endif // wxUSE_CLIPBOARD
 

-protected:

     wxString DoSelectionToText(wxHtmlSelection *sel);
 
     wxString DoSelectionToText(wxHtmlSelection *sel);
 

+private:
+    // implementation of SetPage()
+    bool DoSetPage(const wxString& source);
+
+protected:

     // This is pointer to the first cell in parsed data.  (Note: the first cell
     // is usually top one = all other cells are sub-cells of this one)
     wxHtmlContainerCell *m_Cell;
     // This is pointer to the first cell in parsed data.  (Note: the first cell
     // is usually top one = all other cells are sub-cells of this one)
     wxHtmlContainerCell *m_Cell;


@@ -312,7 +316,6 @@ protected:
     // time of the last doubleclick event, used to detect tripleclicks
     // (tripleclicks are used to select whole line):
     wxMilliClock_t m_lastDoubleClick;
     // time of the last doubleclick event, used to detect tripleclicks
     // (tripleclicks are used to select whole line):
     wxMilliClock_t m_lastDoubleClick;

-#endif // wxUSE_LONGLONG/!wxUSE_LONGLONG

 
     // helper class to automatically scroll the window if the user is selecting
     // text and the mouse leaves wxHtmlWindow:
 
     // helper class to automatically scroll the window if the user is selecting
     // text and the mouse leaves wxHtmlWindow: