inline functions with if moved to .cpp

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2000-01-27 00:02:44 +00:00
parent fc7dfaf8ee
commit 721ab90538
6 changed files with 69 additions and 26 deletions

View File

@@ -54,13 +54,8 @@ class WXDLLEXPORT wxHtmlHelpController : public wxEvtHandler
CreateHelpWindow(); return m_helpFrame->KeywordSearch(keyword); CreateHelpWindow(); return m_helpFrame->KeywordSearch(keyword);
} }
wxHtmlHelpFrame* GetFrame() { return m_helpFrame; } wxHtmlHelpFrame* GetFrame() { return m_helpFrame; }
void UseConfig(wxConfigBase *config, const wxString& rootpath = wxEmptyString) void UseConfig(wxConfigBase *config, const wxString& rootpath = wxEmptyString);
{
m_Config = config;
m_ConfigRoot = rootpath;
if (m_helpFrame) m_helpFrame -> UseConfig(config, rootpath);
ReadCustomization(config, rootpath);
}
// Assigns config object to the Ctrl. This config is then // Assigns config object to the Ctrl. This config is then
// used in subsequent calls to Read/WriteCustomization of both help // used in subsequent calls to Read/WriteCustomization of both help
// Ctrl and it's wxHtmlWindow // Ctrl and it's wxHtmlWindow

View File

@@ -104,12 +104,7 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
wxHtmlHelpData* GetData() { return m_Data; } wxHtmlHelpData* GetData() { return m_Data; }
void SetTitleFormat(const wxString& format) void SetTitleFormat(const wxString& format);
{
if (m_HtmlWin)
m_HtmlWin->SetRelatedFrame(this, format);
m_TitleFormat = format;
}
// Sets format of title of the frame. Must contain exactly one "%s" // Sets format of title of the frame. Must contain exactly one "%s"
// (for title of displayed HTML page) // (for title of displayed HTML page)

View File

@@ -64,20 +64,20 @@ class WXDLLEXPORT wxHtmlCell : public wxObject
void SetNext(wxHtmlCell *cell) {m_Next = cell;} void SetNext(wxHtmlCell *cell) {m_Next = cell;}
// members writin methods // members writin methods
virtual void Layout(int w) {SetPos(0, 0); if (m_Next) m_Next -> Layout(w);}; virtual void Layout(int w);
// 1. adjust cell's width according to the fact that maximal possible width is w. // 1. adjust cell's width according to the fact that maximal possible width is w.
// (this has sense when working with horizontal lines, tables etc.) // (this has sense when working with horizontal lines, tables etc.)
// 2. prepare layout (=fill-in m_PosX, m_PosY (and sometime m_Height) members) // 2. prepare layout (=fill-in m_PosX, m_PosY (and sometime m_Height) members)
// = place items to fit window, according to the width w // = place items to fit window, according to the width w
virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2) {if (m_Next) m_Next -> Draw(dc, x, y, view_y1, view_y2);} virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);
// renders the cell // renders the cell
virtual void DrawInvisible(wxDC& dc, int x, int y) {if (m_Next) m_Next -> DrawInvisible(dc, x, y);}; virtual void DrawInvisible(wxDC& dc, int x, int y);
// proceed drawing actions in case the cell is not visible (scrolled out of screen). // proceed drawing actions in case the cell is not visible (scrolled out of screen).
// This is needed to change fonts, colors and so on // This is needed to change fonts, colors and so on
virtual const wxHtmlCell* Find(int condition, const void* param) const {if (m_Next) return m_Next -> Find(condition, param); else return NULL;} virtual const wxHtmlCell* Find(int condition, const void* param) const;
// This method returns pointer to the FIRST cell for that // This method returns pointer to the FIRST cell for that
// the condition // the condition
// is true. It first checks if the condition is true for this // is true. It first checks if the condition is true for this
@@ -165,7 +165,7 @@ class WXDLLEXPORT wxHtmlContainerCell : public wxHtmlCell
{ {
public: public:
wxHtmlContainerCell(wxHtmlContainerCell *parent); wxHtmlContainerCell(wxHtmlContainerCell *parent);
~wxHtmlContainerCell() {if (m_Cells) delete m_Cells;} ~wxHtmlContainerCell();
virtual void Layout(int w); virtual void Layout(int w);
virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2); virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);
@@ -289,7 +289,7 @@ class WXDLLEXPORT wxHtmlWidgetCell : public wxHtmlCell
// if w != 0 then the m_Wnd has 'floating' width - it adjust // if w != 0 then the m_Wnd has 'floating' width - it adjust
// it's width according to parent container's width // it's width according to parent container's width
// (w is percent of parent's width) // (w is percent of parent's width)
~wxHtmlWidgetCell() {if (m_Wnd) m_Wnd -> Destroy(); } ~wxHtmlWidgetCell() { m_Wnd -> Destroy(); }
virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2); virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);
virtual void DrawInvisible(wxDC& dc, int x, int y); virtual void DrawInvisible(wxDC& dc, int x, int y);
virtual void Layout(int w); virtual void Layout(int w);

View File

@@ -141,4 +141,13 @@ void wxHtmlHelpController::WriteCustomization(wxConfigBase* cfg, const wxString&
m_helpFrame->WriteCustomization(cfg, path); m_helpFrame->WriteCustomization(cfg, path);
} }
void wxHtmlHelpController::UseConfig(wxConfigBase *config, const wxString& rootpath)
{
m_Config = config;
m_ConfigRoot = rootpath;
if (m_helpFrame) m_helpFrame -> UseConfig(config, rootpath);
ReadCustomization(config, rootpath);
}
#endif #endif

View File

@@ -349,7 +349,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
m_IndexCountInfo -> SetConstraints(b5); m_IndexCountInfo -> SetConstraints(b5);
wxLayoutConstraints *b3 = new wxLayoutConstraints; wxLayoutConstraints *b3 = new wxLayoutConstraints;
m_IndexList = new wxListBox(dummy, wxID_HTML_INDEXLIST, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE | wxLB_ALWAYS_SB); m_IndexList = new wxListBox(dummy, wxID_HTML_INDEXLIST, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE);
b3 -> top.Below (m_IndexCountInfo, 5); b3 -> top.Below (m_IndexCountInfo, 5);
b3 -> left.SameAs (dummy, wxLeft, 0); b3 -> left.SameAs (dummy, wxLeft, 0);
b3 -> right.SameAs (dummy, wxRight, 0); b3 -> right.SameAs (dummy, wxRight, 0);
@@ -417,7 +417,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
m_SearchButton -> SetConstraints(b2); m_SearchButton -> SetConstraints(b2);
wxLayoutConstraints *b3 = new wxLayoutConstraints; wxLayoutConstraints *b3 = new wxLayoutConstraints;
m_SearchList = new wxListBox(dummy, wxID_HTML_SEARCHLIST, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE | wxLB_ALWAYS_SB); m_SearchList = new wxListBox(dummy, wxID_HTML_SEARCHLIST, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE);
b3 -> top.Below (m_SearchButton, 10); b3 -> top.Below (m_SearchButton, 10);
b3 -> left.SameAs (dummy, wxLeft, 0); b3 -> left.SameAs (dummy, wxLeft, 0);
b3 -> right.SameAs (dummy, wxRight, 0); b3 -> right.SameAs (dummy, wxRight, 0);
@@ -431,7 +431,6 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
} }
m_HtmlWin -> Show(TRUE); m_HtmlWin -> Show(TRUE);
RefreshLists(); RefreshLists();
// showtime // showtime
@@ -513,6 +512,13 @@ void wxHtmlHelpFrame::AddToolbarButtons(wxToolBar *toolBar, int style)
} }
void wxHtmlHelpFrame::SetTitleFormat(const wxString& format)
{
if (m_HtmlWin)
m_HtmlWin->SetRelatedFrame(this, format);
m_TitleFormat = format;
}
bool wxHtmlHelpFrame::Display(const wxString& x) bool wxHtmlHelpFrame::Display(const wxString& x)
{ {
@@ -1062,15 +1068,19 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event)
if (m_PagesHash) if (m_PagesHash)
{ {
wxString an = m_HtmlWin -> GetOpenedAnchor(); wxString an = m_HtmlWin -> GetOpenedAnchor();
wxString adr;
wxHtmlHelpHashData *ha; wxHtmlHelpHashData *ha;
if (an.IsEmpty())
ha = (wxHtmlHelpHashData*) m_PagesHash -> Get(m_HtmlWin -> GetOpenedPage()); if (an.IsEmpty()) adr = m_HtmlWin -> GetOpenedPage();
else else adr = m_HtmlWin -> GetOpenedPage() + wxT("#") + an;
ha = (wxHtmlHelpHashData*) m_PagesHash -> Get(m_HtmlWin -> GetOpenedPage() + wxT("#") + an);
ha = (wxHtmlHelpHashData*) m_PagesHash -> Get(adr);
if (ha && ha -> m_Index < m_Data -> GetContentsCnt() - 1) if (ha && ha -> m_Index < m_Data -> GetContentsCnt() - 1)
{ {
wxHtmlContentsItem *it = m_Data -> GetContents() + (ha -> m_Index + 1); wxHtmlContentsItem *it = m_Data -> GetContents() + (ha -> m_Index + 1);
while (it -> m_Book -> GetBasePath() + it -> m_Page == adr) it++;
m_HtmlWin -> LoadPage(it -> m_Book -> GetBasePath() + it -> m_Page); m_HtmlWin -> LoadPage(it -> m_Book -> GetBasePath() + it -> m_Page);
NotifyPageChanged(); NotifyPageChanged();
} }

View File

@@ -92,6 +92,35 @@ void wxHtmlCell::SetLink(const wxHtmlLinkInfo& link)
void wxHtmlCell::Layout(int w)
{
SetPos(0, 0);
if (m_Next) m_Next -> Layout(w);
}
void wxHtmlCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
{
if (m_Next) m_Next -> Draw(dc, x, y, view_y1, view_y2);
}
void wxHtmlCell::DrawInvisible(wxDC& dc, int x, int y)
{
if (m_Next) m_Next -> DrawInvisible(dc, x, y);
}
const wxHtmlCell* wxHtmlCell::Find(int condition, const void* param) const
{
if (m_Next) return m_Next -> Find(condition, param);
else return NULL;
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxHtmlWordCell // wxHtmlWordCell
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -248,6 +277,11 @@ wxHtmlContainerCell::wxHtmlContainerCell(wxHtmlContainerCell *parent) : wxHtmlCe
m_LastLayout = -1; m_LastLayout = -1;
} }
wxHtmlContainerCell::~wxHtmlContainerCell()
{
if (m_Cells) delete m_Cells;
}
void wxHtmlContainerCell::SetIndent(int i, int what, int units) void wxHtmlContainerCell::SetIndent(int i, int what, int units)