forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix deprecatons

This commit is contained in:
Vadim Lopatin 2018-10-05 09:13:49 +03:00
parent 764c72f2b3
commit 9cda6eac3a
4 changed files with 47 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
dlangui-msvc.sln
View File

@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
# Visual Studio 15
VisualStudioVersion = 15.0.28010.2041
MinimumVisualStudioVersion = 10.0.40219.1
Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "dlangui", "dlangui-msvc.visualdproj", "{52A2ABB9-2CF7-4D5F-AE8C-75B21F8585A5}"
EndProject
@ -55,15 +55,12 @@ Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "dminer", "examples\dminer\d
{52A2ABB9-2CF7-4D5F-AE8C-75B21F8585A5} = {52A2ABB9-2CF7-4D5F-AE8C-75B21F8585A5}
EndProjectSection
EndProject
Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "dminer2", "examples\dminer2\dminer2.visualdproj", "{5F443F6A-6612-4404-B89E-D0D0205DC812}"
Project("{002A2DE9-8BB6-484D-9802-7E4AD4084715}") = "Failed to load dminer2", "examples\dminer2\dminer2.visualdproj", "{5F443F6A-6612-4404-B89E-D0D0205DC812}"
ProjectSection(ProjectDependencies) = postProject
{52A2ABB9-2CF7-4D5F-AE8C-75B21F8585A5} = {52A2ABB9-2CF7-4D5F-AE8C-75B21F8585A5}
EndProjectSection
EndProject
Global
GlobalSection(Performance) = preSolution
HasPerformanceSessions = true
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
ConsoleDebug|Win32 = ConsoleDebug|Win32
ConsoleDebug|x64 = ConsoleDebug|x64
@ -105,10 +102,10 @@ Global
{1C8C4726-B356-4533-90C7-88BDA875BF30}.Debug|Win32.Build.0 = Debug|Win32
{1C8C4726-B356-4533-90C7-88BDA875BF30}.Debug|x64.ActiveCfg = Debug|x64
{1C8C4726-B356-4533-90C7-88BDA875BF30}.Debug|x64.Build.0 = Debug|x64
{1C8C4726-B356-4533-90C7-88BDA875BF30}.DSFMLDebug|Win32.ActiveCfg = DSFMLDebug|Win32
{1C8C4726-B356-4533-90C7-88BDA875BF30}.DSFMLDebug|Win32.Build.0 = DSFMLDebug|Win32
{1C8C4726-B356-4533-90C7-88BDA875BF30}.DSFMLDebug|x64.ActiveCfg = DSFMLDebug|x64
{1C8C4726-B356-4533-90C7-88BDA875BF30}.DSFMLDebug|x64.Build.0 = DSFMLDebug|x64
{1C8C4726-B356-4533-90C7-88BDA875BF30}.DSFMLDebug|Win32.ActiveCfg = Debug|Win32
{1C8C4726-B356-4533-90C7-88BDA875BF30}.DSFMLDebug|Win32.Build.0 = Debug|Win32
{1C8C4726-B356-4533-90C7-88BDA875BF30}.DSFMLDebug|x64.ActiveCfg = Debug|x64
{1C8C4726-B356-4533-90C7-88BDA875BF30}.DSFMLDebug|x64.Build.0 = Debug|x64
{1C8C4726-B356-4533-90C7-88BDA875BF30}.Release|Win32.ActiveCfg = Release|Win32
{1C8C4726-B356-4533-90C7-88BDA875BF30}.Release|Win32.Build.0 = Release|Win32
{1C8C4726-B356-4533-90C7-88BDA875BF30}.Release|x64.ActiveCfg = Release|x64
@ -125,10 +122,10 @@ Global
{79EA1B6E-D87E-4C45-A12D-7AD00C398F1F}.Debug|Win32.Build.0 = Debug|Win32
{79EA1B6E-D87E-4C45-A12D-7AD00C398F1F}.Debug|x64.ActiveCfg = Debug|x64
{79EA1B6E-D87E-4C45-A12D-7AD00C398F1F}.Debug|x64.Build.0 = Debug|x64
{79EA1B6E-D87E-4C45-A12D-7AD00C398F1F}.DSFMLDebug|Win32.ActiveCfg = DSFMLDebug|Win32
{79EA1B6E-D87E-4C45-A12D-7AD00C398F1F}.DSFMLDebug|Win32.Build.0 = DSFMLDebug|Win32
{79EA1B6E-D87E-4C45-A12D-7AD00C398F1F}.DSFMLDebug|x64.ActiveCfg = DSFMLDebug|x64
{79EA1B6E-D87E-4C45-A12D-7AD00C398F1F}.DSFMLDebug|x64.Build.0 = DSFMLDebug|x64
{79EA1B6E-D87E-4C45-A12D-7AD00C398F1F}.DSFMLDebug|Win32.ActiveCfg = Debug|Win32
{79EA1B6E-D87E-4C45-A12D-7AD00C398F1F}.DSFMLDebug|Win32.Build.0 = Debug|Win32
{79EA1B6E-D87E-4C45-A12D-7AD00C398F1F}.DSFMLDebug|x64.ActiveCfg = Debug|x64
{79EA1B6E-D87E-4C45-A12D-7AD00C398F1F}.DSFMLDebug|x64.Build.0 = Debug|x64
{79EA1B6E-D87E-4C45-A12D-7AD00C398F1F}.Release|Win32.ActiveCfg = Release|Win32
{79EA1B6E-D87E-4C45-A12D-7AD00C398F1F}.Release|Win32.Build.0 = Release|Win32
{79EA1B6E-D87E-4C45-A12D-7AD00C398F1F}.Release|x64.ActiveCfg = Release|x64
@ -145,10 +142,10 @@ Global
{B1CA031C-C195-4938-8F3E-8BFF7DA68933}.Debug|Win32.Build.0 = Debug|Win32
{B1CA031C-C195-4938-8F3E-8BFF7DA68933}.Debug|x64.ActiveCfg = Debug|x64
{B1CA031C-C195-4938-8F3E-8BFF7DA68933}.Debug|x64.Build.0 = Debug|x64
{B1CA031C-C195-4938-8F3E-8BFF7DA68933}.DSFMLDebug|Win32.ActiveCfg = DSFMLDebug|Win32
{B1CA031C-C195-4938-8F3E-8BFF7DA68933}.DSFMLDebug|Win32.Build.0 = DSFMLDebug|Win32
{B1CA031C-C195-4938-8F3E-8BFF7DA68933}.DSFMLDebug|x64.ActiveCfg = DSFMLDebug|x64
{B1CA031C-C195-4938-8F3E-8BFF7DA68933}.DSFMLDebug|x64.Build.0 = DSFMLDebug|x64
{B1CA031C-C195-4938-8F3E-8BFF7DA68933}.DSFMLDebug|Win32.ActiveCfg = Debug|Win32
{B1CA031C-C195-4938-8F3E-8BFF7DA68933}.DSFMLDebug|Win32.Build.0 = Debug|Win32
{B1CA031C-C195-4938-8F3E-8BFF7DA68933}.DSFMLDebug|x64.ActiveCfg = Debug|x64
{B1CA031C-C195-4938-8F3E-8BFF7DA68933}.DSFMLDebug|x64.Build.0 = Debug|x64
{B1CA031C-C195-4938-8F3E-8BFF7DA68933}.Release|Win32.ActiveCfg = Release|Win32
{B1CA031C-C195-4938-8F3E-8BFF7DA68933}.Release|Win32.Build.0 = Release|Win32
{B1CA031C-C195-4938-8F3E-8BFF7DA68933}.Release|x64.ActiveCfg = Release|x64
@ -165,10 +162,10 @@ Global
{9F5147FF-DB71-4CEC-BF2F-803143E42BCD}.Debug|Win32.Build.0 = Debug|Win32
{9F5147FF-DB71-4CEC-BF2F-803143E42BCD}.Debug|x64.ActiveCfg = Debug|x64
{9F5147FF-DB71-4CEC-BF2F-803143E42BCD}.Debug|x64.Build.0 = Debug|x64
{9F5147FF-DB71-4CEC-BF2F-803143E42BCD}.DSFMLDebug|Win32.ActiveCfg = DSFMLDebug|Win32
{9F5147FF-DB71-4CEC-BF2F-803143E42BCD}.DSFMLDebug|Win32.Build.0 = DSFMLDebug|Win32
{9F5147FF-DB71-4CEC-BF2F-803143E42BCD}.DSFMLDebug|x64.ActiveCfg = DSFMLDebug|x64
{9F5147FF-DB71-4CEC-BF2F-803143E42BCD}.DSFMLDebug|x64.Build.0 = DSFMLDebug|x64
{9F5147FF-DB71-4CEC-BF2F-803143E42BCD}.DSFMLDebug|Win32.ActiveCfg = Debug|Win32
{9F5147FF-DB71-4CEC-BF2F-803143E42BCD}.DSFMLDebug|Win32.Build.0 = Debug|Win32
{9F5147FF-DB71-4CEC-BF2F-803143E42BCD}.DSFMLDebug|x64.ActiveCfg = Debug|x64
{9F5147FF-DB71-4CEC-BF2F-803143E42BCD}.DSFMLDebug|x64.Build.0 = Debug|x64
{9F5147FF-DB71-4CEC-BF2F-803143E42BCD}.Release|Win32.ActiveCfg = Release|Win32
{9F5147FF-DB71-4CEC-BF2F-803143E42BCD}.Release|Win32.Build.0 = Release|Win32
{9F5147FF-DB71-4CEC-BF2F-803143E42BCD}.Release|x64.ActiveCfg = Release|x64
@ -221,10 +218,10 @@ Global
{533AF38D-98E7-446F-9689-805BDFF3CE84}.Debug|Win32.Build.0 = Debug|Win32
{533AF38D-98E7-446F-9689-805BDFF3CE84}.Debug|x64.ActiveCfg = Debug|x64
{533AF38D-98E7-446F-9689-805BDFF3CE84}.Debug|x64.Build.0 = Debug|x64
{533AF38D-98E7-446F-9689-805BDFF3CE84}.DSFMLDebug|Win32.ActiveCfg = DSFMLDebug|Win32
{533AF38D-98E7-446F-9689-805BDFF3CE84}.DSFMLDebug|Win32.Build.0 = DSFMLDebug|Win32
{533AF38D-98E7-446F-9689-805BDFF3CE84}.DSFMLDebug|x64.ActiveCfg = DSFMLDebug|x64
{533AF38D-98E7-446F-9689-805BDFF3CE84}.DSFMLDebug|x64.Build.0 = DSFMLDebug|x64
{533AF38D-98E7-446F-9689-805BDFF3CE84}.DSFMLDebug|Win32.ActiveCfg = Debug|Win32
{533AF38D-98E7-446F-9689-805BDFF3CE84}.DSFMLDebug|Win32.Build.0 = Debug|Win32
{533AF38D-98E7-446F-9689-805BDFF3CE84}.DSFMLDebug|x64.ActiveCfg = Debug|x64
{533AF38D-98E7-446F-9689-805BDFF3CE84}.DSFMLDebug|x64.Build.0 = Debug|x64
{533AF38D-98E7-446F-9689-805BDFF3CE84}.Release|Win32.ActiveCfg = Release|Win32
{533AF38D-98E7-446F-9689-805BDFF3CE84}.Release|Win32.Build.0 = Release|Win32
{533AF38D-98E7-446F-9689-805BDFF3CE84}.Release|x64.ActiveCfg = Release|x64
@ -239,8 +236,10 @@ Global
{29CF2CAC-2C0C-4F17-9292-E1706AC7EBBF}.Debug|Win32.ActiveCfg = Debug|Win32
{29CF2CAC-2C0C-4F17-9292-E1706AC7EBBF}.Debug|Win32.Build.0 = Debug|Win32
{29CF2CAC-2C0C-4F17-9292-E1706AC7EBBF}.Debug|x64.ActiveCfg = Debug|x64
{29CF2CAC-2C0C-4F17-9292-E1706AC7EBBF}.DSFMLDebug|Win32.ActiveCfg = DSFMLDebug|Win32
{29CF2CAC-2C0C-4F17-9292-E1706AC7EBBF}.DSFMLDebug|x64.ActiveCfg = DSFMLDebug|x64
{29CF2CAC-2C0C-4F17-9292-E1706AC7EBBF}.DSFMLDebug|Win32.ActiveCfg = Debug|Win32
{29CF2CAC-2C0C-4F17-9292-E1706AC7EBBF}.DSFMLDebug|Win32.Build.0 = Debug|Win32
{29CF2CAC-2C0C-4F17-9292-E1706AC7EBBF}.DSFMLDebug|x64.ActiveCfg = Debug|x64
{29CF2CAC-2C0C-4F17-9292-E1706AC7EBBF}.DSFMLDebug|x64.Build.0 = Debug|x64
{29CF2CAC-2C0C-4F17-9292-E1706AC7EBBF}.Release|Win32.ActiveCfg = Release|Win32
{29CF2CAC-2C0C-4F17-9292-E1706AC7EBBF}.Release|Win32.Build.0 = Release|Win32
{29CF2CAC-2C0C-4F17-9292-E1706AC7EBBF}.Release|x64.ActiveCfg = Release|x64
@ -255,8 +254,10 @@ Global
{20722E6B-CA27-467F-8BB8-07F80106B478}.Debug|Win32.ActiveCfg = Debug|Win32
{20722E6B-CA27-467F-8BB8-07F80106B478}.Debug|Win32.Build.0 = Debug|Win32
{20722E6B-CA27-467F-8BB8-07F80106B478}.Debug|x64.ActiveCfg = Debug|x64
{20722E6B-CA27-467F-8BB8-07F80106B478}.DSFMLDebug|Win32.ActiveCfg = DSFMLDebug|Win32
{20722E6B-CA27-467F-8BB8-07F80106B478}.DSFMLDebug|x64.ActiveCfg = DSFMLDebug|x64
{20722E6B-CA27-467F-8BB8-07F80106B478}.DSFMLDebug|Win32.ActiveCfg = Debug|Win32
{20722E6B-CA27-467F-8BB8-07F80106B478}.DSFMLDebug|Win32.Build.0 = Debug|Win32
{20722E6B-CA27-467F-8BB8-07F80106B478}.DSFMLDebug|x64.ActiveCfg = Debug|x64
{20722E6B-CA27-467F-8BB8-07F80106B478}.DSFMLDebug|x64.Build.0 = Debug|x64
{20722E6B-CA27-467F-8BB8-07F80106B478}.Release|Win32.ActiveCfg = Release|Win32
{20722E6B-CA27-467F-8BB8-07F80106B478}.Release|Win32.Build.0 = Release|Win32
{20722E6B-CA27-467F-8BB8-07F80106B478}.Release|x64.ActiveCfg = Release|Win32
@ -300,4 +301,10 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {CC1A7323-1269-4893-BC1E-4D9EF670BBC5}
EndGlobalSection
GlobalSection(Performance) = preSolution
HasPerformanceSessions = true
EndGlobalSection
EndGlobal

8
dlangui-msvc.visualdproj
View File

@ -1254,10 +1254,10 @@
<File path="src\dlangui\platforms\common\platform.d" />
<File path="src\dlangui\platforms\common\startup.d" />
</Folder>
<Folder name="console">
<File path="src\dlangui\platforms\console\consoleapp.d" />
<File path="src\dlangui\platforms\console\consolefont.d" />
<File path="src\dlangui\platforms\console\dconsole.d" />
<Folder name="ansi_console">
<File path="src\dlangui\platforms\ansi_console\consoleapp.d" />
<File path="src\dlangui\platforms\ansi_console\consolefont.d" />
<File path="src\dlangui\platforms\ansi_console\dconsole.d" />
</Folder>
<Folder name="dsfml">
<File path="src\dlangui\platforms\dsfml\dsfmlapp.d" />

6
src/dlangui/widgets/editors.d
View File

@ -38,6 +38,7 @@ public import dlangui.core.editable;
import std.algorithm;
import std.conv : to;
import std.typecons : Yes, No;
import dlangui.core.streams;
/// Modified state change listener
@ -3300,7 +3301,8 @@ class EditBox : EditWidgetBase {
if (lineText.length < pattern.length)
return;
ptrdiff_t start = 0;
import std.string : indexOf, CaseSensitive, Yes, No;
import std.string : indexOf, CaseSensitive;
import std.typecons : Flag;
bool caseSensitive = (options & TextSearchFlag.CaseSensitive) != 0;
bool wholeWords = (options & TextSearchFlag.WholeWords) != 0;
bool selectionOnly = (options & TextSearchFlag.SelectionOnly) != 0;
@ -3348,7 +3350,7 @@ class EditBox : EditWidgetBase {
res.assumeSafeAppend();
if (!pattern.length)
return res;
import std.string : indexOf, CaseSensitive, Yes, No;
import std.string : indexOf, CaseSensitive;
bool caseSensitive = (options & TextSearchFlag.CaseSensitive) != 0;
bool wholeWords = (options & TextSearchFlag.WholeWords) != 0;
bool selectionOnly = (options & TextSearchFlag.SelectionOnly) != 0;

4
src/dlangui/widgets/grid.d
View File

@ -1181,9 +1181,9 @@ class GridWidgetBase : ScrollWidgetBase, GridModelAdapter, MenuItemActionHandler
}
if (event.action == MouseAction.Wheel) {
if (event.flags & MouseFlag.Shift)
scrollBy(-event.wheelDelta, 0);
scrollBy(-cast(int)event.wheelDelta, 0);
else
scrollBy(0, -event.wheelDelta);
scrollBy(0, -cast(int)event.wheelDelta);
return true;
}
return super.onMouseEvent(event);