|
@@ -375,17 +375,15 @@ void __fastcall ShowNotification(TTerminal * Terminal, const UnicodeString & Str
|
|
|
//---------------------------------------------------------------------------
|
|
|
void __fastcall ConfigureInterface()
|
|
|
{
|
|
|
+ DebugAssert(WinConfiguration != NULL);
|
|
|
int BidiModeFlag =
|
|
|
AdjustLocaleFlag(LoadStr(BIDI_MODE), WinConfiguration->BidiModeOverride, false, bdRightToLeft, bdLeftToRight);
|
|
|
Application->BiDiMode = static_cast<TBiDiMode>(BidiModeFlag);
|
|
|
SetTBXSysParam(TSP_XPVISUALSTYLE, XPVS_AUTOMATIC);
|
|
|
- if (WinConfiguration != NULL)
|
|
|
+ UnicodeString Theme = WinConfiguration->UseDarkTheme() ? L"DarkOfficeXP" : L"OfficeXP";
|
|
|
+ if (!SameText(TBXCurrentTheme(), Theme))
|
|
|
{
|
|
|
- UnicodeString Theme = WinConfiguration->UseDarkTheme() ? L"DarkOfficeXP" : L"OfficeXP";
|
|
|
- if (!SameText(TBXCurrentTheme(), Theme))
|
|
|
- {
|
|
|
- TBXSetTheme(Theme);
|
|
|
- }
|
|
|
+ TBXSetTheme(Theme);
|
|
|
}
|
|
|
// Has any effect on Wine only
|
|
|
// (otherwise initial UserDocumentDirectory is equivalent to GetPersonalFolder())
|