AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bug with incorrect & test fixed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2000-01-05 15:17:29 +00:00
parent 96fa7876bf
commit 25e3a937db
1 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/generic/listctrl.cpp
View File

@ -2676,8 +2676,10 @@ wxListCtrl::~wxListCtrl()
{
}
bool wxListCtrl::Create( wxWindow *parent, wxWindowID id,
const wxPoint &pos, const wxSize &size,
bool wxListCtrl::Create(wxWindow *parent,
wxWindowID id,
const wxPoint &pos,
const wxSize &size,
long style,
#if wxUSE_VALIDATORS
const wxValidator &validator,
@ -2690,28 +2692,16 @@ bool wxListCtrl::Create( wxWindow *parent, wxWindowID id,
m_mainWin = (wxListMainWindow*) NULL;
m_headerWin = (wxListHeaderWindow*) NULL;
long s = style;
#ifdef __VMS__
#pragma message disable codcauunr
// VMS reports on this part the warning:
// statement either is unreachable or causes unreachable code
#endif
if ((s & wxLC_REPORT == 0) &&
(s & wxLC_LIST == 0) &&
(s & wxLC_ICON == 0))
if ( !(style & (wxLC_REPORT | wxLC_LIST | wxLC_ICON)) )
{
s = s | wxLC_LIST;
style = style | wxLC_LIST;
}
#ifdef __VMS__
#pragma message enable codcauunr
#endif
bool ret = wxControl::Create( parent,
id,
pos,
size,
s,
style,
#if wxUSE_VALIDATORS
validator,
#endif
@ -2721,9 +2711,10 @@ bool wxListCtrl::Create( wxWindow *parent, wxWindowID id,
SetValidator( validator );
#endif
if (s & wxSUNKEN_BORDER) s -= wxSUNKEN_BORDER;
if (style & wxSUNKEN_BORDER)
style -= wxSUNKEN_BORDER;
m_mainWin = new wxListMainWindow( this, -1, wxPoint(0,0), size, s );
m_mainWin = new wxListMainWindow( this, -1, wxPoint(0,0), size, style );
if (HasFlag(wxLC_REPORT))
m_headerWin = new wxListHeaderWindow( this, -1, m_mainWin, wxPoint(0,0), wxSize(size.x,23), wxTAB_TRAVERSAL );