Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'simplify-display'

Browse Source 
Centralize all display-related code in wxDisplay class and avoid
duplicating or reimplementing it in wxDisplaySize() and
wxClientDisplayRect() functions.

See https://github.com/wxWidgets/wxWidgets/pull/955
This commit is contained in:
Vadim Zeitlin
2018-10-01 13:52:07 +02:00
parent 00197d0c75 0263ebfaca
commit 761f9f74fc
44 changed files with 545 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/bakefiles/files.bkl
View File

@@ -1150,7 +1150,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/dialup.h
wx/dirctrl.h
wx/display.h
wx/display_impl.h
wx/dnd.h
wx/docmdi.h
wx/docview.h
@@ -2408,7 +2407,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/osx/core/bitmap.cpp
src/osx/core/colour.cpp
src/osx/core/dcmemory.cpp
src/osx/core/display.cpp
src/osx/core/fontenum.cpp
src/osx/core/hid.cpp
src/osx/core/printmac.cpp
@@ -2655,6 +2653,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/common/taskbarcmn.cpp
src/osx/cocoa/activityindicator.mm
src/osx/cocoa/statbmp.mm
src/osx/core/display.cpp
</set>
<set var="OSX_COCOA_HDR" hints="files">
wx/osx/cocoa/chkconf.h

3
build/cmake/files.cmake
View File

@@ -1058,7 +1058,6 @@ set(GUI_CMN_HDR
wx/dialup.h
wx/dirctrl.h
wx/display.h
wx/display_impl.h
wx/dnd.h
wx/docmdi.h
wx/docview.h
@@ -2285,7 +2284,6 @@ set(OSX_LOWLEVEL_SRC
src/osx/core/bitmap.cpp
src/osx/core/colour.cpp
src/osx/core/dcmemory.cpp
src/osx/core/display.cpp
src/osx/core/fontenum.cpp
src/osx/core/hid.cpp
src/osx/core/printmac.cpp
@@ -2527,6 +2525,7 @@ set(OSX_COCOA_SRC
src/osx/datectrl_osx.cpp
src/osx/core/sound.cpp
src/osx/cocoa/statbmp.mm
src/osx/core/display.cpp
)
set(OSX_COCOA_HDR

3
build/files
View File

@@ -988,7 +988,6 @@ GUI_CMN_HDR =
wx/dirctrl.h
wx/dirdlg.h
wx/display.h
wx/display_impl.h
wx/dnd.h
wx/docmdi.h
wx/docview.h
@@ -2268,7 +2267,6 @@ OSX_LOWLEVEL_SRC =
src/osx/core/bitmap.cpp
src/osx/core/colour.cpp
src/osx/core/dcmemory.cpp
src/osx/core/display.cpp
src/osx/core/fontenum.cpp
src/osx/core/hid.cpp
src/osx/core/printmac.cpp
@@ -2499,6 +2497,7 @@ OSX_COCOA_SRC =
src/osx/cocoa/toolbar.mm
src/osx/cocoa/tooltip.mm
src/osx/cocoa/window.mm
src/osx/core/display.cpp
src/osx/core/hidjoystick.cpp
src/osx/core/sound.cpp
src/osx/dataview_osx.cpp

1
build/msw/wx_core.vcxproj
View File

@@ -1280,7 +1280,6 @@
<ClInclude Include="..\..\include\wx\dirctrl.h" />
<ClInclude Include="..\..\include\wx\dirdlg.h" />
<ClInclude Include="..\..\include\wx\display.h" />
<ClInclude Include="..\..\include\wx\display_impl.h" />
<ClInclude Include="..\..\include\wx\dnd.h" />
<ClInclude Include="..\..\include\wx\docmdi.h" />
<ClInclude Include="..\..\include\wx\docview.h" />

3
build/msw/wx_core.vcxproj.filters
View File

@@ -1267,9 +1267,6 @@
<ClInclude Include="..\..\include\wx\display.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\display_impl.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\dnd.h">
<Filter>Common Headers</Filter>
</ClInclude>

3
build/msw/wx_vc7_core.vcproj
View File

@@ -2270,9 +2270,6 @@
<File
RelativePath="..\..\include\wx\display.h">
</File>
<File
RelativePath="..\..\include\wx\display_impl.h">
</File>
<File
RelativePath="..\..\include\wx\dnd.h">
</File>

4
build/msw/wx_vc8_core.vcproj
View File

@@ -3528,10 +3528,6 @@
RelativePath="..\..\include\wx\display.h"
>
</File>
<File
RelativePath="..\..\include\wx\display_impl.h"
>
</File>
<File
RelativePath="..\..\include\wx\dnd.h"
>

4
build/msw/wx_vc9_core.vcproj
View File

@@ -3524,10 +3524,6 @@
RelativePath="..\..\include\wx\display.h"
>
</File>
<File
RelativePath="..\..\include\wx\display_impl.h"
>
</File>
<File
RelativePath="..\..\include\wx\dnd.h"
>

4
build/osx/wxiphone.xcodeproj/project.pbxproj
View File

@@ -803,7 +803,6 @@
F0B3F484C38C3BA0B9927CD9 /* docmdi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ECC9F5C21ACB31A0B24AEE35 /* docmdi.cpp */; };
F0D892C2618130FEAD46BB86 /* panel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00969CBE3B8F32C78C195619 /* panel.cpp */; };
F1E4D7CA634E33808AE3B522 /* fontenumcmn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 373242CD08F330208A7CF438 /* fontenumcmn.cpp */; };
F1F484DD591337399FCD0463 /* display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5617D10CB7136EC9A4194EF /* display.cpp */; };
F22C401903993639AE05A295 /* xh_stbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 147800BBCB80346798B35D75 /* xh_stbox.cpp */; };
F24F637D59F637CA9A7E23C9 /* xh_filectrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 60EE4448A28D38F5ADE17B5A /* xh_filectrl.cpp */; };
F2813BF297C73A3ABD02EC98 /* glcanvas_osx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FA59091E3ED83FB781FB9659 /* glcanvas_osx.cpp */; };
@@ -1402,7 +1401,6 @@
A46D50BEBF523B3F88831086 /* LexAsn1.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexAsn1.cxx; path = ../../src/stc/scintilla/lexers/LexAsn1.cxx; sourceTree = "<group>"; };
A4A745D1821A32D591D76650 /* imagiff.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = imagiff.cpp; path = ../../src/common/imagiff.cpp; sourceTree = "<group>"; };
A54B80C17F823CB5900AD2E8 /* framecmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = framecmn.cpp; path = ../../src/common/framecmn.cpp; sourceTree = "<group>"; };
A5617D10CB7136EC9A4194EF /* display.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = display.cpp; path = ../../src/osx/core/display.cpp; sourceTree = "<group>"; };
A5794CD687013AF8A20A691A /* headerctrlcmn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = headerctrlcmn.cpp; path = ../../src/common/headerctrlcmn.cpp; sourceTree = "<group>"; };
A57CF60203F53459A03951A9 /* arrstr.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = arrstr.cpp; path = ../../src/common/arrstr.cpp; sourceTree = "<group>"; };
A5BBC1E494D33D028CA547FF /* jddctmgr.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = jddctmgr.c; path = ../../src/jpeg/jddctmgr.c; sourceTree = "<group>"; };
@@ -1953,7 +1951,6 @@
A1A53EC3A3463EFDB7614E93 /* bitmap.cpp */,
9D1F14339D1C331087650931 /* colour.cpp */,
343D4FDD5CC030618EF24729 /* dcmemory.cpp */,
A5617D10CB7136EC9A4194EF /* display.cpp */,
36E1DBA275AD325DB759C180 /* fontenum.cpp */,
160EB9744CB63A0B81DC651F /* hid.cpp */,
5CC5C13F8AA1387BADB7E60C /* printmac.cpp */,
@@ -3008,7 +3005,6 @@
03BF1610E2FC3BD5ACB754F0 /* bitmap.cpp in Sources */,
FF50EC0EC5F23DF890C6E95F /* colour.cpp in Sources */,
BD2B17EB72E73A6EB6E0B26F /* dcmemory.cpp in Sources */,
F1F484DD591337399FCD0463 /* display.cpp in Sources */,
371809DA4AD1382F8B532878 /* fontenum.cpp in Sources */,
86BE5213D3F131D8A6862679 /* hid.cpp in Sources */,
AB58406CEBA13BC4A2A83B66 /* printmac.cpp in Sources */,