From bf888032ef5235a8c6fa9d692f8d0e8a84ade592 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 6 Jun 2018 22:53:11 +0300 Subject: merge from master till fixes #1408 (StdMsg: window caption bug) --- src/core/stdmsg/res/resource.rc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/core/stdmsg/res/resource.rc') diff --git a/src/core/stdmsg/res/resource.rc b/src/core/stdmsg/res/resource.rc index 4e1be5d546..aebd57bef9 100644 --- a/src/core/stdmsg/res/resource.rc +++ b/src/core/stdmsg/res/resource.rc @@ -127,9 +127,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN CONTROL "Use a tabbed interface",IDC_USETABS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,11,263,13 CONTROL "Close tab on double click",IDC_CLOSETABS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,26,246,10 - CONTROL "Restore previously open tabs when showing the window",IDC_RESTORETABS, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,39,250,10 - CONTROL "Show tabs at the bottom",IDC_TABSBOTTOM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,52,233,10 + CONTROL "Show tabs at the bottom",IDC_TABSBOTTOM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,39,250,10 END IDD_OPT_MSGTYPE DIALOGEX 0, 0, 283, 234 @@ -167,7 +165,7 @@ IDD_CONTAINER DIALOGEX 0, 0, 275, 200 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CONTROL "Tab1",IDC_TAB,"SysTabControl32",TCS_MULTILINE,0,0,275,200 + CONTROL "Tab1",IDC_TAB,"SysTabControl32",TCS_MULTILINE | TCS_FOCUSNEVER | WS_CLIPSIBLINGS,0,0,275,200 END IDD_FILTER DIALOGEX 0, 0, 83, 125 -- cgit v1.2.3