Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxHW_* flags, fixed client area problem

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
1999-08-03 23:58:56 +00:00
parent d674cf6dc3
commit a547ebffd6
1 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/html/htmlwin.cpp
View File

@@ -28,26 +28,6 @@
#include <wx/html/forcelink.h> #include <wx/html/forcelink.h>
///// This is my own wxBusyCursor. It works only with one window.
#if (defined __WXGTK__) && (wxVERSION_NUMBER < 2100)
class wxLocalBusyCursor
#else
class wxLocalBusyCursor : public wxBusyCursor
#endif
{
private:
wxWindow *m_Wnd;
public:
#if (defined __WXGTK__) && (wxVERSION_NUMBER < 2100)
wxLocalBusyCursor(wxWindow *w) {m_Wnd = w; m_Wnd -> SetCursor(*wxHOURGLASS_CURSOR);}
~wxLocalBusyCursor() {m_Wnd -> SetCursor(*wxSTANDARD_CURSOR);}
#else
wxLocalBusyCursor(wxWindow *w) : wxBusyCursor() {}
#endif
};
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -61,7 +41,7 @@ WX_DEFINE_OBJARRAY(HtmlHistoryArray)
wxHtmlWindow::wxHtmlWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, wxHtmlWindow::wxHtmlWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
const wxString& name, bool scrollable) : wxScrolledWindow(parent, id, pos, size, wxVSCROLL, name) long style, const wxString& name) : wxScrolledWindow(parent, id, pos, size, wxVSCROLL, name)
{ {
m_tmpMouseMoved = FALSE; m_tmpMouseMoved = FALSE;
m_tmpCanDraw = TRUE; m_tmpCanDraw = TRUE;
@@ -76,7 +56,7 @@ wxHtmlWindow::wxHtmlWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos,
SetBorders(10); SetBorders(10);
m_HistoryPos = -1; m_HistoryPos = -1;
m_HistoryOn = TRUE; m_HistoryOn = TRUE;
m_Scrollable = scrollable; m_Style = style;
SetPage("<html><body></body></html>"); SetPage("<html><body></body></html>");
} }
@@ -146,7 +126,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
{ {
wxFSFile *f; wxFSFile *f;
bool rt_val; bool rt_val;
wxLocalBusyCursor b(this); wxBusyCursor b;
m_tmpCanDraw = FALSE; m_tmpCanDraw = FALSE;
if (m_HistoryOn && (m_HistoryPos != -1)) { // store scroll position into history item if (m_HistoryOn && (m_HistoryPos != -1)) { // store scroll position into history item
@@ -267,13 +247,29 @@ void wxHtmlWindow::CreateLayout()
int ClientWidth, ClientHeight; int ClientWidth, ClientHeight;
if (!m_Cell) return; if (!m_Cell) return;
GetClientSize(&ClientWidth, &ClientHeight);
m_Cell -> Layout(ClientWidth); if (m_Style == wxHW_SCROLLBAR_NEVER) {
if (m_Scrollable) GetClientSize(&ClientWidth, &ClientHeight);
SetScrollbars(HTML_SCROLL_STEP, HTML_SCROLL_STEP, m_Cell -> Layout(ClientWidth);
m_Cell -> GetWidth() / HTML_SCROLL_STEP, }
m_Cell -> GetHeight() / HTML_SCROLL_STEP
/*cheat: top-level frag is always container*/ ); else {
GetClientSize(&ClientWidth, &ClientHeight);
SetScrollbars(1, 1, 0, ClientHeight * 2); // always on
GetClientSize(&ClientWidth, &ClientHeight);
m_Cell -> Layout(ClientWidth);
GetClientSize(&ClientWidth, &ClientHeight);
if (ClientHeight < m_Cell -> GetHeight()) {
SetScrollbars(HTML_SCROLL_STEP, HTML_SCROLL_STEP,
m_Cell -> GetWidth() / HTML_SCROLL_STEP,
m_Cell -> GetHeight() / HTML_SCROLL_STEP
/*cheat: top-level frag is always container*/);
}
else { /* we fit into window, no need for scrollbars */
SetScrollbars(1, 1, 0, 0); // disable...
m_Cell -> Layout(ClientWidth); // ...and relayout
}
}
} }