small makefile.vc fixes.

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

diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index 351e000d0c49aa5de44d7bc569121ce7df13ea77..89117cec8c563d4f857f17d603b2bc51dd530e0f 100644 (file)
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -93,10 +93,7 @@ class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
                 // borders (free space between text and window borders)
                 // defaults to 10 pixels.
 
-        bool m_Scrollable;
-                // TRUE if you can scroll the window.
-                // If it is FALSE you can't scroll the window even if it's contents is larger
-                // than window.
+        int m_Style;
 
 
     private:
@@ -109,7 +106,7 @@ class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
 
         static wxList m_Filters;
                 // list of HTML filters
-        static wxHtmlFilterPlainText m_DefaultFilter;
+        static wxHtmlFilter *m_DefaultFilter;
                 // this filter is used when no filter is able to read some file
 
         HtmlHistoryArray m_History;
@@ -122,7 +119,8 @@ class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
         wxHtmlWindow() : wxScrolledWindow() {};
         wxHtmlWindow(wxWindow *parent, wxWindowID id = -1, 
                      const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-                     const wxString& name = "htmlWindow", bool scrollable = TRUE);
+                    long style = wxHW_SCROLLBAR_AUTO,
+                     const wxString& name = "htmlWindow");
         ~wxHtmlWindow();
 
         bool SetPage(const wxString& source);
@@ -189,6 +187,9 @@ class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
         virtual void OnLinkClicked(const wxString& link);
                 // called when users clicked on hypertext link. Default behavior is to
                 // call LoadPage(loc)
+               
+       static void CleanUpStatics();
+               // cleans static variables
 
     protected:
         bool ScrollToAnchor(const wxString& anchor);
@@ -206,6 +207,9 @@ class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
         void OnMouseEvent(wxMouseEvent& event);
         void OnIdle(wxIdleEvent& event);
         void OnKeyDown(wxKeyEvent& event);
+       
+       virtual wxHtmlFilter *GetDefaultFilter() {return new wxHtmlFilterPlainText;}
+               // returns new filter (will be stored into m_DefaultFilter variable)
 
     DECLARE_EVENT_TABLE()
 };