Stop crash when wxVSCROLL is specified for native OS X wxListCtrl.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2006-12-25 19:28:11 +00:00
parent 12e424d28f
commit e0329d2476

View File

@@ -699,8 +699,7 @@ bool wxListCtrl::Create(wxWindow *parent,
else else
{ {
m_macIsUserPane = false; m_macIsUserPane = false;
if ( !wxWindow::Create(parent, id, pos, size, style & ~(wxHSCROLL | wxVSCROLL), name) )
if ( !wxWindow::Create(parent, id, pos, size, style, name) )
return false; return false;
m_dbImpl = new wxMacDataBrowserListCtrlControl( this, pos, size, style ); m_dbImpl = new wxMacDataBrowserListCtrlControl( this, pos, size, style );
m_peer = m_dbImpl; m_peer = m_dbImpl;
@@ -2421,7 +2420,7 @@ wxMacDataBrowserListCtrlControl::wxMacDataBrowserListCtrlControl( wxWindow *peer
} }
verify_noerr( SetHiliteStyle(kDataBrowserTableViewFillHilite ) ); verify_noerr( SetHiliteStyle(kDataBrowserTableViewFillHilite ) );
err = SetHasScrollBars( (style & wxHSCROLL) != 0 , true ); err = SetHasScrollBars( (style & wxHSCROLL) != 0 , (style & wxVSCROLL) != 0 );
} }
pascal Boolean wxMacDataBrowserListCtrlControl::DataBrowserEditTextProc( pascal Boolean wxMacDataBrowserListCtrlControl::DataBrowserEditTextProc(