Merge branch 'master' into uikit
This commit is contained in:
commit
f6077da614
|
@ -5,7 +5,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2008-2018, Tomasz Sowa
|
* Copyright (c) 2008-2021, Tomasz Sowa
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
@ -42,7 +42,7 @@ namespace Winix
|
||||||
|
|
||||||
#define WINIX_VER_MAJOR 0
|
#define WINIX_VER_MAJOR 0
|
||||||
#define WINIX_VER_MINOR 7
|
#define WINIX_VER_MINOR 7
|
||||||
#define WINIX_VER_REVISION 0
|
#define WINIX_VER_REVISION 1
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2010-2018, Tomasz Sowa
|
* Copyright (c) 2010-2021, Tomasz Sowa
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
@ -118,6 +118,13 @@ FunctionBase * Functions::Find(const std::wstring & function_name)
|
||||||
if( i == table.end() )
|
if( i == table.end() )
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
FunctionBase * fun = i->second;
|
||||||
|
|
||||||
|
// this is to set 'cur' and 'locale' for slog, but in the future slog will be moved to Session
|
||||||
|
fun->set_cur(cur);
|
||||||
|
fun->set_locale(locale);
|
||||||
|
//
|
||||||
|
|
||||||
return i->second;
|
return i->second;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue