github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlCore: Fixed issue with default skin

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@14312 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2020-04-15 11:38:25 +00:00
parent 8dc013f007
commit 240cb33e59
5 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/CtrlCore/CocoApp.mm
View file

@ -97,7 +97,7 @@ void CocoInit(int argc, const char **argv, const char **envptr)
sClipFmtsRTF = "rtf";
Ctrl::Csizeinit();
Ctrl::ReSkin();
}
int Ctrl::GetKbdDelay()

5
uppsrc/CtrlCore/Ctrl.cpp
View file

@ -974,6 +974,11 @@ INITBLOCK {
void (*Ctrl::skin)();
void CtrlSetDefaultSkin(void (*_skin)())
{
Ctrl::skin = _skin;
}
void Ctrl::SetSkin(void (*_skin)())
{
GuiLock __;

2
uppsrc/CtrlCore/CtrlCore.h
View file

@ -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;

2
uppsrc/CtrlLib/ChCoco.cpp
View file

@ -67,8 +67,6 @@ void CocoButton(Button::Style& s, int type, int value)
void ChHostSkin()
{
TIMING("ChHostSkin");
CtrlImg::Reset();
CtrlsImg::Reset();
ChReset();

4
uppsrc/CtrlLib/CtrlLibInit.cpp
View file

@ -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);
};
}