Skip to content

Commit 2e7fd33

Browse files
RavbugRavbug
committed
Open in any editor version
Interface, form.fpb ~ reduced number of Sizers in main window + new dialog box for choosing editor version - removed redundant Projects label + added Open With button to main window interface_derived.h + moved some simple methods to inline header + new class, derives from OpenWithEditorDlgBase and provides functionality to the new dialog + declaration for OpenProject overload, OnOpenWith interface_derived.cpp + event table mapping and implementation for OnOpenWith - removed simple methods that were inlined + implementation for OpenProject overload open_with_dlg.cpp + file added, contains all functionality details for Open With dialog box project.pbxproj (mac) + updated to C++17 ~ switched compiler from clang++ to g++ project.pbxproj (mac, wxcocoa) ~ project modernizations + enabled code signing
1 parent 420761f commit 2e7fd33

File tree

9 files changed

+1358
-795
lines changed

9 files changed

+1358
-795
lines changed

‎mac.xcodeproj/project.pbxproj‎

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,15 @@
1313
AA012115224C24D4000F4F82 /* wxmac.icns in Resources */ = {isa = PBXBuildFile; fileRef = AA012113224C24D4000F4F82 /* wxmac.icns */; };
1414
AA14A0EE222A1217002C4553 /* libwx_osx_cocoa.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = AA1D0F81222A0A1D00678304 /* libwx_osx_cocoa.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
1515
AA14A0F3222A1219002C4553 /* libwx_osx_cocoa.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AA1D0F81222A0A1D00678304 /* libwx_osx_cocoa.dylib */; };
16-
AA1D0FCC222A0A4B00678304 /* wxrelease.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = AA1D0FC9222A0A4A00678304 /* wxrelease.xcconfig */; };
17-
AA1D0FCD222A0A4B00678304 /* wxcocoa.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = AA1D0FCA222A0A4B00678304 /* wxcocoa.xcconfig */; };
18-
AA1D0FCE222A0A4B00678304 /* wxdebug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = AA1D0FCB222A0A4B00678304 /* wxdebug.xcconfig */; };
1916
AA56E9702321F67C002BB5E1 /* globals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA56E96F2321F67C002BB5E1 /* globals.cpp */; };
2017
AA56E98A2321F67E002BB5E1 /* globals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA56E96F2321F67C002BB5E1 /* globals.cpp */; };
2118
AA9F4B912321BEE900FF2E24 /* interface_derived.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA9F4B8F2321BEE900FF2E24 /* interface_derived.cpp */; };
2219
AA9F4B922321BEE900FF2E24 /* interface_derived.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA9F4B8F2321BEE900FF2E24 /* interface_derived.cpp */; };
20+
AAA0F59B23667BCA00B8E4A7 /* open_with_dlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAA0F59A23667BCA00B8E4A7 /* open_with_dlg.cpp */; };
21+
AAA0F59C23667BCA00B8E4A7 /* open_with_dlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAA0F59A23667BCA00B8E4A7 /* open_with_dlg.cpp */; };
2322
AAB4B99F23233EB5007D21F9 /* create_dialog_derived.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB4B99E23233EB5007D21F9 /* create_dialog_derived.cpp */; };
2423
AAB4B9A023233EB5007D21F9 /* create_dialog_derived.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB4B99E23233EB5007D21F9 /* create_dialog_derived.cpp */; };
2524
AAD015C0222B2FE300E25CB7 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAF9D87B222B14E900437548 /* main.cpp */; };
26-
AAD015C4222B2FE300E25CB7 /* wxrelease.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = AA1D0FC9222A0A4A00678304 /* wxrelease.xcconfig */; };
27-
AAD015C5222B2FE300E25CB7 /* wxcocoa.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = AA1D0FCA222A0A4B00678304 /* wxcocoa.xcconfig */; };
28-
AAD015C6222B2FE300E25CB7 /* Info_cocoa.plist in Resources */ = {isa = PBXBuildFile; fileRef = AAF9D87A222B14E900437548 /* Info_cocoa.plist */; };
29-
AAD015C7222B2FE300E25CB7 /* wxdebug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = AA1D0FCB222A0A4B00678304 /* wxdebug.xcconfig */; };
3025
AAD015CF222B328200E25CB7 /* libwx_osx_cocoa_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AA1D0F83222A0A1D00678304 /* libwx_osx_cocoa_static.a */; };
3126
AADF6A25222B359700991DD2 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AADF6A0B222B359700991DD2 /* CoreFoundation.framework */; };
3227
AADF6A27222B35B300991DD2 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AADF6A26222B35B300991DD2 /* CoreGraphics.framework */; };
@@ -36,7 +31,6 @@
3631
AADF6A2F222B360200991DD2 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AADF6A2E222B360200991DD2 /* IOKit.framework */; };
3732
AADF6A31222B360700991DD2 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AADF6A30222B360700991DD2 /* AppKit.framework */; };
3833
AADF6A33222B360C00991DD2 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AADF6A32222B360C00991DD2 /* Foundation.framework */; };
39-
AAF9D87C222B14E900437548 /* Info_cocoa.plist in Resources */ = {isa = PBXBuildFile; fileRef = AAF9D87A222B14E900437548 /* Info_cocoa.plist */; };
4034
AAF9D87D222B14E900437548 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAF9D87B222B14E900437548 /* main.cpp */; };
4135
/* End PBXBuildFile section */
4236

@@ -251,6 +245,7 @@
251245
AA56E96F2321F67C002BB5E1 /* globals.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = globals.cpp; sourceTree = "<group>"; };
252246
AA9F4B8F2321BEE900FF2E24 /* interface_derived.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = interface_derived.cpp; sourceTree = "<group>"; };
253247
AA9F4B902321BEE900FF2E24 /* interface_derived.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = interface_derived.hpp; sourceTree = "<group>"; };
248+
AAA0F59A23667BCA00B8E4A7 /* open_with_dlg.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = open_with_dlg.cpp; sourceTree = "<group>"; };
254249
AAB4B99E23233EB5007D21F9 /* create_dialog_derived.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = create_dialog_derived.cpp; sourceTree = "<group>"; };
255250
AAD015CD222B2FE300E25CB7 /* Unity Hub Native.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Unity Hub Native.app"; sourceTree = BUILT_PRODUCTS_DIR; };
256251
AADF6A0B222B359700991DD2 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
@@ -336,6 +331,7 @@
336331
AA56E96F2321F67C002BB5E1 /* globals.cpp */,
337332
AA9F4B8F2321BEE900FF2E24 /* interface_derived.cpp */,
338333
AA9F4B902321BEE900FF2E24 /* interface_derived.hpp */,
334+
AAA0F59A23667BCA00B8E4A7 /* open_with_dlg.cpp */,
339335
AAB4B99E23233EB5007D21F9 /* create_dialog_derived.cpp */,
340336
41B5AAEC22DB8BB300347CC8 /* interface.cpp */,
341337
41B5AAED22DB8BB400347CC8 /* interface.h */,
@@ -424,7 +420,7 @@
424420
AA1D0F46222A09A600678304 /* Project object */ = {
425421
isa = PBXProject;
426422
attributes = {
427-
LastUpgradeCheck = 1010;
423+
LastUpgradeCheck = 1100;
428424
ORGANIZATIONNAME = Ravbug;
429425
TargetAttributes = {
430426
AA1D0F4D222A09A600678304 = {
@@ -640,23 +636,15 @@
640636
isa = PBXResourcesBuildPhase;
641637
buildActionMask = 2147483647;
642638
files = (
643-
AA1D0FCC222A0A4B00678304 /* wxrelease.xcconfig in Resources */,
644-
AA1D0FCD222A0A4B00678304 /* wxcocoa.xcconfig in Resources */,
645639
AA012114224C24D4000F4F82 /* wxmac.icns in Resources */,
646-
AAF9D87C222B14E900437548 /* Info_cocoa.plist in Resources */,
647-
AA1D0FCE222A0A4B00678304 /* wxdebug.xcconfig in Resources */,
648640
);
649641
runOnlyForDeploymentPostprocessing = 0;
650642
};
651643
AAD015C3222B2FE300E25CB7 /* Resources */ = {
652644
isa = PBXResourcesBuildPhase;
653645
buildActionMask = 2147483647;
654646
files = (
655-
AAD015C4222B2FE300E25CB7 /* wxrelease.xcconfig in Resources */,
656-
AAD015C5222B2FE300E25CB7 /* wxcocoa.xcconfig in Resources */,
657647
AA012115224C24D4000F4F82 /* wxmac.icns in Resources */,
658-
AAD015C6222B2FE300E25CB7 /* Info_cocoa.plist in Resources */,
659-
AAD015C7222B2FE300E25CB7 /* wxdebug.xcconfig in Resources */,
660648
);
661649
runOnlyForDeploymentPostprocessing = 0;
662650
};
@@ -672,6 +660,7 @@
672660
AAB4B99F23233EB5007D21F9 /* create_dialog_derived.cpp in Sources */,
673661
AAF9D87D222B14E900437548 /* main.cpp in Sources */,
674662
41B5AAEE22DB8BB400347CC8 /* interface.cpp in Sources */,
663+
AAA0F59B23667BCA00B8E4A7 /* open_with_dlg.cpp in Sources */,
675664
);
676665
runOnlyForDeploymentPostprocessing = 0;
677666
};
@@ -684,6 +673,7 @@
684673
AAB4B9A023233EB5007D21F9 /* create_dialog_derived.cpp in Sources */,
685674
AAD015C0222B2FE300E25CB7 /* main.cpp in Sources */,
686675
41B5AAEF22DB8BB400347CC8 /* interface.cpp in Sources */,
676+
AAA0F59C23667BCA00B8E4A7 /* open_with_dlg.cpp in Sources */,
687677
);
688678
runOnlyForDeploymentPostprocessing = 0;
689679
};
@@ -704,7 +694,7 @@
704694
ALWAYS_SEARCH_USER_PATHS = NO;
705695
CLANG_ANALYZER_NONNULL = YES;
706696
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
707-
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
697+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
708698
CLANG_CXX_LIBRARY = "libc++";
709699
CLANG_ENABLE_MODULES = YES;
710700
CLANG_ENABLE_OBJC_ARC = YES;
@@ -775,7 +765,7 @@
775765
ALWAYS_SEARCH_USER_PATHS = NO;
776766
CLANG_ANALYZER_NONNULL = YES;
777767
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
778-
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
768+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
779769
CLANG_CXX_LIBRARY = "libc++";
780770
CLANG_ENABLE_MODULES = YES;
781771
CLANG_ENABLE_OBJC_ARC = YES;
@@ -836,7 +826,7 @@
836826
AA1D0F60222A09A800678304 /* Debug */ = {
837827
isa = XCBuildConfiguration;
838828
buildSettings = {
839-
CODE_SIGN_ENTITLEMENTS = wxTest/wxTest.entitlements;
829+
CODE_SIGN_IDENTITY = "-";
840830
CODE_SIGN_STYLE = Automatic;
841831
COMBINE_HIDPI_IMAGES = YES;
842832
INFOPLIST_FILE = "$(SRCROOT)/source/Info_cocoa.plist";
@@ -853,7 +843,7 @@
853843
AA1D0F61222A09A800678304 /* Release */ = {
854844
isa = XCBuildConfiguration;
855845
buildSettings = {
856-
CODE_SIGN_ENTITLEMENTS = wxTest/wxTest.entitlements;
846+
CODE_SIGN_IDENTITY = "-";
857847
CODE_SIGN_STYLE = Automatic;
858848
COMBINE_HIDPI_IMAGES = YES;
859849
INFOPLIST_FILE = "$(SRCROOT)/source/Info_cocoa.plist";
@@ -870,7 +860,7 @@
870860
AAD015CB222B2FE300E25CB7 /* Debug */ = {
871861
isa = XCBuildConfiguration;
872862
buildSettings = {
873-
CODE_SIGN_ENTITLEMENTS = wxTest/wxTest.entitlements;
863+
CODE_SIGN_IDENTITY = "-";
874864
CODE_SIGN_STYLE = Automatic;
875865
COMBINE_HIDPI_IMAGES = YES;
876866
HEADER_SEARCH_PATHS = (
@@ -900,7 +890,7 @@
900890
AAD015CC222B2FE300E25CB7 /* Release */ = {
901891
isa = XCBuildConfiguration;
902892
buildSettings = {
903-
CODE_SIGN_ENTITLEMENTS = wxTest/wxTest.entitlements;
893+
CODE_SIGN_IDENTITY = "-";
904894
CODE_SIGN_STYLE = Automatic;
905895
COMBINE_HIDPI_IMAGES = YES;
906896
HEADER_SEARCH_PATHS = (

‎source/create_dialog_derived.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
//
22
// create_dialog_derived.cpp
3-
// mac
43
//
5-
// Created by Main on 9/6/19.
64
// Copyright © 2019 Ravbug. All rights reserved.
75
//
86

0 commit comments

Comments
 (0)