From 240cb33e59635b14d9f4ce609ff8ebb00392072f Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Wed, 15 Apr 2020 11:38:25 +0000
Subject: [PATCH] CtrlCore: Fixed issue with default skin

git-svn-id: svn://ultimatepp.org/upp/trunk@14312 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CtrlCore/CocoApp.mm     | 2 +-
 uppsrc/CtrlCore/Ctrl.cpp       | 5 +++++
 uppsrc/CtrlCore/CtrlCore.h     | 2 +-
 uppsrc/CtrlLib/ChCoco.cpp      | 2 --
 uppsrc/CtrlLib/CtrlLibInit.cpp | 4 +++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/uppsrc/CtrlCore/CocoApp.mm b/uppsrc/CtrlCore/CocoApp.mm
index 04c2be67d..a44a5bf05 100644
--- a/uppsrc/CtrlCore/CocoApp.mm
+++ b/uppsrc/CtrlCore/CocoApp.mm
@@ -97,7 +97,7 @@ void CocoInit(int argc, const char **argv, const char **envptr)
     
     sClipFmtsRTF = "rtf";
     
-    Ctrl::Csizeinit();
+    Ctrl::ReSkin();
 }
 
 int Ctrl::GetKbdDelay()
diff --git a/uppsrc/CtrlCore/Ctrl.cpp b/uppsrc/CtrlCore/Ctrl.cpp
index fd4634f68..4850dc426 100644
--- a/uppsrc/CtrlCore/Ctrl.cpp
+++ b/uppsrc/CtrlCore/Ctrl.cpp
@@ -974,6 +974,11 @@ INITBLOCK {
 
 void (*Ctrl::skin)();
 
+void CtrlSetDefaultSkin(void (*_skin)())
+{
+	Ctrl::skin = _skin;
+}
+
 void Ctrl::SetSkin(void (*_skin)())
 {
 	GuiLock __;
diff --git a/uppsrc/CtrlCore/CtrlCore.h b/uppsrc/CtrlCore/CtrlCore.h
index eda5c65c2..3b24b82b1 100644
--- a/uppsrc/CtrlCore/CtrlCore.h
+++ b/uppsrc/CtrlCore/CtrlCore.h
@@ -673,7 +673,7 @@ private:
 	friend void  InitRichTextZoom();
 	friend void  AvoidPaintingCheck__();
 	friend dword GetKeyStateSafe(dword what);
-	friend void  CtrlSetDefaultSkin(void (*fn1)(), void (*fn2)());
+	friend void  CtrlSetDefaultSkin(void (*_skin)());
 	friend class DHCtrl;
 	friend class ViewDraw;
 	friend class TopWindow;
diff --git a/uppsrc/CtrlLib/ChCoco.cpp b/uppsrc/CtrlLib/ChCoco.cpp
index 9696a284e..b9f72ab66 100644
--- a/uppsrc/CtrlLib/ChCoco.cpp
+++ b/uppsrc/CtrlLib/ChCoco.cpp
@@ -67,8 +67,6 @@ void CocoButton(Button::Style& s, int type, int value)
 
 void ChHostSkin()
 {
-	TIMING("ChHostSkin");
-
 	CtrlImg::Reset();
 	CtrlsImg::Reset();
 	ChReset();
diff --git a/uppsrc/CtrlLib/CtrlLibInit.cpp b/uppsrc/CtrlLib/CtrlLibInit.cpp
index 9c3d2e126..234636087 100644
--- a/uppsrc/CtrlLib/CtrlLibInit.cpp
+++ b/uppsrc/CtrlLib/CtrlLibInit.cpp
@@ -5,8 +5,10 @@ namespace Upp {
 #define  TFILE <CtrlLib/CtrlLib.t>
 #include <Core/t.h>
 
+void CtrlSetDefaultSkin(void (*_skin)());
+
 INITIALIZER(CtrlLib) {
-	Ctrl::SetSkin(ChHostSkin);
+	CtrlSetDefaultSkin(ChHostSkin);
 };
 
 }