1. fixed typo ('&' instead of '|') in wxNotebook
2. changed wxTC_MULTILINE to be equal to wxNB_MULTILINE and != 0 3. much more efficient selection handling in virtual wxListCtrl, we can now select 1000000 items without problems 4. kbd/mouse selection (ctrl/shift handling) fixed in wxListCtrl 5. added wxSortedArray::IndexForInsert() and AddAt(), remove Remove(size_t), use RemoveAt() instead git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -161,7 +161,7 @@ bool wxNotebook::Create(wxWindow *parent,
|
||||
if ( m_windowStyle & wxTC_MULTILINE )
|
||||
tabStyle |= TCS_MULTILINE;
|
||||
if ( m_windowStyle & wxBORDER )
|
||||
tabStyle &= WS_BORDER;
|
||||
tabStyle |= WS_BORDER;
|
||||
if (m_windowStyle & wxNB_FIXEDWIDTH)
|
||||
tabStyle |= TCS_FIXEDWIDTH ;
|
||||
if (m_windowStyle & wxNB_BOTTOM)
|
||||
@@ -326,7 +326,7 @@ bool wxNotebook::DeletePage(int nPage)
|
||||
TabCtrl_DeleteItem(m_hwnd, nPage);
|
||||
|
||||
delete m_pages[nPage];
|
||||
m_pages.Remove(nPage);
|
||||
m_pages.RemoveAt(nPage);
|
||||
|
||||
if ( m_pages.IsEmpty() ) {
|
||||
// no selection if the notebook became empty
|
||||
|
Reference in New Issue
Block a user