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

Border removed, other sillinesses fixed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-11-21 17:01:15 +00:00
parent 6fb932d8cc
commit 437753d80c
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/msw/tabctrl.cpp
View File

@@ -76,15 +76,8 @@ bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
m_windowStyle = style; m_windowStyle = style;
SetFont(* (wxTheFontList->FindOrCreateFont(11, wxSWISS, wxNORMAL, wxNORMAL)));
SetParent(parent); SetParent(parent);
DWORD msflags = 0;
if (style & wxBORDER)
msflags |= WS_BORDER;
msflags |= WS_CHILD | WS_VISIBLE;
if (width <= 0) if (width <= 0)
width = 100; width = 100;
if (height <= 0) if (height <= 0)
@@ -105,6 +98,8 @@ bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
tabStyle |= TCS_FIXEDWIDTH; tabStyle |= TCS_FIXEDWIDTH;
if (m_windowStyle & wxTC_OWNERDRAW) if (m_windowStyle & wxTC_OWNERDRAW)
tabStyle |= TCS_OWNERDRAWFIXED; tabStyle |= TCS_OWNERDRAWFIXED;
if (m_windowStyle & wxBORDER)
tabStyle |= WS_BORDER;
tabStyle |= TCS_TOOLTIPS; tabStyle |= TCS_TOOLTIPS;
@@ -112,7 +107,7 @@ bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
HWND hWndTabCtrl = CreateWindowEx(0L, // No extended styles. HWND hWndTabCtrl = CreateWindowEx(0L, // No extended styles.
WC_TABCONTROL, // Class name for the tab control WC_TABCONTROL, // Class name for the tab control
wxT(""), // No default text. wxT(""), // No default text.
WS_CHILD | WS_BORDER | WS_VISIBLE | tabStyle, // Styles and defaults. tabStyle, // Styles and defaults.
x, y, width, height, // Standard size and position. x, y, width, height, // Standard size and position.
(HWND) parent->GetHWND(), // Parent window (HWND) parent->GetHWND(), // Parent window
(HMENU)m_windowId, // ID. (HMENU)m_windowId, // ID.
@@ -124,6 +119,8 @@ bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
SubclassWin((WXHWND) hWndTabCtrl); SubclassWin((WXHWND) hWndTabCtrl);
SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
return TRUE; return TRUE;
} }