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

Remove obsolete checks for wxOS_WINDOWS_NT from wxMSW wxStaticText.

Browse Source 
We don't support Windows 9x any more, so there is no need to check for NT
damily at run-time.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2015-02-11 21:16:03 +00:00
parent 0081690355
commit 52dbc7e6f8
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/msw/stattext.cpp
View File

@@ -75,18 +75,14 @@ WXDWORD wxStaticText::MSWGetStyle(long style, WXDWORD *exstyle) const
msStyle |= SS_LEFT; msStyle |= SS_LEFT;
#ifdef SS_ENDELLIPSIS #ifdef SS_ENDELLIPSIS
// this style is necessary to receive mouse events
// Win NT and later have the SS_ENDELLIPSIS style which is useful to us:
if (wxGetOsVersion() == wxOS_WINDOWS_NT)
{
// for now, add the SS_ENDELLIPSIS style if wxST_ELLIPSIZE_END is given; // for now, add the SS_ENDELLIPSIS style if wxST_ELLIPSIZE_END is given;
// we may need to remove it later in ::SetLabel() if the given label // we may need to remove it later in ::SetLabel() if the given label
// has newlines // has newlines
if ( style & wxST_ELLIPSIZE_END ) if ( style & wxST_ELLIPSIZE_END )
msStyle |= SS_ENDELLIPSIS; msStyle |= SS_ENDELLIPSIS;
}
#endif // SS_ENDELLIPSIS #endif // SS_ENDELLIPSIS
// this style is necessary to receive mouse events
msStyle |= SS_NOTIFY; msStyle |= SS_NOTIFY;
return msStyle; return msStyle;
@@ -153,8 +149,7 @@ void wxStaticText::SetLabel(const wxString& label)
{ {
#ifdef SS_ENDELLIPSIS #ifdef SS_ENDELLIPSIS
long styleReal = ::GetWindowLong(GetHwnd(), GWL_STYLE); long styleReal = ::GetWindowLong(GetHwnd(), GWL_STYLE);
if ( HasFlag(wxST_ELLIPSIZE_END) && if ( HasFlag(wxST_ELLIPSIZE_END) )
wxGetOsVersion() == wxOS_WINDOWS_NT )
{ {
// adding SS_ENDELLIPSIS or SS_ENDELLIPSIS "disables" the correct // adding SS_ENDELLIPSIS or SS_ENDELLIPSIS "disables" the correct
// newline handling in static texts: the newlines in the labels are // newline handling in static texts: the newlines in the labels are