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

More border rationalisation. GetDefaultBorder is now mostly defined in base class files.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-11-13 12:10:34 +00:00
parent fba05595e6
commit dc797d8e1b
31 changed files with 104 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/msw/stattext.cpp
View File

@@ -100,11 +100,6 @@ bool wxStaticText::Create(wxWindow *parent,
return true;
}
wxBorder wxStaticText::GetDefaultBorder() const
{
return wxBORDER_NONE;
}
WXDWORD wxStaticText::MSWGetStyle(long style, WXDWORD *exstyle) const
{
WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);
@@ -220,9 +215,9 @@ void wxStaticText::SetLabel(const wxString& label)
if ( HasFlag(wxST_ELLIPSIZE_END) &&
wxGetOsVersion() == wxOS_WINDOWS_NT )
{
// adding SS_ENDELLIPSIS or SS_ENDELLIPSIS "disables" the correct
// newline handling in static texts: the newlines in the labels are
// shown as square. Thus we don't use it even on newer OS when
// adding SS_ENDELLIPSIS or SS_ENDELLIPSIS "disables" the correct
// newline handling in static texts: the newlines in the labels are
// shown as square. Thus we don't use it even on newer OS when
// the static label contains a newline.
if ( label.Contains(wxT('\n')) )
styleReal &= ~SS_ENDELLIPSIS;