From 97cbae192cb7aa4e2829a17fa56dffdd69598cab Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sat, 23 Mar 2019 09:54:12 +0000
Subject: [PATCH] CtrlLib: ToolBar images not longer adjusted for dark theme,
 plugin/pcre: Fixed to compile

git-svn-id: svn://ultimatepp.org/upp/trunk@12880 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CtrlLib/MenuItem.cpp   | 4 ----
 uppsrc/CtrlLib/ToolButton.cpp | 8 +++-----
 uppsrc/plugin/pcre/lib.c      | 2 --
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/uppsrc/CtrlLib/MenuItem.cpp b/uppsrc/CtrlLib/MenuItem.cpp
index 4792fdefe..3d5cfd0f3 100644
--- a/uppsrc/CtrlLib/MenuItem.cpp
+++ b/uppsrc/CtrlLib/MenuItem.cpp
@@ -210,8 +210,6 @@ void MenuItemBase::PaintTopItem(Draw& w, int state) {
 Bar::Item& MenuItem::Image(const UPP::Image& img)
 {
 	licon = img;
-	if(IsDarkColorFace() && !nodarkadjust)
-		licon = MakeImage(licon, AdjustForDarkBk);
 	Refresh();
 	return *this;
 }
@@ -219,8 +217,6 @@ Bar::Item& MenuItem::Image(const UPP::Image& img)
 MenuItem& MenuItem::RightImage(const UPP::Image& img)
 {
 	ricon = img;
-	if(IsDarkColorFace() && !nodarkadjust)
-		ricon = MakeImage(ricon, AdjustForDarkBk);
 	Refresh();
 	return *this;
 }
diff --git a/uppsrc/CtrlLib/ToolButton.cpp b/uppsrc/CtrlLib/ToolButton.cpp
index 8163517a4..f25ed8f13 100644
--- a/uppsrc/CtrlLib/ToolButton.cpp
+++ b/uppsrc/CtrlLib/ToolButton.cpp
@@ -162,11 +162,7 @@ ToolButton& ToolButton::Kind(int _kind)
 
 Image ToolButton::GetImage() const
 {
-	UPP::Image m = img;
-	if(IsDarkColorFace() && !nodarkadjust)
-		m = MakeImage(m, AdjustForDarkBk);
-	m = CachedRescale(m, min(m.GetSize(), maxiconsize));
-	return m;
+	return CachedRescale(img, min(m.GetSize(), maxiconsize));
 }
 
 Bar::Item& ToolButton::Image(const UPP::Image& img_)
@@ -268,6 +264,8 @@ void  ToolButton::Paint(Draw& w)
 		w.DrawText(ip.x + isz.cx + 3 + off.x, (sz.cy - tsz.cy) / 2 + off.y, text, style->font, style->textcolor[li]);
 	}
 	UPP::Image img = CachedContrast(image, style->contrast[li]);
+	DDUMP(style->contrast);
+	_DBG_; img = image;
 	if(!IsEnabled())
 		img = DisabledImage(img);
 	if(IsEnabled() && style->light[li])
diff --git a/uppsrc/plugin/pcre/lib.c b/uppsrc/plugin/pcre/lib.c
index 8e57d9390..aab82eccd 100644
--- a/uppsrc/plugin/pcre/lib.c
+++ b/uppsrc/plugin/pcre/lib.c
@@ -22,8 +22,6 @@ typedef long long unsigned uint64;
 
 #endif
 
-#define int64_t int64
-
 #include "lib/pcre_byte_order.c"
 #include "lib/pcre_chartables.c"
 #include "lib/pcre_compile.c"