github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-31 07:12:39 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Minor fixes

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@1024 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2009-03-29 18:37:06 +00:00
parent 88f3eea469
commit 3a116f24bb
3 changed files with 1 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/Core/Mt.h
View file

@ -453,7 +453,7 @@ public:
void Enter() {}
void Leave() {}
struct Lock;
class Lock;
};
typedef Mutex StaticMutex;

36
uppsrc/CtrlLib/LabelBase.cpp
View file

@ -20,42 +20,6 @@ void CtrlsImageLook(Value *look, int i, const Image& image, int n)
*look++ = ChLookWith(CtrlsImg::Get(i++), image);
}
CtrlsImgLook& CtrlsImgLook::operator()(int i, int n)
{
while(n-- > 0)
Add(CtrlsImg::Get(i++));
return *this;
}
CtrlsImgLook& CtrlsImgLook::operator()(int i, const Image& img, Color (*fn)(int i), int n)
{
for(int q = 0; q < n; q++)
Add(ChLookWith(CtrlsImg::Get(i++), img, fn, q));
return *this;
}
CtrlsImgLook& CtrlsImgLook::operator()(int i, const Image& img, int n)
{
for(int q = 0; q < n; q++)
Add(ChLookWith(CtrlsImg::Get(i++), img));
return *this;
}
CtrlsImgLook::CtrlsImgLook(int i, int n)
{
operator()(i, n);
}
CtrlsImgLook::CtrlsImgLook(int i, const Image& img, Color (*fn)(int i), int n)
{
operator()(i, img, fn, n);
}
CtrlsImgLook::CtrlsImgLook(int i, const Image& img, int n)
{
operator()(i, img, n);
}
String DeAmp(const char *s)
{
String out;

9
uppsrc/CtrlLib/LabelBase.h
View file

@ -3,15 +3,6 @@ enum {
CTRL_CHECKED, CTRL_HOTCHECKED
};
struct CtrlsImgLook : Vector<Value> { // deprecated - remove after refactoring chameleon
CtrlsImgLook& operator()(int i, int n = 4);
CtrlsImgLook& operator()(int i, const Image& img, Color (*fn)(int i), int n = 4);
CtrlsImgLook& operator()(int i, const Image& img, int n = 4);
CtrlsImgLook(int i, int n = 4);
CtrlsImgLook(int i, const Image& img, Color (*fn)(int i), int n = 4);
CtrlsImgLook(int i, const Image& img, int n = 4);
};
void CtrlsImageLook(Value *look, int i, int n = 4);
void CtrlsImageLook(Value *look, int i, const Image& image, const Color *color, int n = 4);
void CtrlsImageLook(Value *look, int i, const Image& image, int n = 4);