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

Added wxTreeCtrl::SetItemDropHighlight (wxMSW only);

Browse Source 
added WS_CLIPCHILDREN style to wxNotebook.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-03-21 22:39:45 +00:00
parent aeab6775d8
commit 58a8ab8868
8 changed files with 79 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/msw/notebook.cpp
View File

@@ -133,11 +133,13 @@ bool wxNotebook::Create(wxWindow *parent,
// style
m_windowStyle = style | wxTAB_TRAVERSAL;
long tabStyle = WS_CHILD | WS_VISIBLE | WS_TABSTOP | TCS_TABS;
long tabStyle = WS_CHILD | WS_VISIBLE | WS_TABSTOP | TCS_TABS | WS_CLIPCHILDREN;
if ( m_windowStyle & wxTC_MULTILINE )
tabStyle |= TCS_MULTILINE;
if ( m_windowStyle & wxBORDER )
tabStyle &= WS_BORDER;
if (m_windowStyle & wxNB_FIXEDWIDTH)
tabStyle |= TCS_FIXEDWIDTH ;
// create the tab control.
m_hWnd = (WXHWND)CreateWindowEx
@@ -332,9 +334,23 @@ bool wxNotebook::InsertPage(int nPage,
// add the tab to the control
TC_ITEM tcItem;
tcItem.mask = TCIF_TEXT | TCIF_IMAGE;
tcItem.pszText = (char *)strText.c_str();
tcItem.iImage = imageId;
tcItem.mask = 0;
if (imageId != -1)
{
tcItem.mask |= TCIF_IMAGE;
tcItem.iImage = imageId;
}
else
tcItem.iImage = 0;
if (!strText.IsEmpty())
{
tcItem.mask |= TCIF_TEXT;
tcItem.pszText = (char *)strText.c_str();
}
else
tcItem.pszText = (char *) NULL;
if ( TabCtrl_InsertItem(m_hwnd, nPage, &tcItem) == -1 ) {
wxLogError("Can't create the notebook page '%s'.", strText.c_str());
@@ -525,3 +541,10 @@ void wxNotebook::OnEraseBackground(wxEraseEvent& event)
Default();
}
// Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH
// style.
void wxNotebook::SetTabSize(const wxSize& sz)
{
::SendMessage((HWND) GetHWND(), TCM_SETITEMSIZE, 0, MAKELPARAM(sz.x, sz.y));
}