From 50354a2540ec75e7787dc536ccdc88b93734a576 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 7 Nov 2014 14:59:27 +0000 Subject: [PATCH] Remove wxTB_FLAT from wxTB_DEFAULT_STYLE. The actual default styles for the toolbars don't include wxTB_FLAT anywhere, so don't include it in the (currently almost unused) wxTB_DEFAULT_STYLE neither. See #16667. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/toolbar.h | 2 +- interface/wx/toolbar.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h index b219d1de19..fd69bfa786 100644 --- a/include/wx/toolbar.h +++ b/include/wx/toolbar.h @@ -61,7 +61,7 @@ enum // lay out toolbar at the right edge of the window wxTB_RIGHT = 0x4000, - wxTB_DEFAULT_STYLE = wxTB_HORIZONTAL | wxTB_FLAT + wxTB_DEFAULT_STYLE = wxTB_HORIZONTAL }; #if wxUSE_TOOLBAR diff --git a/interface/wx/toolbar.h b/interface/wx/toolbar.h index 08bcaa1ca9..92f9091689 100644 --- a/interface/wx/toolbar.h +++ b/interface/wx/toolbar.h @@ -59,7 +59,7 @@ enum wxTB_RIGHT, /** flags that are closest to the native look*/ - wxTB_DEFAULT_STYLE = wxTB_HORIZONTAL | wxTB_FLAT + wxTB_DEFAULT_STYLE = wxTB_HORIZONTAL };