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

switching to generic icon for macOS

Browse Source
This commit is contained in:
Stefan Csomor
2018-09-21 16:09:54 +02:00
committed by Vadim Zeitlin
parent 3370b76318
commit 0a812865cf
4 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build/bakefiles/files.bkl
View File

@@ -2435,7 +2435,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/osx/carbon/cursor.cpp
src/osx/carbon/fontdlg.cpp
src/osx/carbon/gdiobj.cpp
src/osx/carbon/icon.cpp
src/osx/carbon/app.cpp
src/osx/carbon/control.cpp
src/osx/carbon/dataobj.cpp
@@ -2468,6 +2467,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/generic/prntdlgg.cpp
src/generic/statusbr.cpp
src/generic/textmeasure.cpp
src/generic/icon.cpp
</if>
</set>
@@ -2511,7 +2511,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/osx/fontdlg.h
wx/osx/frame.h
wx/osx/gauge.h
wx/osx/icon.h
wx/osx/imaglist.h
wx/osx/listbox.h
wx/osx/listctrl.h
@@ -2566,6 +2565,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/generic/prntdlgg.h
wx/generic/statusbr.h
wx/osx/appprogress.h
wx/generic/icon.h
</set>
<!-- ====================================================================== -->
@@ -2656,7 +2656,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<set var="OSX_IPHONE_SRC" hints="files">
$(OSX_COMMON_SRC)
src/generic/regiong.cpp
src/generic/icon.cpp
<!-- iphone files -->
src/osx/iphone/anybutton.mm
src/osx/iphone/button.mm

5
build/cmake/files.cmake
View File

@@ -2312,7 +2312,6 @@ set(OSX_COMMON_SRC
src/osx/carbon/cursor.cpp
src/osx/carbon/fontdlg.cpp
src/osx/carbon/gdiobj.cpp
src/osx/carbon/icon.cpp
src/osx/carbon/app.cpp
src/osx/carbon/control.cpp
src/osx/carbon/dataobj.cpp
@@ -2345,6 +2344,7 @@ set(OSX_COMMON_SRC
src/generic/prntdlgg.cpp
src/generic/statusbr.cpp
src/generic/textmeasure.cpp
src/generic/icon.cpp
#TODO: </if>
)
@@ -2387,7 +2387,6 @@ set(OSX_SHARED_HDR
wx/osx/fontdlg.h
wx/osx/frame.h
wx/osx/gauge.h
wx/osx/icon.h
wx/osx/imaglist.h
wx/osx/listbox.h
wx/osx/listctrl.h
@@ -2442,6 +2441,7 @@ set(OSX_SHARED_HDR
wx/generic/prntdlgg.h
wx/generic/statusbr.h
wx/osx/appprogress.h
wx/generic/icon.h
)
set(OSX_COCOA_SRC
@@ -2525,7 +2525,6 @@ set(OSX_COCOA_HDR
set(OSX_IPHONE_SRC
${OSX_COMMON_SRC}
src/generic/regiong.cpp
src/generic/icon.cpp
src/osx/cocoa/stdpaths.mm
# iphone files
src/osx/iphone/anybutton.mm

5
build/files
View File

@@ -2296,7 +2296,6 @@ OSX_COMMON_SRC =
src/osx/carbon/cursor.cpp
src/osx/carbon/fontdlg.cpp
src/osx/carbon/gdiobj.cpp
src/osx/carbon/icon.cpp
src/osx/carbon/app.cpp
src/osx/carbon/control.cpp
src/osx/carbon/dataobj.cpp
@@ -2325,6 +2324,7 @@ OSX_COMMON_SRC =
src/generic/filepickerg.cpp
src/generic/fontdlgg.cpp
src/generic/fontpickerg.cpp
src/generic/icon.cpp
src/generic/listctrl.cpp
src/generic/prntdlgg.cpp
src/generic/statusbr.cpp
@@ -2371,7 +2371,6 @@ OSX_SHARED_HDR =
wx/osx/fontdlg.h
wx/osx/frame.h
wx/osx/gauge.h
wx/osx/icon.h
wx/osx/imaglist.h
wx/osx/listbox.h
wx/osx/listctrl.h
@@ -2422,6 +2421,7 @@ OSX_SHARED_HDR =
wx/generic/filepickerg.h
wx/generic/fontdlgg.h
wx/generic/fontpickerg.h
wx/generic/icon.h
wx/generic/listctrl.h
wx/generic/prntdlgg.h
wx/generic/statusbr.h
@@ -2511,7 +2511,6 @@ OSX_COCOA_HDR =
OSX_IPHONE_SRC =
$(OSX_COMMON_SRC)
src/generic/animateg.cpp
src/generic/icon.cpp
src/generic/regiong.cpp
src/osx/cocoa/stdpaths.mm
src/osx/core/sound.cpp

2
build/osx/wxcocoa.xcodeproj/project.pbxproj
View File

@@ -4754,7 +4754,7 @@
F4B85051B7C835A8BF4E3EE1 /* xh_panel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xh_panel.cpp; path = ../../src/xrc/xh_panel.cpp; sourceTree = "<group>"; };
F4C72C5C61A6335C8B418BA1 /* LexMetapost.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LexMetapost.cxx; path = ../../src/stc/scintilla/lexers/LexMetapost.cxx; sourceTree = "<group>"; };
F52DCBC0442233738B39138E /* CaseFolder.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CaseFolder.cxx; path = ../../src/stc/scintilla/src/CaseFolder.cxx; sourceTree = "<group>"; };
F5DAF1F49F0F3F41A427A21D /* icon.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = icon.cpp; path = ../../src/osx/carbon/icon.cpp; sourceTree = "<group>"; };
F5DAF1F49F0F3F41A427A21D /* icon.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = icon.cpp; path = ../../src/generic/icon.cpp; sourceTree = "<group>"; };
F6EA240B3DB93D398A990FAD /* tif_dirread.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_dirread.c; path = ../../src/tiff/libtiff/tif_dirread.c; sourceTree = "<group>"; };
F6F01A84F4DE3C9FB9849004 /* tif_jbig.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = tif_jbig.c; path = ../../src/tiff/libtiff/tif_jbig.c; sourceTree = "<group>"; };
F7332A03D93D3DABB050615D /* dir.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dir.cpp; path = ../../src/unix/dir.cpp; sourceTree = "<group>"; };