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

Move LabelWrapper, TextSizerWrapper classes out of function body to accommodate some older compilers.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell 2005-08-24 14:59:36 +00:00
parent 4f66d445e1
commit cfd1ac216d
1 changed files with 65 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
src/common/dlgcmn.cpp
View File

@ -177,6 +177,44 @@ void wxTextWrapper::Wrap(wxWindow *win, const wxString& text, int widthMax)
}
}
class wxTextSizerWrapper : public wxTextWrapper
{
public:
wxTextSizerWrapper(wxWindow *win)
{
m_win = win;
m_hLine = 0;
}
wxSizer *CreateSizer(const wxString& text, int widthMax)
{
m_sizer = new wxBoxSizer(wxVERTICAL);
Wrap(m_win, text, widthMax);
return m_sizer;
}
protected:
virtual void OnOutputLine(const wxString& line)
{
if ( !line.empty() )
{
m_sizer->Add(new wxStaticText(m_win, wxID_ANY, line));
}
else // empty line, no need to create a control for it
{
if ( !m_hLine )
m_hLine = m_win->GetCharHeight();
m_sizer->Add(5, m_hLine);
}
}
private:
wxWindow *m_win;
wxSizer *m_sizer;
int m_hLine;
};
wxSizer *wxDialogBase::CreateTextSizer(const wxString& message)
{
// I admit that this is complete bogus, but it makes
@ -194,50 +232,36 @@ wxSizer *wxDialogBase::CreateTextSizer(const wxString& message)
wxString text(message);
text.Replace(_T("&"), _T("&&"));
class TextSizerWrapper : public wxTextWrapper
{
public:
TextSizerWrapper(wxWindow *win)
{
m_win = win;
m_hLine = 0;
}
wxSizer *CreateSizer(const wxString& text, int widthMax)
{
m_sizer = new wxBoxSizer(wxVERTICAL);
Wrap(m_win, text, widthMax);
return m_sizer;
}
protected:
virtual void OnOutputLine(const wxString& line)
{
if ( !line.empty() )
{
m_sizer->Add(new wxStaticText(m_win, wxID_ANY, line));
}
else // empty line, no need to create a control for it
{
if ( !m_hLine )
m_hLine = m_win->GetCharHeight();
m_sizer->Add(5, m_hLine);
}
}
private:
wxWindow *m_win;
wxSizer *m_sizer;
int m_hLine;
};
TextSizerWrapper wrapper(this);
wxTextSizerWrapper wrapper(this);
return wrapper.CreateSizer(text, widthMax);
}
class wxLabelWrapper : public wxTextWrapper
{
public:
void WrapLabel(wxWindow *text, int widthMax)
{
m_text.clear();
Wrap(text, text->GetLabel(), widthMax);
text->SetLabel(m_text);
}
protected:
virtual void OnOutputLine(const wxString& line)
{
m_text += line;
}
virtual void OnNewLine()
{
m_text += _T('\n');
}
private:
wxString m_text;
};
void
#if defined(__WXGTK__) && !defined(__WXUNIVERSAL__)
wxStaticText
@ -246,32 +270,7 @@ wxStaticTextBase
#endif
::Wrap(int width)
{
class LabelWrapper : public wxTextWrapper
{
public:
void WrapLabel(wxWindow *text, int widthMax)
{
m_text.clear();
Wrap(text, text->GetLabel(), widthMax);
text->SetLabel(m_text);
}
protected:
virtual void OnOutputLine(const wxString& line)
{
m_text += line;
}
virtual void OnNewLine()
{
m_text += _T('\n');
}
private:
wxString m_text;
};
LabelWrapper wrapper;
wxLabelWrapper wrapper;
wrapper.WrapLabel(this, width);
}