AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bool scrollable replaced by wxHW_* flags

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 1999-08-04 00:00:16 +00:00
parent 2776d7c3bd
commit ea8fe90e65
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/latex/wx/htwindow.tex
View File

@ -33,14 +33,15 @@ wxScrolledWindow
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}
\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.}

6
include/wx/defs.h
View File

@ -900,6 +900,12 @@ enum
#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

8
include/wx/html/htmlwin.h
View File

@ -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.
bool m_Style;
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,
const wxString& name = "htmlWindow", bool scrollable = TRUE);
long style = wxHW_SCROLLBAR_AUTO,
const wxString& name = "htmlWindow");
~wxHtmlWindow();
bool SetPage(const wxString& source);