we need our own implementation because in wxmac wxIcon does not inherit from wxBitmap anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -221,6 +221,38 @@
|
|||||||
//402
|
//402
|
||||||
//403
|
//403
|
||||||
//404
|
//404
|
||||||
|
401640E507F94B2800A8837A = {
|
||||||
|
fileEncoding = 30;
|
||||||
|
isa = PBXFileReference;
|
||||||
|
lastKnownFileType = sourcecode.cpp.cpp;
|
||||||
|
path = imaglist.cpp;
|
||||||
|
refType = 4;
|
||||||
|
sourceTree = "<group>";
|
||||||
|
};
|
||||||
|
401640E607F94B2800A8837A = {
|
||||||
|
fileRef = 401640E507F94B2800A8837A;
|
||||||
|
isa = PBXBuildFile;
|
||||||
|
settings = {
|
||||||
|
};
|
||||||
|
};
|
||||||
|
401640E707F94B2800A8837A = {
|
||||||
|
fileRef = 401640E507F94B2800A8837A;
|
||||||
|
isa = PBXBuildFile;
|
||||||
|
settings = {
|
||||||
|
};
|
||||||
|
};
|
||||||
|
401640E807F94B2800A8837A = {
|
||||||
|
fileRef = 401640E507F94B2800A8837A;
|
||||||
|
isa = PBXBuildFile;
|
||||||
|
settings = {
|
||||||
|
};
|
||||||
|
};
|
||||||
|
401640E907F94B2800A8837A = {
|
||||||
|
fileRef = 401640E507F94B2800A8837A;
|
||||||
|
isa = PBXBuildFile;
|
||||||
|
settings = {
|
||||||
|
};
|
||||||
|
};
|
||||||
405DD167063C2BFC00F579EE = {
|
405DD167063C2BFC00F579EE = {
|
||||||
isa = PBXFileReference;
|
isa = PBXFileReference;
|
||||||
lastKnownFileType = "compiled.mach-o.dylib";
|
lastKnownFileType = "compiled.mach-o.dylib";
|
||||||
@@ -842,11 +874,9 @@
|
|||||||
4086C7CA063AB2FF00D4CD53,
|
4086C7CA063AB2FF00D4CD53,
|
||||||
4086C7CB063AB2FF00D4CD53,
|
4086C7CB063AB2FF00D4CD53,
|
||||||
4086C7CC063AB2FF00D4CD53,
|
4086C7CC063AB2FF00D4CD53,
|
||||||
4086C7CD063AB2FF00D4CD53,
|
|
||||||
4086C7CE063AB2FF00D4CD53,
|
4086C7CE063AB2FF00D4CD53,
|
||||||
4086C7CF063AB2FF00D4CD53,
|
4086C7CF063AB2FF00D4CD53,
|
||||||
4086C7D0063AB2FF00D4CD53,
|
4086C7D0063AB2FF00D4CD53,
|
||||||
4086C7D1063AB2FF00D4CD53,
|
|
||||||
4086C7D2063AB2FF00D4CD53,
|
4086C7D2063AB2FF00D4CD53,
|
||||||
4086C7D3063AB2FF00D4CD53,
|
4086C7D3063AB2FF00D4CD53,
|
||||||
4086C7D4063AB2FF00D4CD53,
|
4086C7D4063AB2FF00D4CD53,
|
||||||
@@ -1122,6 +1152,7 @@
|
|||||||
40AF913607C8BD1F006A6D3C,
|
40AF913607C8BD1F006A6D3C,
|
||||||
40AF915207C8C912006A6D3C,
|
40AF915207C8C912006A6D3C,
|
||||||
40AF915307C8C912006A6D3C,
|
40AF915307C8C912006A6D3C,
|
||||||
|
401640E907F94B2800A8837A,
|
||||||
);
|
);
|
||||||
isa = PBXSourcesBuildPhase;
|
isa = PBXSourcesBuildPhase;
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
@@ -1924,12 +1955,6 @@
|
|||||||
settings = {
|
settings = {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
4086C7CD063AB2FF00D4CD53 = {
|
|
||||||
fileRef = F5A8608901FA022C0175ACA7;
|
|
||||||
isa = PBXBuildFile;
|
|
||||||
settings = {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
4086C7CE063AB2FF00D4CD53 = {
|
4086C7CE063AB2FF00D4CD53 = {
|
||||||
fileRef = F5A8608801FA022C0175ACA7;
|
fileRef = F5A8608801FA022C0175ACA7;
|
||||||
isa = PBXBuildFile;
|
isa = PBXBuildFile;
|
||||||
@@ -1948,12 +1973,6 @@
|
|||||||
settings = {
|
settings = {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
4086C7D1063AB2FF00D4CD53 = {
|
|
||||||
fileRef = F5A8608501FA022C0175ACA7;
|
|
||||||
isa = PBXBuildFile;
|
|
||||||
settings = {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
4086C7D2063AB2FF00D4CD53 = {
|
4086C7D2063AB2FF00D4CD53 = {
|
||||||
fileRef = F5A8608101FA022C0175ACA7;
|
fileRef = F5A8608101FA022C0175ACA7;
|
||||||
isa = PBXBuildFile;
|
isa = PBXBuildFile;
|
||||||
@@ -3681,11 +3700,9 @@
|
|||||||
4086C99B063AB30000D4CD53,
|
4086C99B063AB30000D4CD53,
|
||||||
4086C99C063AB30000D4CD53,
|
4086C99C063AB30000D4CD53,
|
||||||
4086C99D063AB30000D4CD53,
|
4086C99D063AB30000D4CD53,
|
||||||
4086C99E063AB30000D4CD53,
|
|
||||||
4086C99F063AB30000D4CD53,
|
4086C99F063AB30000D4CD53,
|
||||||
4086C9A0063AB30000D4CD53,
|
4086C9A0063AB30000D4CD53,
|
||||||
4086C9A1063AB30000D4CD53,
|
4086C9A1063AB30000D4CD53,
|
||||||
4086C9A2063AB30000D4CD53,
|
|
||||||
4086C9A3063AB30000D4CD53,
|
4086C9A3063AB30000D4CD53,
|
||||||
4086C9A4063AB30000D4CD53,
|
4086C9A4063AB30000D4CD53,
|
||||||
4086C9A5063AB30000D4CD53,
|
4086C9A5063AB30000D4CD53,
|
||||||
@@ -3889,6 +3906,7 @@
|
|||||||
40AF913707C8BD1F006A6D3C,
|
40AF913707C8BD1F006A6D3C,
|
||||||
40AF915407C8C912006A6D3C,
|
40AF915407C8C912006A6D3C,
|
||||||
40AF915507C8C912006A6D3C,
|
40AF915507C8C912006A6D3C,
|
||||||
|
401640E807F94B2800A8837A,
|
||||||
);
|
);
|
||||||
isa = PBXSourcesBuildPhase;
|
isa = PBXSourcesBuildPhase;
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
@@ -5123,12 +5141,6 @@
|
|||||||
settings = {
|
settings = {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
4086C99E063AB30000D4CD53 = {
|
|
||||||
fileRef = F5A8608501FA022C0175ACA7;
|
|
||||||
isa = PBXBuildFile;
|
|
||||||
settings = {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
4086C99F063AB30000D4CD53 = {
|
4086C99F063AB30000D4CD53 = {
|
||||||
fileRef = F5A8608601FA022C0175ACA7;
|
fileRef = F5A8608601FA022C0175ACA7;
|
||||||
isa = PBXBuildFile;
|
isa = PBXBuildFile;
|
||||||
@@ -5147,12 +5159,6 @@
|
|||||||
settings = {
|
settings = {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
4086C9A2063AB30000D4CD53 = {
|
|
||||||
fileRef = F5A8608901FA022C0175ACA7;
|
|
||||||
isa = PBXBuildFile;
|
|
||||||
settings = {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
4086C9A3063AB30000D4CD53 = {
|
4086C9A3063AB30000D4CD53 = {
|
||||||
fileRef = F5A8608B01FA022C0175ACA7;
|
fileRef = F5A8608B01FA022C0175ACA7;
|
||||||
isa = PBXBuildFile;
|
isa = PBXBuildFile;
|
||||||
@@ -6385,11 +6391,9 @@
|
|||||||
4086CADD063AB30000D4CD53,
|
4086CADD063AB30000D4CD53,
|
||||||
4086CADE063AB30000D4CD53,
|
4086CADE063AB30000D4CD53,
|
||||||
4086CADF063AB30000D4CD53,
|
4086CADF063AB30000D4CD53,
|
||||||
4086CAE0063AB30000D4CD53,
|
|
||||||
4086CAE1063AB30000D4CD53,
|
4086CAE1063AB30000D4CD53,
|
||||||
4086CAE2063AB30000D4CD53,
|
4086CAE2063AB30000D4CD53,
|
||||||
4086CAE3063AB30000D4CD53,
|
4086CAE3063AB30000D4CD53,
|
||||||
4086CAE4063AB30000D4CD53,
|
|
||||||
4086CAE5063AB30000D4CD53,
|
4086CAE5063AB30000D4CD53,
|
||||||
4086CAE6063AB30000D4CD53,
|
4086CAE6063AB30000D4CD53,
|
||||||
4086CAE7063AB30000D4CD53,
|
4086CAE7063AB30000D4CD53,
|
||||||
@@ -6665,6 +6669,7 @@
|
|||||||
40AF913807C8BD1F006A6D3C,
|
40AF913807C8BD1F006A6D3C,
|
||||||
40AF915607C8C912006A6D3C,
|
40AF915607C8C912006A6D3C,
|
||||||
40AF915707C8C912006A6D3C,
|
40AF915707C8C912006A6D3C,
|
||||||
|
401640E607F94B2800A8837A,
|
||||||
);
|
);
|
||||||
isa = PBXSourcesBuildPhase;
|
isa = PBXSourcesBuildPhase;
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
@@ -7467,12 +7472,6 @@
|
|||||||
settings = {
|
settings = {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
4086CAE0063AB30000D4CD53 = {
|
|
||||||
fileRef = F5A8608901FA022C0175ACA7;
|
|
||||||
isa = PBXBuildFile;
|
|
||||||
settings = {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
4086CAE1063AB30000D4CD53 = {
|
4086CAE1063AB30000D4CD53 = {
|
||||||
fileRef = F5A8608801FA022C0175ACA7;
|
fileRef = F5A8608801FA022C0175ACA7;
|
||||||
isa = PBXBuildFile;
|
isa = PBXBuildFile;
|
||||||
@@ -7491,12 +7490,6 @@
|
|||||||
settings = {
|
settings = {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
4086CAE4063AB30000D4CD53 = {
|
|
||||||
fileRef = F5A8608501FA022C0175ACA7;
|
|
||||||
isa = PBXBuildFile;
|
|
||||||
settings = {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
4086CAE5063AB30000D4CD53 = {
|
4086CAE5063AB30000D4CD53 = {
|
||||||
fileRef = F5A8608101FA022C0175ACA7;
|
fileRef = F5A8608101FA022C0175ACA7;
|
||||||
isa = PBXBuildFile;
|
isa = PBXBuildFile;
|
||||||
@@ -9246,11 +9239,9 @@
|
|||||||
4086CCB1063AB30000D4CD53,
|
4086CCB1063AB30000D4CD53,
|
||||||
4086CCB2063AB30000D4CD53,
|
4086CCB2063AB30000D4CD53,
|
||||||
4086CCB3063AB30000D4CD53,
|
4086CCB3063AB30000D4CD53,
|
||||||
4086CCB4063AB30000D4CD53,
|
|
||||||
4086CCB5063AB30000D4CD53,
|
4086CCB5063AB30000D4CD53,
|
||||||
4086CCB6063AB30000D4CD53,
|
4086CCB6063AB30000D4CD53,
|
||||||
4086CCB7063AB30000D4CD53,
|
4086CCB7063AB30000D4CD53,
|
||||||
4086CCB8063AB30000D4CD53,
|
|
||||||
4086CCB9063AB30000D4CD53,
|
4086CCB9063AB30000D4CD53,
|
||||||
4086CCBA063AB30000D4CD53,
|
4086CCBA063AB30000D4CD53,
|
||||||
4086CCBB063AB30000D4CD53,
|
4086CCBB063AB30000D4CD53,
|
||||||
@@ -9454,6 +9445,7 @@
|
|||||||
40AF913907C8BD1F006A6D3C,
|
40AF913907C8BD1F006A6D3C,
|
||||||
40AF915807C8C912006A6D3C,
|
40AF915807C8C912006A6D3C,
|
||||||
40AF915907C8C912006A6D3C,
|
40AF915907C8C912006A6D3C,
|
||||||
|
401640E707F94B2800A8837A,
|
||||||
);
|
);
|
||||||
isa = PBXSourcesBuildPhase;
|
isa = PBXSourcesBuildPhase;
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
@@ -10688,12 +10680,6 @@
|
|||||||
settings = {
|
settings = {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
4086CCB4063AB30000D4CD53 = {
|
|
||||||
fileRef = F5A8608501FA022C0175ACA7;
|
|
||||||
isa = PBXBuildFile;
|
|
||||||
settings = {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
4086CCB5063AB30000D4CD53 = {
|
4086CCB5063AB30000D4CD53 = {
|
||||||
fileRef = F5A8608601FA022C0175ACA7;
|
fileRef = F5A8608601FA022C0175ACA7;
|
||||||
isa = PBXBuildFile;
|
isa = PBXBuildFile;
|
||||||
@@ -10712,12 +10698,6 @@
|
|||||||
settings = {
|
settings = {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
4086CCB8063AB30000D4CD53 = {
|
|
||||||
fileRef = F5A8608901FA022C0175ACA7;
|
|
||||||
isa = PBXBuildFile;
|
|
||||||
settings = {
|
|
||||||
};
|
|
||||||
};
|
|
||||||
4086CCB9063AB30000D4CD53 = {
|
4086CCB9063AB30000D4CD53 = {
|
||||||
fileRef = F5A8608B01FA022C0175ACA7;
|
fileRef = F5A8608B01FA022C0175ACA7;
|
||||||
isa = PBXBuildFile;
|
isa = PBXBuildFile;
|
||||||
@@ -17323,11 +17303,9 @@
|
|||||||
F5A8608001FA022C0175ACA7,
|
F5A8608001FA022C0175ACA7,
|
||||||
F5A8608101FA022C0175ACA7,
|
F5A8608101FA022C0175ACA7,
|
||||||
40AF909707C8A976006A6D3C,
|
40AF909707C8A976006A6D3C,
|
||||||
F5A8608501FA022C0175ACA7,
|
|
||||||
F5A8608601FA022C0175ACA7,
|
F5A8608601FA022C0175ACA7,
|
||||||
F5A8608701FA022C0175ACA7,
|
F5A8608701FA022C0175ACA7,
|
||||||
F5A8608801FA022C0175ACA7,
|
F5A8608801FA022C0175ACA7,
|
||||||
F5A8608901FA022C0175ACA7,
|
|
||||||
F5A8608B01FA022C0175ACA7,
|
F5A8608B01FA022C0175ACA7,
|
||||||
F5A8608D01FA022C0175ACA7,
|
F5A8608D01FA022C0175ACA7,
|
||||||
F5A8608E01FA022C0175ACA7,
|
F5A8608E01FA022C0175ACA7,
|
||||||
@@ -17474,14 +17452,6 @@
|
|||||||
refType = 4;
|
refType = 4;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
};
|
};
|
||||||
F5A8608501FA022C0175ACA7 = {
|
|
||||||
fileEncoding = 30;
|
|
||||||
isa = PBXFileReference;
|
|
||||||
lastKnownFileType = sourcecode.cpp.cpp;
|
|
||||||
path = imaglist.cpp;
|
|
||||||
refType = 4;
|
|
||||||
sourceTree = "<group>";
|
|
||||||
};
|
|
||||||
F5A8608601FA022C0175ACA7 = {
|
F5A8608601FA022C0175ACA7 = {
|
||||||
fileEncoding = 30;
|
fileEncoding = 30;
|
||||||
isa = PBXFileReference;
|
isa = PBXFileReference;
|
||||||
@@ -17506,14 +17476,6 @@
|
|||||||
refType = 4;
|
refType = 4;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
};
|
};
|
||||||
F5A8608901FA022C0175ACA7 = {
|
|
||||||
fileEncoding = 30;
|
|
||||||
isa = PBXFileReference;
|
|
||||||
lastKnownFileType = sourcecode.cpp.cpp;
|
|
||||||
path = msgdlgg.cpp;
|
|
||||||
refType = 4;
|
|
||||||
sourceTree = "<group>";
|
|
||||||
};
|
|
||||||
F5A8608B01FA022C0175ACA7 = {
|
F5A8608B01FA022C0175ACA7 = {
|
||||||
fileEncoding = 30;
|
fileEncoding = 30;
|
||||||
isa = PBXFileReference;
|
isa = PBXFileReference;
|
||||||
@@ -18289,6 +18251,7 @@
|
|||||||
0A98CC470715CFBC007B4289,
|
0A98CC470715CFBC007B4289,
|
||||||
4086C59F063AA5C700D4CD53,
|
4086C59F063AA5C700D4CD53,
|
||||||
F5A861C501FA022C0175ACA7,
|
F5A861C501FA022C0175ACA7,
|
||||||
|
401640E507F94B2800A8837A,
|
||||||
F5A861C701FA022C0175ACA7,
|
F5A861C701FA022C0175ACA7,
|
||||||
F5A861C801FA022C0175ACA7,
|
F5A861C801FA022C0175ACA7,
|
||||||
40AF90E807C8B18C006A6D3C,
|
40AF90E807C8B18C006A6D3C,
|
||||||
|
Reference in New Issue
Block a user