From: Vadim Zeitlin Date: Tue, 31 Oct 2006 08:47:16 +0000 (+0000) Subject: define wxTC_MULTILINE explicitly as wxNB_MULTILINE is not necessarily defined where... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1e0e7f7d0ec3d923c8e9b247ca73d3a52e70a006?ds=inline define wxTC_MULTILINE explicitly as wxNB_MULTILINE is not necessarily defined where it is used (e.g. msw/tabctrl.cpp); change the value of wxTC_OWNERDRAW to avoid conflict with wxTC_MULTILINE git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/defs.h b/include/wx/defs.h index 22cb3d2d87..1d1953270f 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -1553,8 +1553,8 @@ enum wxBorder #define wxTC_LEFT 0x0020 #define wxTC_RIGHT 0x0040 #define wxTC_BOTTOM 0x0080 -#define wxTC_MULTILINE wxNB_MULTILINE -#define wxTC_OWNERDRAW 0x0200 +#define wxTC_MULTILINE 0x0200 /* == wxNB_MULTILINE */ +#define wxTC_OWNERDRAW 0x0400 /* * wxStatusBar95 flags