Amebis/ZRCola
Amebis/ZRCola
1
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 49 Wiki Activity

Switch to wxWidgets 3.1.1

Browse Source
This commit is contained in:
Simon Rozman 2018-09-03 11:48:28 +02:00
parent 3976831d98
commit 7f0e2cca04
8 changed files with 203 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
MSI/ZRCola/wxWidgets/Makefile
View File

@ -19,6 +19,11 @@
!INCLUDE "..\..\..\include\MSIBuildCfg.mak" !INCLUDE "..\..\..\include\MSIBuildCfg.mak"
# Note: When changing WXWIDGETS_VER or WXWIDGETS_COMPILER, the DLL filenames will change.
# Then, you MUST change the component GUIDs as well.
WXWIDGETS_VER=311
WXWIDGETS_COMPILER=_vc100
!IF "$(PLAT)" == "x64" !IF "$(PLAT)" == "x64"
WXWIDGETS_PLAT=_x64 WXWIDGETS_PLAT=_x64
!ELSE !ELSE
@ -44,20 +49,20 @@ Component ComponentId Directory_ Attributes Condition KeyPath
s$(MSIBUILD_LENGTH_ID) S38 s$(MSIBUILD_LENGTH_ID) i2 S255 S$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) S38 s$(MSIBUILD_LENGTH_ID) i2 S255 S$(MSIBUILD_LENGTH_ID)
Component Component Component Component
!IF "$(PLAT)" == "Win32" !IF "$(PLAT)" == "Win32"
compwxbase.dll.Win32 {86B11E59-4F0A-45F7-A4F6-B4813A5F8A39} ZRCOLABINDIR 0 filewxbase.dll.Win32 compwxbase.dll.Win32 {4C7F5A16-5B74-47D5-A405-57C7BD96F090} ZRCOLABINDIR 0 filewxbase.dll.Win32
compwxbase_net.dll.Win32 {7E138C1C-20CF-4FB5-9504-7F3DD4DC5E54} ZRCOLABINDIR 0 filewxbase_net.dll.Win32 compwxbase_net.dll.Win32 {00534942-B21F-4401-BFE4-C7677F4BE3E5} ZRCOLABINDIR 0 filewxbase_net.dll.Win32
compwxbase_xml.dll.Win32 {B8175665-7408-4D9A-9341-D2933E7D5BC6} ZRCOLABINDIR 0 filewxbase_xml.dll.Win32 compwxbase_xml.dll.Win32 {71E30748-DD22-4D8B-B26F-60C5150D9AAE} ZRCOLABINDIR 0 filewxbase_xml.dll.Win32
compwxmsw_core.dll.Win32 {EEE366E4-F151-4E43-9760-1E925906D292} ZRCOLABINDIR 0 filewxwxmsw_core.dll.Win32 compwxmsw_core.dll.Win32 {FB8D46B9-86DC-4590-8F0A-8294F6A45E6A} ZRCOLABINDIR 0 filewxwxmsw_core.dll.Win32
compwxmsw_adv.dll.Win32 {C18CD779-BC33-4AD2-8E73-25B6AEDB7A40} ZRCOLABINDIR 0 filewxmsw_adv.dll.Win32 compwxmsw_adv.dll.Win32 {7B7DB31D-1760-493A-BBE9-35237A6EF9E0} ZRCOLABINDIR 0 filewxmsw_adv.dll.Win32
compwxmsw_aui.dll.Win32 {BB9D5874-A26B-4143-8329-59EDD6E09B1C} ZRCOLABINDIR 0 filewxmsw_aui.dll.Win32 compwxmsw_aui.dll.Win32 {49CF9864-63B6-4F43-8EC7-7294B966B419} ZRCOLABINDIR 0 filewxmsw_aui.dll.Win32
!ENDIF !ENDIF
!IF "$(PLAT)" == "x64" !IF "$(PLAT)" == "x64"
compwxbase.dll.x64 {AD46C6EF-EF2E-4DC7-8BBB-255F9881C9C6} ZRCOLABINDIR 256 filewxbase.dll.x64 compwxbase.dll.x64 {905D8859-BFD2-410A-81DB-93231088C066} ZRCOLABINDIR 256 filewxbase.dll.x64
compwxbase_net.dll.x64 {DE55D199-B90D-4F59-AB5A-08408D8276C2} ZRCOLABINDIR 256 filewxbase_net.dll.x64 compwxbase_net.dll.x64 {8A0A49C8-DAEB-4983-8E8D-9DE30AE1D0B6} ZRCOLABINDIR 256 filewxbase_net.dll.x64
compwxbase_xml.dll.x64 {13B4FB42-8446-4B64-BBE8-130E87DEAB9A} ZRCOLABINDIR 256 filewxbase_xml.dll.x64 compwxbase_xml.dll.x64 {24A5F181-EFE7-4542-8AAB-1D21DB74E954} ZRCOLABINDIR 256 filewxbase_xml.dll.x64
compwxmsw_core.dll.x64 {9E2A25DD-0726-44C2-97CD-6AD74BAFE4DC} ZRCOLABINDIR 256 filewxwxmsw_core.dll.x64 compwxmsw_core.dll.x64 {F5B3F6E6-4FFB-4A79-A794-202D6F93F716} ZRCOLABINDIR 256 filewxwxmsw_core.dll.x64
compwxmsw_adv.dll.x64 {C0B70F8C-9885-4188-84E0-2C57A67F32FB} ZRCOLABINDIR 256 filewxmsw_adv.dll.x64 compwxmsw_adv.dll.x64 {D7722FB9-59BB-498F-93C3-78451471A023} ZRCOLABINDIR 256 filewxmsw_adv.dll.x64
compwxmsw_aui.dll.x64 {ED92B13B-A964-43DC-BB8A-0E47C4AEE31C} ZRCOLABINDIR 256 filewxmsw_aui.dll.x64 compwxmsw_aui.dll.x64 {FB703979-0E3D-458E-82DD-DAC33329FA9D} ZRCOLABINDIR 256 filewxmsw_aui.dll.x64
!ENDIF !ENDIF
<<NOKEEP <<NOKEEP
@ -73,12 +78,12 @@ All :: "$(LANG).$(PLAT).$(CFG).File-1.idt"
File Component_ FileName FileSize Version Language Attributes Sequence File Component_ FileName FileSize Version Language Attributes Sequence
s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) l255 i4 S$(MSIBUILD_LENGTH_ID) S20 I2 i2 s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) l255 i4 S$(MSIBUILD_LENGTH_ID) S20 I2 i2
File File File File
filewxbase.dll.$(PLAT) compwxbase.dll.$(PLAT) WXBASE~1.DLL|wxbase30$(WXWIDGETS_CFG)_vc100$(WXWIDGETS_PLAT).dll 0 0 512 1 filewxbase.dll.$(PLAT) compwxbase.dll.$(PLAT) WXBASE~1.DLL|wxbase$(WXWIDGETS_VER)$(WXWIDGETS_CFG)$(WXWIDGETS_COMPILER)$(WXWIDGETS_PLAT).dll 0 0 512 1
filewxbase_net.dll.$(PLAT) compwxbase_net.dll.$(PLAT) WXBASE~2.DLL|wxbase30$(WXWIDGETS_CFG)_net_vc100$(WXWIDGETS_PLAT).dll 0 0 512 1 filewxbase_net.dll.$(PLAT) compwxbase_net.dll.$(PLAT) WXBASE~2.DLL|wxbase$(WXWIDGETS_VER)$(WXWIDGETS_CFG)_net$(WXWIDGETS_COMPILER)$(WXWIDGETS_PLAT).dll 0 0 512 1
filewxbase_xml.dll.$(PLAT) compwxbase_xml.dll.$(PLAT) WXBASE~3.DLL|wxbase30$(WXWIDGETS_CFG)_xml_vc100$(WXWIDGETS_PLAT).dll 0 0 512 1 filewxbase_xml.dll.$(PLAT) compwxbase_xml.dll.$(PLAT) WXBASE~3.DLL|wxbase$(WXWIDGETS_VER)$(WXWIDGETS_CFG)_xml$(WXWIDGETS_COMPILER)$(WXWIDGETS_PLAT).dll 0 0 512 1
filewxwxmsw_core.dll.$(PLAT) compwxmsw_core.dll.$(PLAT) WXMSW3~1.DLL|wxmsw30$(WXWIDGETS_CFG)_core_vc100$(WXWIDGETS_PLAT).dll 0 0 512 1 filewxwxmsw_core.dll.$(PLAT) compwxmsw_core.dll.$(PLAT) WXMSW3~1.DLL|wxmsw$(WXWIDGETS_VER)$(WXWIDGETS_CFG)_core$(WXWIDGETS_COMPILER)$(WXWIDGETS_PLAT).dll 0 0 512 1
filewxmsw_adv.dll.$(PLAT) compwxmsw_adv.dll.$(PLAT) WXMSW3~2.DLL|wxmsw30$(WXWIDGETS_CFG)_adv_vc100$(WXWIDGETS_PLAT).dll 0 0 512 1 filewxmsw_adv.dll.$(PLAT) compwxmsw_adv.dll.$(PLAT) WXMSW3~2.DLL|wxmsw$(WXWIDGETS_VER)$(WXWIDGETS_CFG)_adv$(WXWIDGETS_COMPILER)$(WXWIDGETS_PLAT).dll 0 0 512 1
filewxmsw_aui.dll.$(PLAT) compwxmsw_aui.dll.$(PLAT) WXMSW3~3.DLL|wxmsw30$(WXWIDGETS_CFG)_aui_vc100$(WXWIDGETS_PLAT).dll 0 0 512 1 filewxmsw_aui.dll.$(PLAT) compwxmsw_aui.dll.$(PLAT) WXMSW3~3.DLL|wxmsw$(WXWIDGETS_VER)$(WXWIDGETS_CFG)_aui$(WXWIDGETS_COMPILER)$(WXWIDGETS_PLAT).dll 0 0 512 1
<<NOKEEP <<NOKEEP

288
Makefile
View File

@ -59,54 +59,54 @@ Clean ::
-if exist "$(OUTPUT_DIR)\locale\de_DE\ZRCola-zrcdb.mo" del /f /q "$(OUTPUT_DIR)\locale\de_DE\ZRCola-zrcdb.mo" -if exist "$(OUTPUT_DIR)\locale\de_DE\ZRCola-zrcdb.mo" del /f /q "$(OUTPUT_DIR)\locale\de_DE\ZRCola-zrcdb.mo"
-if exist "$(OUTPUT_DIR)\locale\ru_RU\ZRCola-zrcdb.mo" del /f /q "$(OUTPUT_DIR)\locale\ru_RU\ZRCola-zrcdb.mo" -if exist "$(OUTPUT_DIR)\locale\ru_RU\ZRCola-zrcdb.mo" del /f /q "$(OUTPUT_DIR)\locale\ru_RU\ZRCola-zrcdb.mo"
-if exist "$(OUTPUT_DIR)\locale\sl_SI\ZRCola-zrcdb.mo" del /f /q "$(OUTPUT_DIR)\locale\sl_SI\ZRCola-zrcdb.mo" -if exist "$(OUTPUT_DIR)\locale\sl_SI\ZRCola-zrcdb.mo" del /f /q "$(OUTPUT_DIR)\locale\sl_SI\ZRCola-zrcdb.mo"
-if exist "$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_vc100.dll" -if exist "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_vc100.dll"
-if exist "$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_vc100.pdb" -if exist "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_vc100.pdb"
-if exist "$(OUTPUT_DIR)\Win32.Release\wxbase30u_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxbase30u_vc100.dll" -if exist "$(OUTPUT_DIR)\Win32.Release\wxbase311u_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxbase311u_vc100.dll"
-if exist "$(OUTPUT_DIR)\Win32.Release\wxbase30u_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxbase30u_vc100.pdb" -if exist "$(OUTPUT_DIR)\Win32.Release\wxbase311u_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxbase311u_vc100.pdb"
-if exist "$(OUTPUT_DIR)\x64.Debug\wxbase30ud_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxbase30ud_vc100_x64.dll" -if exist "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_vc100_x64.dll"
-if exist "$(OUTPUT_DIR)\x64.Debug\wxbase30ud_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxbase30ud_vc100_x64.pdb" -if exist "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_vc100_x64.pdb"
-if exist "$(OUTPUT_DIR)\x64.Release\wxbase30u_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Release\wxbase30u_vc100_x64.dll" -if exist "$(OUTPUT_DIR)\x64.Release\wxbase311u_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Release\wxbase311u_vc100_x64.dll"
-if exist "$(OUTPUT_DIR)\x64.Release\wxbase30u_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Release\wxbase30u_vc100_x64.pdb" -if exist "$(OUTPUT_DIR)\x64.Release\wxbase311u_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Release\wxbase311u_vc100_x64.pdb"
-if exist "$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_net_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_net_vc100.dll" -if exist "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_net_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_net_vc100.dll"
-if exist "$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_net_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_net_vc100.pdb" -if exist "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_net_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_net_vc100.pdb"
-if exist "$(OUTPUT_DIR)\Win32.Release\wxbase30u_net_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxbase30u_net_vc100.dll" -if exist "$(OUTPUT_DIR)\Win32.Release\wxbase311u_net_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxbase311u_net_vc100.dll"
-if exist "$(OUTPUT_DIR)\Win32.Release\wxbase30u_net_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxbase30u_net_vc100.pdb" -if exist "$(OUTPUT_DIR)\Win32.Release\wxbase311u_net_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxbase311u_net_vc100.pdb"
-if exist "$(OUTPUT_DIR)\x64.Debug\wxbase30ud_net_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxbase30ud_net_vc100_x64.dll" -if exist "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_net_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_net_vc100_x64.dll"
-if exist "$(OUTPUT_DIR)\x64.Debug\wxbase30ud_net_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxbase30ud_net_vc100_x64.pdb" -if exist "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_net_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_net_vc100_x64.pdb"
-if exist "$(OUTPUT_DIR)\x64.Release\wxbase30u_net_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Release\wxbase30u_net_vc100_x64.dll" -if exist "$(OUTPUT_DIR)\x64.Release\wxbase311u_net_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Release\wxbase311u_net_vc100_x64.dll"
-if exist "$(OUTPUT_DIR)\x64.Release\wxbase30u_net_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Release\wxbase30u_net_vc100_x64.pdb" -if exist "$(OUTPUT_DIR)\x64.Release\wxbase311u_net_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Release\wxbase311u_net_vc100_x64.pdb"
-if exist "$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_xml_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_xml_vc100.dll" -if exist "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_xml_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_xml_vc100.dll"
-if exist "$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_xml_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_xml_vc100.pdb" -if exist "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_xml_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_xml_vc100.pdb"
-if exist "$(OUTPUT_DIR)\Win32.Release\wxbase30u_xml_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxbase30u_xml_vc100.dll" -if exist "$(OUTPUT_DIR)\Win32.Release\wxbase311u_xml_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxbase311u_xml_vc100.dll"
-if exist "$(OUTPUT_DIR)\Win32.Release\wxbase30u_xml_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxbase30u_xml_vc100.pdb" -if exist "$(OUTPUT_DIR)\Win32.Release\wxbase311u_xml_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxbase311u_xml_vc100.pdb"
-if exist "$(OUTPUT_DIR)\x64.Debug\wxbase30ud_xml_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxbase30ud_xml_vc100_x64.dll" -if exist "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_xml_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_xml_vc100_x64.dll"
-if exist "$(OUTPUT_DIR)\x64.Debug\wxbase30ud_xml_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxbase30ud_xml_vc100_x64.pdb" -if exist "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_xml_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_xml_vc100_x64.pdb"
-if exist "$(OUTPUT_DIR)\x64.Release\wxbase30u_xml_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Release\wxbase30u_xml_vc100_x64.dll" -if exist "$(OUTPUT_DIR)\x64.Release\wxbase311u_xml_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Release\wxbase311u_xml_vc100_x64.dll"
-if exist "$(OUTPUT_DIR)\x64.Release\wxbase30u_xml_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Release\wxbase30u_xml_vc100_x64.pdb" -if exist "$(OUTPUT_DIR)\x64.Release\wxbase311u_xml_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Release\wxbase311u_xml_vc100_x64.pdb"
-if exist "$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_core_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_core_vc100.dll" -if exist "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_core_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_core_vc100.dll"
-if exist "$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_core_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_core_vc100.pdb" -if exist "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_core_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_core_vc100.pdb"
-if exist "$(OUTPUT_DIR)\Win32.Release\wxmsw30u_core_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxmsw30u_core_vc100.dll" -if exist "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_core_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_core_vc100.dll"
-if exist "$(OUTPUT_DIR)\Win32.Release\wxmsw30u_core_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxmsw30u_core_vc100.pdb" -if exist "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_core_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_core_vc100.pdb"
-if exist "$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_core_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_core_vc100_x64.dll" -if exist "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_core_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_core_vc100_x64.dll"
-if exist "$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_core_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_core_vc100_x64.pdb" -if exist "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_core_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_core_vc100_x64.pdb"
-if exist "$(OUTPUT_DIR)\x64.Release\wxmsw30u_core_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Release\wxmsw30u_core_vc100_x64.dll" -if exist "$(OUTPUT_DIR)\x64.Release\wxmsw311u_core_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Release\wxmsw311u_core_vc100_x64.dll"
-if exist "$(OUTPUT_DIR)\x64.Release\wxmsw30u_core_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Release\wxmsw30u_core_vc100_x64.pdb" -if exist "$(OUTPUT_DIR)\x64.Release\wxmsw311u_core_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Release\wxmsw311u_core_vc100_x64.pdb"
-if exist "$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_adv_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_adv_vc100.dll" -if exist "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_adv_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_adv_vc100.dll"
-if exist "$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_adv_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_adv_vc100.pdb" -if exist "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_adv_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_adv_vc100.pdb"
-if exist "$(OUTPUT_DIR)\Win32.Release\wxmsw30u_adv_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxmsw30u_adv_vc100.dll" -if exist "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_adv_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_adv_vc100.dll"
-if exist "$(OUTPUT_DIR)\Win32.Release\wxmsw30u_adv_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxmsw30u_adv_vc100.pdb" -if exist "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_adv_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_adv_vc100.pdb"
-if exist "$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_adv_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_adv_vc100_x64.dll" -if exist "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_adv_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_adv_vc100_x64.dll"
-if exist "$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_adv_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_adv_vc100_x64.pdb" -if exist "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_adv_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_adv_vc100_x64.pdb"
-if exist "$(OUTPUT_DIR)\x64.Release\wxmsw30u_adv_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Release\wxmsw30u_adv_vc100_x64.dll" -if exist "$(OUTPUT_DIR)\x64.Release\wxmsw311u_adv_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Release\wxmsw311u_adv_vc100_x64.dll"
-if exist "$(OUTPUT_DIR)\x64.Release\wxmsw30u_adv_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Release\wxmsw30u_adv_vc100_x64.pdb" -if exist "$(OUTPUT_DIR)\x64.Release\wxmsw311u_adv_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Release\wxmsw311u_adv_vc100_x64.pdb"
-if exist "$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_aui_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_aui_vc100.dll" -if exist "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_aui_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_aui_vc100.dll"
-if exist "$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_aui_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_aui_vc100.pdb" -if exist "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_aui_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_aui_vc100.pdb"
-if exist "$(OUTPUT_DIR)\Win32.Release\wxmsw30u_aui_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxmsw30u_aui_vc100.dll" -if exist "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_aui_vc100.dll" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_aui_vc100.dll"
-if exist "$(OUTPUT_DIR)\Win32.Release\wxmsw30u_aui_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxmsw30u_aui_vc100.pdb" -if exist "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_aui_vc100.pdb" del /f /q "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_aui_vc100.pdb"
-if exist "$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_aui_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_aui_vc100_x64.dll" -if exist "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_aui_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_aui_vc100_x64.dll"
-if exist "$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_aui_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_aui_vc100_x64.pdb" -if exist "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_aui_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_aui_vc100_x64.pdb"
-if exist "$(OUTPUT_DIR)\x64.Release\wxmsw30u_aui_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Release\wxmsw30u_aui_vc100_x64.dll" -if exist "$(OUTPUT_DIR)\x64.Release\wxmsw311u_aui_vc100_x64.dll" del /f /q "$(OUTPUT_DIR)\x64.Release\wxmsw311u_aui_vc100_x64.dll"
-if exist "$(OUTPUT_DIR)\x64.Release\wxmsw30u_aui_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Release\wxmsw30u_aui_vc100_x64.pdb" -if exist "$(OUTPUT_DIR)\x64.Release\wxmsw311u_aui_vc100_x64.pdb" del /f /q "$(OUTPUT_DIR)\x64.Release\wxmsw311u_aui_vc100_x64.pdb"
-if exist "$(OUTPUT_DIR)\ZRCola32.ddf" del /f /q "$(OUTPUT_DIR)\ZRCola32.ddf" -if exist "$(OUTPUT_DIR)\ZRCola32.ddf" del /f /q "$(OUTPUT_DIR)\ZRCola32.ddf"
-if exist "$(OUTPUT_DIR)\ZRCola32D.ddf" del /f /q "$(OUTPUT_DIR)\ZRCola32D.ddf" -if exist "$(OUTPUT_DIR)\ZRCola32D.ddf" del /f /q "$(OUTPUT_DIR)\ZRCola32D.ddf"
-if exist "$(OUTPUT_DIR)\ZRCola64.ddf" del /f /q "$(OUTPUT_DIR)\ZRCola64.ddf" -if exist "$(OUTPUT_DIR)\ZRCola64.ddf" del /f /q "$(OUTPUT_DIR)\ZRCola64.ddf"
@ -266,60 +266,60 @@ InstallwxWidgets :: \
InstallwxWidgets_Release_x64 InstallwxWidgets_Release_x64
InstallwxWidgets_Debug_Win32 :: \ InstallwxWidgets_Debug_Win32 :: \
"$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_vc100.dll" \ "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_vc100.dll" \
"$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_vc100.pdb" \ "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_vc100.pdb" \
"$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_net_vc100.dll" \ "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_net_vc100.dll" \
"$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_net_vc100.pdb" \ "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_net_vc100.pdb" \
"$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_xml_vc100.dll" \ "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_xml_vc100.dll" \
"$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_xml_vc100.pdb" \ "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_xml_vc100.pdb" \
"$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_core_vc100.dll" \ "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_core_vc100.dll" \
"$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_core_vc100.pdb" \ "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_core_vc100.pdb" \
"$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_adv_vc100.dll" \ "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_adv_vc100.dll" \
"$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_adv_vc100.pdb" \ "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_adv_vc100.pdb" \
"$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_aui_vc100.dll" \ "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_aui_vc100.dll" \
"$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_aui_vc100.pdb" "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_aui_vc100.pdb"
InstallwxWidgets_Release_Win32 :: \ InstallwxWidgets_Release_Win32 :: \
"$(OUTPUT_DIR)\Win32.Release\wxbase30u_vc100.dll" \ "$(OUTPUT_DIR)\Win32.Release\wxbase311u_vc100.dll" \
"$(OUTPUT_DIR)\Win32.Release\wxbase30u_vc100.pdb" \ "$(OUTPUT_DIR)\Win32.Release\wxbase311u_vc100.pdb" \
"$(OUTPUT_DIR)\Win32.Release\wxbase30u_net_vc100.dll" \ "$(OUTPUT_DIR)\Win32.Release\wxbase311u_net_vc100.dll" \
"$(OUTPUT_DIR)\Win32.Release\wxbase30u_net_vc100.pdb" \ "$(OUTPUT_DIR)\Win32.Release\wxbase311u_net_vc100.pdb" \
"$(OUTPUT_DIR)\Win32.Release\wxbase30u_xml_vc100.dll" \ "$(OUTPUT_DIR)\Win32.Release\wxbase311u_xml_vc100.dll" \
"$(OUTPUT_DIR)\Win32.Release\wxbase30u_xml_vc100.pdb" \ "$(OUTPUT_DIR)\Win32.Release\wxbase311u_xml_vc100.pdb" \
"$(OUTPUT_DIR)\Win32.Release\wxmsw30u_core_vc100.dll" \ "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_core_vc100.dll" \
"$(OUTPUT_DIR)\Win32.Release\wxmsw30u_core_vc100.pdb" \ "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_core_vc100.pdb" \
"$(OUTPUT_DIR)\Win32.Release\wxmsw30u_adv_vc100.dll" \ "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_adv_vc100.dll" \
"$(OUTPUT_DIR)\Win32.Release\wxmsw30u_adv_vc100.pdb" \ "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_adv_vc100.pdb" \
"$(OUTPUT_DIR)\Win32.Release\wxmsw30u_aui_vc100.dll" \ "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_aui_vc100.dll" \
"$(OUTPUT_DIR)\Win32.Release\wxmsw30u_aui_vc100.pdb" "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_aui_vc100.pdb"
InstallwxWidgets_Debug_x64 :: \ InstallwxWidgets_Debug_x64 :: \
"$(OUTPUT_DIR)\x64.Debug\wxbase30ud_vc100_x64.dll" \ "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_vc100_x64.dll" \
"$(OUTPUT_DIR)\x64.Debug\wxbase30ud_vc100_x64.pdb" \ "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_vc100_x64.pdb" \
"$(OUTPUT_DIR)\x64.Debug\wxbase30ud_net_vc100_x64.dll" \ "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_net_vc100_x64.dll" \
"$(OUTPUT_DIR)\x64.Debug\wxbase30ud_net_vc100_x64.pdb" \ "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_net_vc100_x64.pdb" \
"$(OUTPUT_DIR)\x64.Debug\wxbase30ud_xml_vc100_x64.dll" \ "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_xml_vc100_x64.dll" \
"$(OUTPUT_DIR)\x64.Debug\wxbase30ud_xml_vc100_x64.pdb" \ "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_xml_vc100_x64.pdb" \
"$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_core_vc100_x64.dll" \ "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_core_vc100_x64.dll" \
"$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_core_vc100_x64.pdb" \ "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_core_vc100_x64.pdb" \
"$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_adv_vc100_x64.dll" \ "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_adv_vc100_x64.dll" \
"$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_adv_vc100_x64.pdb" \ "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_adv_vc100_x64.pdb" \
"$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_aui_vc100_x64.dll" \ "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_aui_vc100_x64.dll" \
"$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_aui_vc100_x64.pdb" "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_aui_vc100_x64.pdb"
InstallwxWidgets_Release_x64 :: \ InstallwxWidgets_Release_x64 :: \
"$(OUTPUT_DIR)\x64.Release\wxbase30u_vc100_x64.dll" \ "$(OUTPUT_DIR)\x64.Release\wxbase311u_vc100_x64.dll" \
"$(OUTPUT_DIR)\x64.Release\wxbase30u_vc100_x64.pdb" \ "$(OUTPUT_DIR)\x64.Release\wxbase311u_vc100_x64.pdb" \
"$(OUTPUT_DIR)\x64.Release\wxbase30u_net_vc100_x64.dll" \ "$(OUTPUT_DIR)\x64.Release\wxbase311u_net_vc100_x64.dll" \
"$(OUTPUT_DIR)\x64.Release\wxbase30u_net_vc100_x64.pdb" \ "$(OUTPUT_DIR)\x64.Release\wxbase311u_net_vc100_x64.pdb" \
"$(OUTPUT_DIR)\x64.Release\wxbase30u_xml_vc100_x64.dll" \ "$(OUTPUT_DIR)\x64.Release\wxbase311u_xml_vc100_x64.dll" \
"$(OUTPUT_DIR)\x64.Release\wxbase30u_xml_vc100_x64.pdb" \ "$(OUTPUT_DIR)\x64.Release\wxbase311u_xml_vc100_x64.pdb" \
"$(OUTPUT_DIR)\x64.Release\wxmsw30u_core_vc100_x64.dll" \ "$(OUTPUT_DIR)\x64.Release\wxmsw311u_core_vc100_x64.dll" \
"$(OUTPUT_DIR)\x64.Release\wxmsw30u_core_vc100_x64.pdb" \ "$(OUTPUT_DIR)\x64.Release\wxmsw311u_core_vc100_x64.pdb" \
"$(OUTPUT_DIR)\x64.Release\wxmsw30u_adv_vc100_x64.dll" \ "$(OUTPUT_DIR)\x64.Release\wxmsw311u_adv_vc100_x64.dll" \
"$(OUTPUT_DIR)\x64.Release\wxmsw30u_adv_vc100_x64.pdb" \ "$(OUTPUT_DIR)\x64.Release\wxmsw311u_adv_vc100_x64.pdb" \
"$(OUTPUT_DIR)\x64.Release\wxmsw30u_aui_vc100_x64.dll" \ "$(OUTPUT_DIR)\x64.Release\wxmsw311u_aui_vc100_x64.dll" \
"$(OUTPUT_DIR)\x64.Release\wxmsw30u_aui_vc100_x64.pdb" "$(OUTPUT_DIR)\x64.Release\wxmsw311u_aui_vc100_x64.pdb"
UninstallFonts:: UninstallFonts::
-reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "ZRCola (TrueType)" $(REG_FLAGS) > NUL -reg.exe delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "ZRCola (TrueType)" $(REG_FLAGS) > NUL
@ -396,148 +396,148 @@ Localization :: \
"$(WINDIR)\Fonts\ZRCola_BI.otf" : "$(OUTPUT_DIR)\ZRCola_BI.otf" "$(WINDIR)\Fonts\ZRCola_BI.otf" : "$(OUTPUT_DIR)\ZRCola_BI.otf"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxbase30ud_vc100.dll" "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxbase311ud_vc100.dll"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxbase30ud_vc100.pdb" "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxbase311ud_vc100.pdb"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Release\wxbase30u_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxbase30u_vc100.dll" "$(OUTPUT_DIR)\Win32.Release\wxbase311u_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxbase311u_vc100.dll"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Release\wxbase30u_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxbase30u_vc100.pdb" "$(OUTPUT_DIR)\Win32.Release\wxbase311u_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxbase311u_vc100.pdb"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Debug\wxbase30ud_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxbase30ud_vc100_x64.dll" "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311ud_vc100_x64.dll"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Debug\wxbase30ud_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxbase30ud_vc100_x64.pdb" "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311ud_vc100_x64.pdb"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Release\wxbase30u_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxbase30u_vc100_x64.dll" "$(OUTPUT_DIR)\x64.Release\wxbase311u_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311u_vc100_x64.dll"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Release\wxbase30u_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxbase30u_vc100_x64.pdb" "$(OUTPUT_DIR)\x64.Release\wxbase311u_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311u_vc100_x64.pdb"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_net_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxbase30ud_net_vc100.dll" "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_net_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxbase311ud_net_vc100.dll"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_net_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxbase30ud_net_vc100.pdb" "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_net_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxbase311ud_net_vc100.pdb"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Release\wxbase30u_net_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxbase30u_net_vc100.dll" "$(OUTPUT_DIR)\Win32.Release\wxbase311u_net_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxbase311u_net_vc100.dll"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Release\wxbase30u_net_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxbase30u_net_vc100.pdb" "$(OUTPUT_DIR)\Win32.Release\wxbase311u_net_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxbase311u_net_vc100.pdb"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Debug\wxbase30ud_net_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxbase30ud_net_vc100_x64.dll" "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_net_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311ud_net_vc100_x64.dll"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Debug\wxbase30ud_net_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxbase30ud_net_vc100_x64.pdb" "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_net_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311ud_net_vc100_x64.pdb"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Release\wxbase30u_net_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxbase30u_net_vc100_x64.dll" "$(OUTPUT_DIR)\x64.Release\wxbase311u_net_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311u_net_vc100_x64.dll"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Release\wxbase30u_net_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxbase30u_net_vc100_x64.pdb" "$(OUTPUT_DIR)\x64.Release\wxbase311u_net_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311u_net_vc100_x64.pdb"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_xml_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxbase30ud_xml_vc100.dll" "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_xml_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxbase311ud_xml_vc100.dll"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Debug\wxbase30ud_xml_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxbase30ud_xml_vc100.pdb" "$(OUTPUT_DIR)\Win32.Debug\wxbase311ud_xml_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxbase311ud_xml_vc100.pdb"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Release\wxbase30u_xml_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxbase30u_xml_vc100.dll" "$(OUTPUT_DIR)\Win32.Release\wxbase311u_xml_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxbase311u_xml_vc100.dll"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Release\wxbase30u_xml_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxbase30u_xml_vc100.pdb" "$(OUTPUT_DIR)\Win32.Release\wxbase311u_xml_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxbase311u_xml_vc100.pdb"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Debug\wxbase30ud_xml_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxbase30ud_xml_vc100_x64.dll" "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_xml_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311ud_xml_vc100_x64.dll"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Debug\wxbase30ud_xml_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxbase30ud_xml_vc100_x64.pdb" "$(OUTPUT_DIR)\x64.Debug\wxbase311ud_xml_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311ud_xml_vc100_x64.pdb"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Release\wxbase30u_xml_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxbase30u_xml_vc100_x64.dll" "$(OUTPUT_DIR)\x64.Release\wxbase311u_xml_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311u_xml_vc100_x64.dll"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Release\wxbase30u_xml_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxbase30u_xml_vc100_x64.pdb" "$(OUTPUT_DIR)\x64.Release\wxbase311u_xml_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxbase311u_xml_vc100_x64.pdb"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_core_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxmsw30ud_core_vc100.dll" "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_core_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxmsw311ud_core_vc100.dll"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_core_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxmsw30ud_core_vc100.pdb" "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_core_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxmsw311ud_core_vc100.pdb"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Release\wxmsw30u_core_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxmsw30u_core_vc100.dll" "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_core_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxmsw311u_core_vc100.dll"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Release\wxmsw30u_core_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxmsw30u_core_vc100.pdb" "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_core_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxmsw311u_core_vc100.pdb"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_core_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw30ud_core_vc100_x64.dll" "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_core_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311ud_core_vc100_x64.dll"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_core_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw30ud_core_vc100_x64.pdb" "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_core_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311ud_core_vc100_x64.pdb"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Release\wxmsw30u_core_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw30u_core_vc100_x64.dll" "$(OUTPUT_DIR)\x64.Release\wxmsw311u_core_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311u_core_vc100_x64.dll"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Release\wxmsw30u_core_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw30u_core_vc100_x64.pdb" "$(OUTPUT_DIR)\x64.Release\wxmsw311u_core_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311u_core_vc100_x64.pdb"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_adv_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxmsw30ud_adv_vc100.dll" "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_adv_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxmsw311ud_adv_vc100.dll"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_adv_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxmsw30ud_adv_vc100.pdb" "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_adv_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxmsw311ud_adv_vc100.pdb"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Release\wxmsw30u_adv_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxmsw30u_adv_vc100.dll" "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_adv_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxmsw311u_adv_vc100.dll"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Release\wxmsw30u_adv_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxmsw30u_adv_vc100.pdb" "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_adv_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxmsw311u_adv_vc100.pdb"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_adv_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw30ud_adv_vc100_x64.dll" "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_adv_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311ud_adv_vc100_x64.dll"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_adv_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw30ud_adv_vc100_x64.pdb" "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_adv_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311ud_adv_vc100_x64.pdb"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Release\wxmsw30u_adv_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw30u_adv_vc100_x64.dll" "$(OUTPUT_DIR)\x64.Release\wxmsw311u_adv_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311u_adv_vc100_x64.dll"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Release\wxmsw30u_adv_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw30u_adv_vc100_x64.pdb" "$(OUTPUT_DIR)\x64.Release\wxmsw311u_adv_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311u_adv_vc100_x64.pdb"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_aui_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxmsw30ud_aui_vc100.dll" "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_aui_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxmsw311ud_aui_vc100.dll"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Debug\wxmsw30ud_aui_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxmsw30ud_aui_vc100.pdb" "$(OUTPUT_DIR)\Win32.Debug\wxmsw311ud_aui_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxmsw311ud_aui_vc100.pdb"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Release\wxmsw30u_aui_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxmsw30u_aui_vc100.dll" "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_aui_vc100.dll" : "$(WXWIN)\lib\vc100_dll\wxmsw311u_aui_vc100.dll"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\Win32.Release\wxmsw30u_aui_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxmsw30u_aui_vc100.pdb" "$(OUTPUT_DIR)\Win32.Release\wxmsw311u_aui_vc100.pdb" : "$(WXWIN)\lib\vc100_dll\wxmsw311u_aui_vc100.pdb"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_aui_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw30ud_aui_vc100_x64.dll" "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_aui_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311ud_aui_vc100_x64.dll"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Debug\wxmsw30ud_aui_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw30ud_aui_vc100_x64.pdb" "$(OUTPUT_DIR)\x64.Debug\wxmsw311ud_aui_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311ud_aui_vc100_x64.pdb"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Release\wxmsw30u_aui_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw30u_aui_vc100_x64.dll" "$(OUTPUT_DIR)\x64.Release\wxmsw311u_aui_vc100_x64.dll" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311u_aui_vc100_x64.dll"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"$(OUTPUT_DIR)\x64.Release\wxmsw30u_aui_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw30u_aui_vc100_x64.pdb" "$(OUTPUT_DIR)\x64.Release\wxmsw311u_aui_vc100_x64.pdb" : "$(WXWIN)\lib\vc100_x64_dll\wxmsw311u_aui_vc100_x64.pdb"
copy /y $** $@ > NUL copy /y $** $@ > NUL

2
README.md
View File

@ -16,7 +16,7 @@ https://www.amebis.si/prenos/ZRCola/
- _sed.exe_ and _grep.exe_ - _sed.exe_ and _grep.exe_
- Command line utilities from Microsoft Windows SDK Bin folder: distributed with Visual Studio, add Bin folder to path manually. - Command line utilities from Microsoft Windows SDK Bin folder: distributed with Visual Studio, add Bin folder to path manually.
- Additional command line utilities from project's bin folder: add bin folder to path. The source code is provided on request. - Additional command line utilities from project's bin folder: add bin folder to path. The source code is provided on request.
- wxWidgets 3.0 - set `WXWIN` environment variable to the folder where wxWidgets include and lib files are located. Official binary builds are required. - wxWidgets 3.1.1 - set `WXWIN` environment variable to the folder where wxWidgets include and lib files are located. Official binary builds are required.
### Digital Signing of Build Outputs ### Digital Signing of Build Outputs
In order to have the build process digitally sign output files, one should provide the following: In order to have the build process digitally sign output files, one should provide the following:

2
ZRCola/zrcolachrcatpnl.cpp
View File

@ -113,7 +113,7 @@ void wxZRColaCharacterCatalogPanel::OnGridKeyDown(wxKeyEvent& event)
case WXK_NUMPAD_ENTER: case WXK_NUMPAD_ENTER:
auto app = dynamic_cast<ZRColaApp*>(wxTheApp); auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
if (app->m_mainWnd) { if (app->m_mainWnd) {
app->m_mainWnd->m_panel->m_source->WriteText(m_grid->GetCellValue(m_grid->GetCursorRow(), m_grid->GetCursorColumn())); app->m_mainWnd->m_panel->m_source->WriteText(m_grid->GetCellValue(m_grid->GetGridCursorRow(), m_grid->GetGridCursorCol()));
app->m_mainWnd->m_panel->m_source->SetFocus(); app->m_mainWnd->m_panel->m_source->SetFocus();
event.StopPropagation(); event.StopPropagation();

6
ZRCola/zrcolachrslct.cpp
View File

@ -251,7 +251,7 @@ void wxZRColaCharSelect::OnIdle(wxIdleEvent& event)
if (m_unicode->GetValidator()->TransferFromWindow()) { if (m_unicode->GetValidator()->TransferFromWindow()) {
auto app = dynamic_cast<ZRColaApp*>(wxTheApp); auto app = dynamic_cast<ZRColaApp*>(wxTheApp);
m_gridPreview->SetCellValue(m_char, 0, 0); m_gridPreview->SetCellValue(0, 0, m_char);
std::unique_ptr<ZRCola::character_db::character> chr((ZRCola::character_db::character*)new char[sizeof(ZRCola::character_db::character) + sizeof(wchar_t)*m_char.length()]); std::unique_ptr<ZRCola::character_db::character> chr((ZRCola::character_db::character*)new char[sizeof(ZRCola::character_db::character) + sizeof(wchar_t)*m_char.length()]);
chr->ZRCola::character_db::character::character(m_char.data(), m_char.length()); chr->ZRCola::character_db::character::character(m_char.data(), m_char.length());
@ -489,7 +489,7 @@ void wxZRColaCharSelect::OnResultsKeyDown(wxKeyEvent& event)
switch (event.GetKeyCode()) { switch (event.GetKeyCode()) {
case WXK_RETURN: case WXK_RETURN:
case WXK_NUMPAD_ENTER: case WXK_NUMPAD_ENTER:
wxString val(m_gridResults->GetCellValue(m_gridResults->GetCursorRow(), m_gridResults->GetCursorColumn())); wxString val(m_gridResults->GetCellValue(m_gridResults->GetGridCursorRow(), m_gridResults->GetGridCursorCol()));
if (!val.IsEmpty()) { if (!val.IsEmpty()) {
NavigateTo(val); NavigateTo(val);
wxCommandEvent e(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK); wxCommandEvent e(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
@ -532,7 +532,7 @@ void wxZRColaCharSelect::OnRecentKeyDown(wxKeyEvent& event)
switch (event.GetKeyCode()) { switch (event.GetKeyCode()) {
case WXK_RETURN: case WXK_RETURN:
case WXK_NUMPAD_ENTER: case WXK_NUMPAD_ENTER:
wxString val(m_gridRecent->GetCellValue(m_gridRecent->GetCursorRow(), m_gridRecent->GetCursorColumn())); wxString val(m_gridRecent->GetCellValue(m_gridRecent->GetGridCursorRow(), m_gridRecent->GetGridCursorCol()));
if (!val.IsEmpty()) { if (!val.IsEmpty()) {
NavigateTo(val); NavigateTo(val);
wxCommandEvent e(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK); wxCommandEvent e(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);

18
ZRCola/zrcolafrm.cpp
View File

@ -152,7 +152,8 @@ wxZRColaFrame::wxZRColaFrame() :
SetAcceleratorTable(wxAcceleratorTable(_countof(entries), entries)); SetAcceleratorTable(wxAcceleratorTable(_countof(entries), entries));
} }
// Restore persistent state of wxAuiManager manually, since m_mgr is not on the heap. // Restore persistent state of wxAuiManager manually, since m_mgr is not a standalone heap object
// and cannot be registered for persistence.
wxPersistentAuiManager(&m_mgr).Restore(); wxPersistentAuiManager(&m_mgr).Restore();
wxPersistentRegisterAndRestore<wxZRColaFrame>(this); wxPersistentRegisterAndRestore<wxZRColaFrame>(this);
@ -184,6 +185,11 @@ wxZRColaFrame::~wxZRColaFrame()
UnregisterHotKey(wxZRColaHKID_INVOKE_TRANSLATE_INV); UnregisterHotKey(wxZRColaHKID_INVOKE_TRANSLATE_INV);
UnregisterHotKey(wxZRColaHKID_INVOKE_TRANSLATE ); UnregisterHotKey(wxZRColaHKID_INVOKE_TRANSLATE );
// Save wxAuiManager's state before destructor is finished.
// m_mgr is not a standalone heap object and is bound to wxZRColaFrame, which is being destroyed.
wxPersistentAuiManager(&m_mgr).Save();
wxPersistenceManager::Get().SaveAndUnregister(this);
#if defined(__WXMSW__) #if defined(__WXMSW__)
if (m_tfSource) { if (m_tfSource) {
m_tfSource->UnadviseSink(m_dwCookie); m_tfSource->UnadviseSink(m_dwCookie);
@ -198,16 +204,6 @@ wxZRColaFrame::~wxZRColaFrame()
} }
void wxZRColaFrame::OnClose(wxCloseEvent& event)
{
event.Skip();
// Save wxAuiManager's state before destructor.
// Since the destructor calls m_mgr.UnInit() the regular persistence mechanism is useless to save wxAuiManager's state.
wxPersistentAuiManager(&m_mgr).Save();
}
void wxZRColaFrame::OnExit(wxCommandEvent& event) void wxZRColaFrame::OnExit(wxCommandEvent& event)
{ {
Close(); Close();

1
ZRCola/zrcolafrm.h
View File

@ -68,7 +68,6 @@ public:
friend class wxZRColaComposerPanel; friend class wxZRColaComposerPanel;
protected: protected:
virtual void OnClose(wxCloseEvent& event);
void OnExit(wxCommandEvent& event); void OnExit(wxCommandEvent& event);
void OnForwardEventUpdate(wxUpdateUIEvent& event); void OnForwardEventUpdate(wxUpdateUIEvent& event);
void OnForwardEvent(wxCommandEvent& event); void OnForwardEvent(wxCommandEvent& event);

2
lib/wxExtend

@ -1 +1 @@
Subproject commit 732f180117928777a2cdd290ce6a4385ccfb1f5a Subproject commit 37eae89d67d882a5588a24b9f5a405359f797069