diff --git a/plugins/common/unicode/DlgBuilder.hpp b/plugins/common/unicode/DlgBuilder.hpp index e5482a451a..4caad4810a 100644 --- a/plugins/common/unicode/DlgBuilder.hpp +++ b/plugins/common/unicode/DlgBuilder.hpp @@ -5,7 +5,7 @@ /* DlgBuilder.hpp -Dynamic construction of dialogs for FAR Manager 3.0 build 4908 +Dynamic construction of dialogs for FAR Manager 3.0 build 5047 */ /* Copyright © 2009 Far Group @@ -102,7 +102,7 @@ struct RadioButtonBinding: public DialogItemBinding int *Value; public: - RadioButtonBinding(int *aValue) : Value(aValue) { } + explicit RadioButtonBinding(int *aValue) : Value(aValue) { } virtual void SaveValue(T *Item, int RadioGroupIndex) override { diff --git a/plugins/common/unicode/farcolor.hpp b/plugins/common/unicode/farcolor.hpp index 21c9faa584..e6c019fb3e 100644 --- a/plugins/common/unicode/farcolor.hpp +++ b/plugins/common/unicode/farcolor.hpp @@ -5,7 +5,7 @@ /* farcolor.hpp -Colors Index for FAR Manager 3.0 build 4908 +Colors Index for FAR Manager 3.0 build 5047 */ /* Copyright © 1996 Eugene Roshal diff --git a/plugins/common/unicode/plugin.hpp b/plugins/common/unicode/plugin.hpp index e72f8c35f9..67ecb10174 100644 --- a/plugins/common/unicode/plugin.hpp +++ b/plugins/common/unicode/plugin.hpp @@ -6,7 +6,7 @@ /* plugin.hpp -Plugin API for Far Manager 3.0 build 4908 +Plugin API for Far Manager 3.0 build 5047 */ /* Copyright © 1996 Eugene Roshal @@ -44,7 +44,7 @@ other possible license with no implications from the above license on them. #define FARMANAGERVERSION_MAJOR 3 #define FARMANAGERVERSION_MINOR 0 #define FARMANAGERVERSION_REVISION 0 -#define FARMANAGERVERSION_BUILD 4908 +#define FARMANAGERVERSION_BUILD 5047 #define FARMANAGERVERSION_STAGE VS_RELEASE #ifndef RC_INVOKED @@ -115,6 +115,29 @@ struct FarColor { return !(*this == rhs); } + + bool IsBg4Bit() const + { + return (Flags & FCF_BG_4BIT) != 0; + } + + bool IsFg4Bit() const + { + return (Flags & FCF_FG_4BIT) != 0; + } + + FarColor& SetBg4Bit(bool Value) + { + Value? Flags |= FCF_BG_4BIT : Flags &= ~FCF_BG_4BIT; + return *this; + } + + FarColor& SetFg4Bit(bool Value) + { + Value? Flags |= FCF_FG_4BIT : Flags &= ~FCF_FG_4BIT; + return *this; + } + #endif }; @@ -590,6 +613,7 @@ static const FARDIALOGFLAGS FDLG_NODRAWSHADOW = 0x0000000000000004ULL, FDLG_NODRAWPANEL = 0x0000000000000008ULL, FDLG_KEEPCONSOLETITLE = 0x0000000000000010ULL, + FDLG_NONMODAL = 0x0000000000000020ULL, FDLG_NONE = 0; typedef intptr_t(WINAPI *FARWINDOWPROC)( @@ -2817,6 +2841,13 @@ struct GetContentDataInfo void* Instance; }; +struct ErrorInfo +{ + size_t StructSize; + const wchar_t* Summary; + const wchar_t* Description; +}; + static const GUID FarGuid = {0x00000000, 0x0000, 0x0000, {0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00}};