From eb32e32df8768b341c12c21d3eb1dfdcb4572fa8 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Wed, 12 Feb 2020 18:34:06 +0000
Subject: [PATCH] CtrlLib: Cocoa fixes

git-svn-id: svn://ultimatepp.org/upp/trunk@13996 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CtrlCore/CocoImage.mm | 2 +-
 uppsrc/CtrlCore/ToDo.txt     | 3 +++
 uppsrc/CtrlLib/ChCoco.cpp    | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/uppsrc/CtrlCore/CocoImage.mm b/uppsrc/CtrlCore/CocoImage.mm
index a3461aa85..233c9abe9 100644
--- a/uppsrc/CtrlCore/CocoImage.mm
+++ b/uppsrc/CtrlCore/CocoImage.mm
@@ -26,7 +26,7 @@ struct ImageSysData {
 	~ImageSysData();
 };
 
-// Note: Coca U++ has to ignore paintonly flag as the data of image are directly referenced by
+// Note: Cocoa U++ has to ignore paintonly flag as the data of image are directly referenced by
 // data provider
 
 void ImageSysData::Init(const Image& m)
diff --git a/uppsrc/CtrlCore/ToDo.txt b/uppsrc/CtrlCore/ToDo.txt
index 1d5ca2da7..d8d57b61c 100644
--- a/uppsrc/CtrlCore/ToDo.txt
+++ b/uppsrc/CtrlCore/ToDo.txt
@@ -4,6 +4,9 @@
 - Classic is broken
 - Inactive doc icon is not updated - [B] does not blink anymore
 - Make allocator work
+- ClassicCtrlsImg
+- FileChooser
+- Remove menu slide effect
 
 NTH:
 
diff --git a/uppsrc/CtrlLib/ChCoco.cpp b/uppsrc/CtrlLib/ChCoco.cpp
index f7b8acd23..b41518117 100644
--- a/uppsrc/CtrlLib/ChCoco.cpp
+++ b/uppsrc/CtrlLib/ChCoco.cpp
@@ -74,9 +74,10 @@ void ChHostSkin()
 	ChReset();
 
 	GUI_GlobalStyle_Write(GUISTYLE_XP);
+	GUI_PopUpEffect_Write(GUIEFFECT_NONE);
 
 	SwapOKCancel_Write(true);
-	SColorFace_Write(CocoColor(COCO_WINDOW, White())); // ThemeBrushDialogBackgroundActive
+	SColorFace_Write(CocoColor(COCO_WINDOW, White()));
 	SColorHighlight_Write(CocoColor(COCO_SELECTEDPAPER));
 	SColorHighlightText_Write(CocoColor(COCO_SELECTEDTEXT));
 	SColorText_Write(CocoColor(COCO_TEXT));