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 #include +void CtrlSetDefaultSkin(void (*_skin)()); + INITIALIZER(CtrlLib) { - Ctrl::SetSkin(ChHostSkin); + CtrlSetDefaultSkin(ChHostSkin); }; }