bool scrollable replaced by wxHW_* flags

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/htwindow.tex b/docs/latex/wx/htwindow.tex
index ae85e3ba6d6d210a4fd415d40e215b09e56ca8e9..d7456b77c5712b8887e97218da5468ec285c6981 100644 (file)
--- a/docs/latex/wx/htwindow.tex
+++ b/docs/latex/wx/htwindow.tex
@@ -33,14 +33,15 @@ wxScrolledWindow
 
 Default constructor.
 
 
 Default constructor.
 

-\func{}{wxHtmlWindow}{\param{wxWindow }{*parent}, \param{wxWindowID }{id = -1}, \param{const wxPoint\& }{pos = wxDefaultPosition}, \param{const wxSize\& }{size = wxDefaultSize}, \param{const wxString\& }{name = "htmlWindow"}, \param{bool }{scrollable = TRUE}}
+\func{}{wxHtmlWindow}{\param{wxWindow }{*parent}, \param{wxWindowID }{id = -1}, \param{const wxPoint\& }{pos = wxDefaultPosition}, \param{const wxSize\& }{size = wxDefaultSize}, \param{long }{style = wxHW_SCROLLBAR_AUTO}, \param{const wxString\& }{name = "htmlWindow"}}

 
 Constructor. The parameters are same as in wxScrollWindow ctor.
 (Too lazy to document it once again... :-)
 
 \wxheading{Parameters}
 
 
 Constructor. The parameters are same as in wxScrollWindow ctor.
 (Too lazy to document it once again... :-)
 
 \wxheading{Parameters}
 

-\docparam{scrollable}{if false then no scrollbars are displayed, even if size of page is larger than window size}
+\docparam{style}{wxHW_SCROLLBAR_NEVER,  or wxHW_SCROLLBAR_AUTO. 
+Affects appearance of vertical scrollbar in the window.}

 
 
 
 
 
 

diff --git a/include/wx/defs.h b/include/wx/defs.h
index e7c77c366c4e9f0a6f9285fed6a5b94561a3d211..5e225385ecf2e1f9b719d5cc04250477bee8b6ca 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -900,6 +900,12 @@ enum
 #define wxPD_ESTIMATED_TIME     0x0010
 #define wxPD_REMAINING_TIME     0x0020
 
 #define wxPD_ESTIMATED_TIME     0x0010
 #define wxPD_REMAINING_TIME     0x0020
 

+/*
+ * wxHtmlWindow flags
+ */
+#define wxHW_SCROLLBAR_NEVER    0x0002
+#define wxHW_SCROLLBAR_AUTO     0x0004
+

 /*
  * extended dialog specifiers. these values are stored in a different
  * flag and thus do not overlap with other style flags. note that these
 /*
  * extended dialog specifiers. these values are stored in a different
  * flag and thus do not overlap with other style flags. note that these

diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index 553f49112ed3d5e553931fbe839398f906e3145c..657ee2348de65fee51ea38701a36bb1bbc963605 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.
 
                 // 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.
+        bool m_Style;

 
 
     private:
 
 
     private:


@@ -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,
         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);
         ~wxHtmlWindow();
 
         bool SetPage(const wxString& source);