Fixed compiling problems
This commit is contained in:
parent
58291cd967
commit
bd98221642
|
@ -0,0 +1,235 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<?fileVersion 4.0.0?>
|
||||||
|
|
||||||
|
<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
|
||||||
|
<storageModule moduleId="org.eclipse.cdt.core.settings">
|
||||||
|
<cconfiguration id="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716">
|
||||||
|
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716" moduleId="org.eclipse.cdt.core.settings" name="Debug">
|
||||||
|
<externalSettings/>
|
||||||
|
<extensions>
|
||||||
|
<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
|
||||||
|
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
||||||
|
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
||||||
|
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
||||||
|
</extensions>
|
||||||
|
</storageModule>
|
||||||
|
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
|
||||||
|
<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716" name="Debug" parent="cdt.managedbuild.config.gnu.mingw.exe.debug" prebuildStep="windres.exe -i../src/xmlcopyeditor.rc -o../src/xmlcopyeditor.rc.o -IE:/wxWidgets/include">
|
||||||
|
<folderInfo id="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716." name="/" resourcePath="">
|
||||||
|
<toolChain id="cdt.managedbuild.toolchain.gnu.mingw.exe.debug.1964333246" name="MinGW GCC" superClass="cdt.managedbuild.toolchain.gnu.mingw.exe.debug">
|
||||||
|
<targetPlatform id="cdt.managedbuild.target.gnu.platform.mingw.exe.debug.1899344235" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.mingw.exe.debug"/>
|
||||||
|
<builder buildPath="${workspace_loc:/XmlCopyEditor/Debug}" id="cdt.managedbuild.tool.gnu.builder.mingw.base.1401964989" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" superClass="cdt.managedbuild.tool.gnu.builder.mingw.base"/>
|
||||||
|
<tool command="as" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" id="cdt.managedbuild.tool.gnu.assembler.mingw.exe.debug.155221793" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.exe.debug">
|
||||||
|
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.579522832" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
|
||||||
|
</tool>
|
||||||
|
<tool id="cdt.managedbuild.tool.gnu.archiver.mingw.base.1013091094" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.mingw.base"/>
|
||||||
|
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.debug.456794311" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.debug">
|
||||||
|
<option id="gnu.cpp.compiler.mingw.exe.debug.option.optimization.level.64661694" name="Optimization Level" superClass="gnu.cpp.compiler.mingw.exe.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
|
||||||
|
<option id="gnu.cpp.compiler.mingw.exe.debug.option.debugging.level.693304093" name="Debug Level" superClass="gnu.cpp.compiler.mingw.exe.debug.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
|
||||||
|
<option id="gnu.cpp.compiler.option.include.paths.334981297" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
|
||||||
|
<listOptionValue builtIn="false" value="${BOOSTINC}"/>
|
||||||
|
<listOptionValue builtIn="false" value="${WXWIDGETS}\include"/>
|
||||||
|
<listOptionValue builtIn="false" value="${WXWIDGETS}\lib\gcc_lib\mswud"/>
|
||||||
|
</option>
|
||||||
|
<option id="gnu.cpp.compiler.option.other.other.1952331323" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" value="-c -fmessage-length=0" valueType="string"/>
|
||||||
|
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.661812090" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
|
||||||
|
</tool>
|
||||||
|
<tool id="cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.debug.41071266" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.debug">
|
||||||
|
<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.mingw.exe.debug.option.optimization.level.249624915" name="Optimization Level" superClass="gnu.c.compiler.mingw.exe.debug.option.optimization.level" valueType="enumerated"/>
|
||||||
|
<option id="gnu.c.compiler.mingw.exe.debug.option.debugging.level.632444789" name="Debug Level" superClass="gnu.c.compiler.mingw.exe.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
|
||||||
|
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1588932778" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
|
||||||
|
</tool>
|
||||||
|
<tool id="cdt.managedbuild.tool.gnu.c.linker.mingw.exe.debug.1587046984" name="MinGW C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.exe.debug"/>
|
||||||
|
<tool id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.exe.debug.1828428568" name="MinGW C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.exe.debug">
|
||||||
|
<option id="gnu.cpp.link.option.libs.862743735" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs">
|
||||||
|
<listOptionValue builtIn="false" value="iconv"/>
|
||||||
|
<listOptionValue builtIn="false" value="xslt"/>
|
||||||
|
<listOptionValue builtIn="false" value="xml2"/>
|
||||||
|
<listOptionValue builtIn="false" value="pcre"/>
|
||||||
|
<listOptionValue builtIn="false" value="xerces-c"/>
|
||||||
|
<listOptionValue builtIn="false" value="aspell"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxmsw29ud_richtext"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxmsw29ud_html"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxmsw29ud_stc"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxmsw29ud_aui"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxmsw29ud_adv"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxmsw29ud_stc"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxmsw29ud_core"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxmsw29ud_richtext"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxbase29ud_xml"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxbase29ud_net"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxbase29ud"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxtiffd"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxjpegd"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxpngd"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxzlibd"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxregexud"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxexpatd"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxscintillad"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxregexud"/>
|
||||||
|
<listOptionValue builtIn="false" value="kernel32"/>
|
||||||
|
<listOptionValue builtIn="false" value="user32"/>
|
||||||
|
<listOptionValue builtIn="false" value="gdi32"/>
|
||||||
|
<listOptionValue builtIn="false" value="comdlg32"/>
|
||||||
|
<listOptionValue builtIn="false" value="winspool"/>
|
||||||
|
<listOptionValue builtIn="false" value="winmm"/>
|
||||||
|
<listOptionValue builtIn="false" value="shell32"/>
|
||||||
|
<listOptionValue builtIn="false" value="comctl32"/>
|
||||||
|
<listOptionValue builtIn="false" value="ole32"/>
|
||||||
|
<listOptionValue builtIn="false" value="oleaut32"/>
|
||||||
|
<listOptionValue builtIn="false" value="uuid"/>
|
||||||
|
<listOptionValue builtIn="false" value="rpcrt4"/>
|
||||||
|
<listOptionValue builtIn="false" value="advapi32"/>
|
||||||
|
<listOptionValue builtIn="false" value="wsock32"/>
|
||||||
|
<listOptionValue builtIn="false" value="expat"/>
|
||||||
|
<listOptionValue builtIn="false" value="pthread"/>
|
||||||
|
</option>
|
||||||
|
<option id="gnu.cpp.link.option.paths.1556491407" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths">
|
||||||
|
<listOptionValue builtIn="false" value="${WXWIDGETS}\lib\gcc_lib"/>
|
||||||
|
</option>
|
||||||
|
<option id="gnu.cpp.link.option.userobjs.598298270" name="Other objects" superClass="gnu.cpp.link.option.userobjs" valueType="userObjs">
|
||||||
|
<listOptionValue builtIn="false" value="src/xmlcopyeditor.rc.o"/>
|
||||||
|
</option>
|
||||||
|
<option id="gnu.cpp.link.option.flags.1824716786" name="Linker flags" superClass="gnu.cpp.link.option.flags" value="-mwindows" valueType="string"/>
|
||||||
|
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.405462048" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
|
||||||
|
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
|
||||||
|
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
|
||||||
|
</inputType>
|
||||||
|
</tool>
|
||||||
|
</toolChain>
|
||||||
|
</folderInfo>
|
||||||
|
</configuration>
|
||||||
|
</storageModule>
|
||||||
|
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
|
||||||
|
</cconfiguration>
|
||||||
|
<cconfiguration id="cdt.managedbuild.config.gnu.mingw.exe.release.710071756">
|
||||||
|
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.mingw.exe.release.710071756" moduleId="org.eclipse.cdt.core.settings" name="Release">
|
||||||
|
<externalSettings/>
|
||||||
|
<extensions>
|
||||||
|
<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
|
||||||
|
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
||||||
|
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
||||||
|
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
|
||||||
|
</extensions>
|
||||||
|
</storageModule>
|
||||||
|
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
|
||||||
|
<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.mingw.exe.release.710071756" name="Release" parent="cdt.managedbuild.config.gnu.mingw.exe.release" prebuildStep="windres.exe -i../src/xmlcopyeditor.rc -o../src/xmlcopyeditor.rc.o -IE:/wxWidgets/include">
|
||||||
|
<folderInfo id="cdt.managedbuild.config.gnu.mingw.exe.release.710071756." name="/" resourcePath="">
|
||||||
|
<toolChain id="cdt.managedbuild.toolchain.gnu.mingw.exe.release.1386364382" name="MinGW GCC" superClass="cdt.managedbuild.toolchain.gnu.mingw.exe.release">
|
||||||
|
<targetPlatform id="cdt.managedbuild.target.gnu.platform.mingw.exe.release.1941985969" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.mingw.exe.release"/>
|
||||||
|
<builder buildPath="${workspace_loc:/XmlCopyEditor/Release}" id="cdt.managedbuild.tool.gnu.builder.mingw.base.540651412" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" superClass="cdt.managedbuild.tool.gnu.builder.mingw.base"/>
|
||||||
|
<tool id="cdt.managedbuild.tool.gnu.assembler.mingw.exe.release.49927765" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.exe.release">
|
||||||
|
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1473544019" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
|
||||||
|
</tool>
|
||||||
|
<tool id="cdt.managedbuild.tool.gnu.archiver.mingw.base.839055893" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.mingw.base"/>
|
||||||
|
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.release.82491729" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.release">
|
||||||
|
<option id="gnu.cpp.compiler.mingw.exe.release.option.optimization.level.510905452" name="Optimization Level" superClass="gnu.cpp.compiler.mingw.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
|
||||||
|
<option id="gnu.cpp.compiler.mingw.exe.release.option.debugging.level.1567946828" name="Debug Level" superClass="gnu.cpp.compiler.mingw.exe.release.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
|
||||||
|
<option id="gnu.cpp.compiler.option.include.paths.1851942004" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
|
||||||
|
<listOptionValue builtIn="false" value="${BOOSTINC}"/>
|
||||||
|
<listOptionValue builtIn="false" value="${WXWIDGETS}\include"/>
|
||||||
|
<listOptionValue builtIn="false" value="${WXWIDGETS}\lib\gcc_lib\mswu"/>
|
||||||
|
</option>
|
||||||
|
<option id="gnu.cpp.compiler.option.other.other.1853611325" name="Other flags" superClass="gnu.cpp.compiler.option.other.other" value="-c -fmessage-length=0" valueType="string"/>
|
||||||
|
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.2060215918" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
|
||||||
|
</tool>
|
||||||
|
<tool id="cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.release.13558936" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.release">
|
||||||
|
<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.mingw.exe.release.option.optimization.level.509471261" name="Optimization Level" superClass="gnu.c.compiler.mingw.exe.release.option.optimization.level" valueType="enumerated"/>
|
||||||
|
<option id="gnu.c.compiler.mingw.exe.release.option.debugging.level.260963773" name="Debug Level" superClass="gnu.c.compiler.mingw.exe.release.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/>
|
||||||
|
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1117697168" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
|
||||||
|
</tool>
|
||||||
|
<tool id="cdt.managedbuild.tool.gnu.c.linker.mingw.exe.release.580131824" name="MinGW C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.exe.release"/>
|
||||||
|
<tool id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.exe.release.1322526705" name="MinGW C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.exe.release">
|
||||||
|
<option id="gnu.cpp.link.option.libs.1763201887" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs">
|
||||||
|
<listOptionValue builtIn="false" value="iconv"/>
|
||||||
|
<listOptionValue builtIn="false" value="xslt"/>
|
||||||
|
<listOptionValue builtIn="false" value="xml2"/>
|
||||||
|
<listOptionValue builtIn="false" value="pcre"/>
|
||||||
|
<listOptionValue builtIn="false" value="xerces-c"/>
|
||||||
|
<listOptionValue builtIn="false" value="aspell"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxmsw29u_richtext"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxmsw29u_html"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxmsw29u_stc"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxmsw29u_aui"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxmsw29u_adv"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxmsw29u_stc"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxmsw29u_core"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxmsw29u_richtext"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxbase29u_xml"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxbase29u_net"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxbase29u"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxtiff"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxjpeg"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxpng"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxzlib"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxregexu"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxexpat"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxscintilla"/>
|
||||||
|
<listOptionValue builtIn="false" value="wxregexu"/>
|
||||||
|
<listOptionValue builtIn="false" value="kernel32"/>
|
||||||
|
<listOptionValue builtIn="false" value="user32"/>
|
||||||
|
<listOptionValue builtIn="false" value="gdi32"/>
|
||||||
|
<listOptionValue builtIn="false" value="comdlg32"/>
|
||||||
|
<listOptionValue builtIn="false" value="winspool"/>
|
||||||
|
<listOptionValue builtIn="false" value="winmm"/>
|
||||||
|
<listOptionValue builtIn="false" value="shell32"/>
|
||||||
|
<listOptionValue builtIn="false" value="comctl32"/>
|
||||||
|
<listOptionValue builtIn="false" value="ole32"/>
|
||||||
|
<listOptionValue builtIn="false" value="oleaut32"/>
|
||||||
|
<listOptionValue builtIn="false" value="uuid"/>
|
||||||
|
<listOptionValue builtIn="false" value="rpcrt4"/>
|
||||||
|
<listOptionValue builtIn="false" value="advapi32"/>
|
||||||
|
<listOptionValue builtIn="false" value="wsock32"/>
|
||||||
|
<listOptionValue builtIn="false" value="expat"/>
|
||||||
|
<listOptionValue builtIn="false" value="pthread"/>
|
||||||
|
</option>
|
||||||
|
<option id="gnu.cpp.link.option.paths.161756907" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths" valueType="libPaths">
|
||||||
|
<listOptionValue builtIn="false" value="${WXWIDGETS}\lib\gcc_lib"/>
|
||||||
|
</option>
|
||||||
|
<option id="gnu.cpp.link.option.userobjs.30870315" name="Other objects" superClass="gnu.cpp.link.option.userobjs" valueType="userObjs">
|
||||||
|
<listOptionValue builtIn="false" value="src/xmlcopyeditor.rc.o"/>
|
||||||
|
</option>
|
||||||
|
<option id="gnu.cpp.link.option.flags.1247614174" name="Linker flags" superClass="gnu.cpp.link.option.flags" value="-mwindows" valueType="string"/>
|
||||||
|
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1542313773" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
|
||||||
|
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
|
||||||
|
<additionalInput kind="additionalinput" paths="$(LIBS)"/>
|
||||||
|
</inputType>
|
||||||
|
</tool>
|
||||||
|
</toolChain>
|
||||||
|
</folderInfo>
|
||||||
|
</configuration>
|
||||||
|
</storageModule>
|
||||||
|
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
|
||||||
|
</cconfiguration>
|
||||||
|
</storageModule>
|
||||||
|
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
|
||||||
|
<project id="XmlCopyEditor.cdt.managedbuild.target.gnu.mingw.exe.2139504035" name="Executable" projectType="cdt.managedbuild.target.gnu.mingw.exe"/>
|
||||||
|
</storageModule>
|
||||||
|
<storageModule moduleId="scannerConfiguration">
|
||||||
|
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
|
||||||
|
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.release.575104523;cdt.managedbuild.config.gnu.mingw.exe.release.575104523.;cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.release.1937852367;cdt.managedbuild.tool.gnu.c.compiler.input.665335209">
|
||||||
|
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
|
||||||
|
</scannerConfigBuildInfo>
|
||||||
|
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716;cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.;cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.debug.41071266;cdt.managedbuild.tool.gnu.c.compiler.input.1588932778">
|
||||||
|
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
|
||||||
|
</scannerConfigBuildInfo>
|
||||||
|
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.release.575104523;cdt.managedbuild.config.gnu.mingw.exe.release.575104523.;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.release.191196172;cdt.managedbuild.tool.gnu.cpp.compiler.input.419742796">
|
||||||
|
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
|
||||||
|
</scannerConfigBuildInfo>
|
||||||
|
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.debug.642144985;cdt.managedbuild.config.gnu.mingw.exe.debug.642144985.;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.debug.1091730963;cdt.managedbuild.tool.gnu.cpp.compiler.input.1451406980">
|
||||||
|
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
|
||||||
|
</scannerConfigBuildInfo>
|
||||||
|
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.release.710071756;cdt.managedbuild.config.gnu.mingw.exe.release.710071756.;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.release.82491729;cdt.managedbuild.tool.gnu.cpp.compiler.input.2060215918">
|
||||||
|
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
|
||||||
|
</scannerConfigBuildInfo>
|
||||||
|
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.release.710071756;cdt.managedbuild.config.gnu.mingw.exe.release.710071756.;cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.release.13558936;cdt.managedbuild.tool.gnu.c.compiler.input.1117697168">
|
||||||
|
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
|
||||||
|
</scannerConfigBuildInfo>
|
||||||
|
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.debug.642144985;cdt.managedbuild.config.gnu.mingw.exe.debug.642144985.;cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.debug.1552758885;cdt.managedbuild.tool.gnu.c.compiler.input.1174720994">
|
||||||
|
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
|
||||||
|
</scannerConfigBuildInfo>
|
||||||
|
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.debug.747771716;cdt.managedbuild.config.gnu.mingw.exe.debug.747771716.;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.debug.456794311;cdt.managedbuild.tool.gnu.cpp.compiler.input.661812090">
|
||||||
|
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
|
||||||
|
</scannerConfigBuildInfo>
|
||||||
|
</storageModule>
|
||||||
|
</cproject>
|
|
@ -0,0 +1,71 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<projectDescription>
|
||||||
|
<name>XmlCopyEditor</name>
|
||||||
|
<comment></comment>
|
||||||
|
<projects>
|
||||||
|
</projects>
|
||||||
|
<buildSpec>
|
||||||
|
<buildCommand>
|
||||||
|
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
|
||||||
|
<triggers>clean,full,incremental,</triggers>
|
||||||
|
<arguments>
|
||||||
|
<dictionary>
|
||||||
|
<key>?name?</key>
|
||||||
|
<value></value>
|
||||||
|
</dictionary>
|
||||||
|
<dictionary>
|
||||||
|
<key>org.eclipse.cdt.make.core.append_environment</key>
|
||||||
|
<value>true</value>
|
||||||
|
</dictionary>
|
||||||
|
<dictionary>
|
||||||
|
<key>org.eclipse.cdt.make.core.buildArguments</key>
|
||||||
|
<value></value>
|
||||||
|
</dictionary>
|
||||||
|
<dictionary>
|
||||||
|
<key>org.eclipse.cdt.make.core.buildCommand</key>
|
||||||
|
<value>make</value>
|
||||||
|
</dictionary>
|
||||||
|
<dictionary>
|
||||||
|
<key>org.eclipse.cdt.make.core.buildLocation</key>
|
||||||
|
<value>${workspace_loc:/XmlCopyEditor/Debug}</value>
|
||||||
|
</dictionary>
|
||||||
|
<dictionary>
|
||||||
|
<key>org.eclipse.cdt.make.core.contents</key>
|
||||||
|
<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
|
||||||
|
</dictionary>
|
||||||
|
<dictionary>
|
||||||
|
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
|
||||||
|
<value>false</value>
|
||||||
|
</dictionary>
|
||||||
|
<dictionary>
|
||||||
|
<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
|
||||||
|
<value>true</value>
|
||||||
|
</dictionary>
|
||||||
|
<dictionary>
|
||||||
|
<key>org.eclipse.cdt.make.core.enableFullBuild</key>
|
||||||
|
<value>true</value>
|
||||||
|
</dictionary>
|
||||||
|
<dictionary>
|
||||||
|
<key>org.eclipse.cdt.make.core.stopOnError</key>
|
||||||
|
<value>true</value>
|
||||||
|
</dictionary>
|
||||||
|
<dictionary>
|
||||||
|
<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
|
||||||
|
<value>true</value>
|
||||||
|
</dictionary>
|
||||||
|
</arguments>
|
||||||
|
</buildCommand>
|
||||||
|
<buildCommand>
|
||||||
|
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
|
||||||
|
<triggers>full,incremental,</triggers>
|
||||||
|
<arguments>
|
||||||
|
</arguments>
|
||||||
|
</buildCommand>
|
||||||
|
</buildSpec>
|
||||||
|
<natures>
|
||||||
|
<nature>org.eclipse.cdt.core.cnature</nature>
|
||||||
|
<nature>org.eclipse.cdt.core.ccnature</nature>
|
||||||
|
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
|
||||||
|
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
|
||||||
|
</natures>
|
||||||
|
</projectDescription>
|
|
@ -171,8 +171,12 @@ void AssociateDialog::OnBrowse ( wxCommandEvent& e )
|
||||||
_T ( "" ),
|
_T ( "" ),
|
||||||
_T ( "" ),
|
_T ( "" ),
|
||||||
extensionArgument,
|
extensionArgument,
|
||||||
|
#if wxCHECK_VERSION(2,9,2)
|
||||||
|
wxFD_OPEN | wxFD_FILE_MUST_EXIST | wxFD_CHANGE_DIR
|
||||||
|
#else
|
||||||
wxOPEN | wxFILE_MUST_EXIST | wxCHANGE_DIR
|
wxOPEN | wxFILE_MUST_EXIST | wxCHANGE_DIR
|
||||||
) );
|
#endif
|
||||||
|
) );
|
||||||
|
|
||||||
if ( fd->ShowModal() == wxID_OK )
|
if ( fd->ShowModal() == wxID_OK )
|
||||||
{
|
{
|
||||||
|
|
|
@ -158,7 +158,11 @@ void FindReplacePanel::OnReplace ( wxCommandEvent& event )
|
||||||
replaceEvent.SetFlags ( wxFR_DOWN );
|
replaceEvent.SetFlags ( wxFR_DOWN );
|
||||||
replaceEvent.SetFindString ( findEdit->GetValue() );
|
replaceEvent.SetFindString ( findEdit->GetValue() );
|
||||||
replaceEvent.SetReplaceString ( replaceEdit->GetValue() );
|
replaceEvent.SetReplaceString ( replaceEdit->GetValue() );
|
||||||
|
#if wxCHECK_VERSION(2,9,2)
|
||||||
|
parent->ProcessWindowEvent( replaceEvent );
|
||||||
|
#else
|
||||||
parent->ProcessEvent ( replaceEvent );
|
parent->ProcessEvent ( replaceEvent );
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void FindReplacePanel::OnReplaceAll ( wxCommandEvent& event )
|
void FindReplacePanel::OnReplaceAll ( wxCommandEvent& event )
|
||||||
|
@ -167,7 +171,11 @@ void FindReplacePanel::OnReplaceAll ( wxCommandEvent& event )
|
||||||
replaceAllEvent.SetFlags ( wxFR_DOWN );
|
replaceAllEvent.SetFlags ( wxFR_DOWN );
|
||||||
replaceAllEvent.SetFindString ( findEdit->GetValue() );
|
replaceAllEvent.SetFindString ( findEdit->GetValue() );
|
||||||
replaceAllEvent.SetReplaceString ( replaceEdit->GetValue() );
|
replaceAllEvent.SetReplaceString ( replaceEdit->GetValue() );
|
||||||
|
#if wxCHECK_VERSION(2,9,2)
|
||||||
|
parent->ProcessWindowEvent( replaceAllEvent );
|
||||||
|
#else
|
||||||
parent->ProcessEvent ( replaceAllEvent );
|
parent->ProcessEvent ( replaceAllEvent );
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void FindReplacePanel::focusOnFind()
|
void FindReplacePanel::focusOnFind()
|
||||||
|
@ -214,7 +222,11 @@ void FindReplacePanel::sendFindEvent ( size_t flags )
|
||||||
|
|
||||||
MyFrame *frame = ( MyFrame * ) parent;
|
MyFrame *frame = ( MyFrame * ) parent;
|
||||||
frame->setStrictScrolling ( true );
|
frame->setStrictScrolling ( true );
|
||||||
|
#if wxCHECK_VERSION(2,9,2)
|
||||||
|
frame->ProcessWindowEvent(findEvent);
|
||||||
|
#else
|
||||||
frame->ProcessEvent ( findEvent ); // was parent->
|
frame->ProcessEvent ( findEvent ); // was parent->
|
||||||
|
#endif
|
||||||
frame->setStrictScrolling ( false );
|
frame->setStrictScrolling ( false );
|
||||||
|
|
||||||
findData->SetFindString ( findEdit->GetValue() );
|
findData->SetFindString ( findEdit->GetValue() );
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <wx/intl.h>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include "housestyle.h"
|
#include "housestyle.h"
|
||||||
#include "readfile.h"
|
#include "readfile.h"
|
||||||
|
|
Binary file not shown.
After Width: | Height: | Size: 24 KiB |
Binary file not shown.
After Width: | Height: | Size: 11 KiB |
|
@ -17,6 +17,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <wx/intl.h>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
|
|
|
@ -110,7 +110,11 @@ bool WrapDaisy::run (
|
||||||
if ( !stdStylesheet.empty() ) // stylesheet found
|
if ( !stdStylesheet.empty() ) // stylesheet found
|
||||||
{
|
{
|
||||||
// #1: convert to canonical XHTML
|
// #1: convert to canonical XHTML
|
||||||
pd->ProcessPendingEvents();
|
#if wxCHECK_VERSION(2,9,2)
|
||||||
|
pd->GetEventHandler()->ProcessPendingEvents();
|
||||||
|
#else
|
||||||
|
pd->ProcessPendingEvents();
|
||||||
|
#endif
|
||||||
while (wxTheApp->Pending())
|
while (wxTheApp->Pending())
|
||||||
wxTheApp->Dispatch();
|
wxTheApp->Dispatch();
|
||||||
|
|
||||||
|
@ -152,7 +156,11 @@ bool WrapDaisy::run (
|
||||||
|
|
||||||
if ( suppressOptional )
|
if ( suppressOptional )
|
||||||
{
|
{
|
||||||
pd->ProcessPendingEvents();
|
#if wxCHECK_VERSION(2,9,2)
|
||||||
|
pd->GetEventHandler()->ProcessPendingEvents();
|
||||||
|
#else
|
||||||
|
pd->ProcessPendingEvents();
|
||||||
|
#endif
|
||||||
while (wxTheApp->Pending())
|
while (wxTheApp->Pending())
|
||||||
wxTheApp->Dispatch();
|
wxTheApp->Dispatch();
|
||||||
if ( !pd->Update ( 15, _("Suppressing optional production notes...") ) )
|
if ( !pd->Update ( 15, _("Suppressing optional production notes...") ) )
|
||||||
|
@ -175,7 +183,11 @@ bool WrapDaisy::run (
|
||||||
if ( quiet )
|
if ( quiet )
|
||||||
{
|
{
|
||||||
// #1.5: apply quiet setting if req'd
|
// #1.5: apply quiet setting if req'd
|
||||||
pd->ProcessPendingEvents();
|
#if wxCHECK_VERSION(2,9,2)
|
||||||
|
pd->GetEventHandler()->ProcessPendingEvents();
|
||||||
|
#else
|
||||||
|
pd->ProcessPendingEvents();
|
||||||
|
#endif
|
||||||
while (wxTheApp->Pending())
|
while (wxTheApp->Pending())
|
||||||
wxTheApp->Dispatch();
|
wxTheApp->Dispatch();
|
||||||
if ( !pd->Update ( 20, _("De-emphasizing production notes...") ) )
|
if ( !pd->Update ( 20, _("De-emphasizing production notes...") ) )
|
||||||
|
@ -257,7 +269,11 @@ bool WrapDaisy::run (
|
||||||
}
|
}
|
||||||
|
|
||||||
// copy images
|
// copy images
|
||||||
pd->ProcessPendingEvents();
|
#if wxCHECK_VERSION(2,9,2)
|
||||||
|
pd->GetEventHandler()->ProcessPendingEvents();
|
||||||
|
#else
|
||||||
|
pd->ProcessPendingEvents();
|
||||||
|
#endif
|
||||||
while (wxTheApp->Pending())
|
while (wxTheApp->Pending())
|
||||||
wxTheApp->Dispatch();
|
wxTheApp->Dispatch();
|
||||||
|
|
||||||
|
@ -292,7 +308,11 @@ bool WrapDaisy::run (
|
||||||
canonicalStream.close();
|
canonicalStream.close();
|
||||||
|
|
||||||
// #2: convert to DTBook
|
// #2: convert to DTBook
|
||||||
pd->ProcessPendingEvents();
|
#if wxCHECK_VERSION(2,9,2)
|
||||||
|
pd->GetEventHandler()->ProcessPendingEvents();
|
||||||
|
#else
|
||||||
|
pd->ProcessPendingEvents();
|
||||||
|
#endif
|
||||||
while (wxTheApp->Pending())
|
while (wxTheApp->Pending())
|
||||||
wxTheApp->Dispatch();
|
wxTheApp->Dispatch();
|
||||||
|
|
||||||
|
@ -345,7 +365,11 @@ bool WrapDaisy::run (
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
// #2.5: create ePub version
|
// #2.5: create ePub version
|
||||||
pd->ProcessPendingEvents();
|
#if wxCHECK_VERSION(2,9,2)
|
||||||
|
pd->GetEventHandler()->ProcessPendingEvents();
|
||||||
|
#else
|
||||||
|
pd->ProcessPendingEvents();
|
||||||
|
#endif
|
||||||
while (wxTheApp->Pending())
|
while (wxTheApp->Pending())
|
||||||
wxTheApp->Dispatch();
|
wxTheApp->Dispatch();
|
||||||
|
|
||||||
|
@ -404,7 +428,11 @@ bool WrapDaisy::run (
|
||||||
// #2.9: convert to RTF
|
// #2.9: convert to RTF
|
||||||
if ( rtf || doc )
|
if ( rtf || doc )
|
||||||
{
|
{
|
||||||
pd->ProcessPendingEvents();
|
#if wxCHECK_VERSION(2,9,2)
|
||||||
|
pd->GetEventHandler()->ProcessPendingEvents();
|
||||||
|
#else
|
||||||
|
pd->ProcessPendingEvents();
|
||||||
|
#endif
|
||||||
while (wxTheApp->Pending())
|
while (wxTheApp->Pending())
|
||||||
wxTheApp->Dispatch();
|
wxTheApp->Dispatch();
|
||||||
|
|
||||||
|
@ -470,7 +498,11 @@ bool WrapDaisy::run (
|
||||||
// #2.9.5: convert to binary Word
|
// #2.9.5: convert to binary Word
|
||||||
// (Win only; otherwise create copy with *.doc extension)
|
// (Win only; otherwise create copy with *.doc extension)
|
||||||
|
|
||||||
pd->ProcessPendingEvents();
|
#if wxCHECK_VERSION(2,9,2)
|
||||||
|
pd->GetEventHandler()->ProcessPendingEvents();
|
||||||
|
#else
|
||||||
|
pd->ProcessPendingEvents();
|
||||||
|
#endif
|
||||||
while (wxTheApp->Pending())
|
while (wxTheApp->Pending())
|
||||||
wxTheApp->Dispatch();
|
wxTheApp->Dispatch();
|
||||||
|
|
||||||
|
@ -521,7 +553,11 @@ bool WrapDaisy::run (
|
||||||
}
|
}
|
||||||
|
|
||||||
// #3: convert to full DAISY book
|
// #3: convert to full DAISY book
|
||||||
pd->ProcessPendingEvents();
|
#if wxCHECK_VERSION(2,9,2)
|
||||||
|
pd->GetEventHandler()->ProcessPendingEvents();
|
||||||
|
#else
|
||||||
|
pd->ProcessPendingEvents();
|
||||||
|
#endif
|
||||||
while (wxTheApp->Pending())
|
while (wxTheApp->Pending())
|
||||||
wxTheApp->Dispatch();
|
wxTheApp->Dispatch();
|
||||||
|
|
||||||
|
@ -583,7 +619,11 @@ bool WrapDaisy::run (
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
// #4: create MP3 album
|
// #4: create MP3 album
|
||||||
pd->ProcessPendingEvents();
|
#if wxCHECK_VERSION(2,9,2)
|
||||||
|
pd->GetEventHandler()->ProcessPendingEvents();
|
||||||
|
#else
|
||||||
|
pd->ProcessPendingEvents();
|
||||||
|
#endif
|
||||||
while (wxTheApp->Pending())
|
while (wxTheApp->Pending())
|
||||||
wxTheApp->Dispatch();
|
wxTheApp->Dispatch();
|
||||||
|
|
||||||
|
@ -660,7 +700,11 @@ bool WrapDaisy::run (
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
|
||||||
pd->ProcessPendingEvents();
|
#if wxCHECK_VERSION(2,9,2)
|
||||||
|
pd->GetEventHandler()->ProcessPendingEvents();
|
||||||
|
#else
|
||||||
|
pd->ProcessPendingEvents();
|
||||||
|
#endif
|
||||||
while (wxTheApp->Pending())
|
while (wxTheApp->Pending())
|
||||||
wxTheApp->Dispatch();
|
wxTheApp->Dispatch();
|
||||||
|
|
||||||
|
|
|
@ -197,7 +197,7 @@ MyApp::MyApp() : checker ( NULL ), server ( NULL ), connection ( NULL ),
|
||||||
int fdnull = open ( "/dev/null", O_WRONLY, 0 );
|
int fdnull = open ( "/dev/null", O_WRONLY, 0 );
|
||||||
dup2 ( fdnull, STDERR_FILENO );
|
dup2 ( fdnull, STDERR_FILENO );
|
||||||
#endif
|
#endif
|
||||||
myLocale.Init();
|
//myLocale.Init();
|
||||||
int systemLocale = myLocale.GetSystemLanguage();
|
int systemLocale = myLocale.GetSystemLanguage();
|
||||||
switch ( systemLocale )
|
switch ( systemLocale )
|
||||||
{
|
{
|
||||||
|
@ -338,7 +338,11 @@ bool MyApp::OnInit()
|
||||||
wxString argument, what;
|
wxString argument, what;
|
||||||
wxChar *whatBuffer;
|
wxChar *whatBuffer;
|
||||||
what = _T ( "Data" );
|
what = _T ( "Data" );
|
||||||
|
#if wxCHECK_VERSION(2,9,2)
|
||||||
|
whatBuffer = (wxChar *)what.wchar_str();
|
||||||
|
#else
|
||||||
whatBuffer = (wxChar *)what.c_str();
|
whatBuffer = (wxChar *)what.c_str();
|
||||||
|
#endif
|
||||||
if ( this->argc > 1 )
|
if ( this->argc > 1 )
|
||||||
{
|
{
|
||||||
for ( int i = 1; i < this->argc; i++ )
|
for ( int i = 1; i < this->argc; i++ )
|
||||||
|
@ -2055,8 +2059,12 @@ void MyFrame::OnImportMSWord ( wxCommandEvent& event )
|
||||||
_T ( "" ),
|
_T ( "" ),
|
||||||
_T ( "" ),
|
_T ( "" ),
|
||||||
_T ( "Microsoft Word (*.doc)|*.doc" ),
|
_T ( "Microsoft Word (*.doc)|*.doc" ),
|
||||||
|
#if wxCHECK_VERSION(2,9,2)
|
||||||
|
wxFD_OPEN | wxFD_FILE_MUST_EXIST | wxFD_CHANGE_DIR
|
||||||
|
#else
|
||||||
wxOPEN | wxFILE_MUST_EXIST | wxCHANGE_DIR
|
wxOPEN | wxFILE_MUST_EXIST | wxCHANGE_DIR
|
||||||
) );
|
#endif
|
||||||
|
) );
|
||||||
if ( fd->ShowModal() == wxID_CANCEL )
|
if ( fd->ShowModal() == wxID_CANCEL )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -2280,7 +2288,11 @@ void MyFrame::OnExportMSWord ( wxCommandEvent& event )
|
||||||
_T ( "" ),
|
_T ( "" ),
|
||||||
_T ( "" ),
|
_T ( "" ),
|
||||||
_T ( "Microsoft Word (*.doc)|*.doc" ),
|
_T ( "Microsoft Word (*.doc)|*.doc" ),
|
||||||
|
#if wxCHECK_VERSION(2,9,2)
|
||||||
|
wxFD_SAVE | wxFD_OVERWRITE_PROMPT));
|
||||||
|
#else
|
||||||
wxSAVE | wxOVERWRITE_PROMPT ) );
|
wxSAVE | wxOVERWRITE_PROMPT ) );
|
||||||
|
#endif
|
||||||
fd->ShowModal();
|
fd->ShowModal();
|
||||||
|
|
||||||
wxString path = fd->GetPath();
|
wxString path = fd->GetPath();
|
||||||
|
@ -2891,8 +2903,12 @@ void MyFrame::OnOpen ( wxCommandEvent& event )
|
||||||
defaultDir,
|
defaultDir,
|
||||||
wxEmptyString,
|
wxEmptyString,
|
||||||
FILE_FILTER,
|
FILE_FILTER,
|
||||||
|
#if wxCHECK_VERSION(2,9,2)
|
||||||
|
wxFD_OPEN | wxFD_MULTIPLE | wxFD_FILE_MUST_EXIST | wxFD_CHANGE_DIR
|
||||||
|
#else
|
||||||
wxOPEN | wxMULTIPLE | wxFILE_MUST_EXIST | wxCHANGE_DIR
|
wxOPEN | wxMULTIPLE | wxFILE_MUST_EXIST | wxCHANGE_DIR
|
||||||
);
|
#endif
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
if ( fd->ShowModal() == wxID_CANCEL )
|
if ( fd->ShowModal() == wxID_CANCEL )
|
||||||
|
@ -3122,7 +3138,7 @@ bool MyFrame::openFile ( wxString& fileName, bool largeFile )
|
||||||
|
|
||||||
nconv = iconv (
|
nconv = iconv (
|
||||||
cd,
|
cd,
|
||||||
#ifdef __WXMSW__
|
#if defined(__WXMSW__) && !wxCHECK_VERSION(2,9,2)
|
||||||
( const char ** )
|
( const char ** )
|
||||||
#endif
|
#endif
|
||||||
&docBuffer,
|
&docBuffer,
|
||||||
|
@ -3517,7 +3533,11 @@ void MyFrame::saveAs()
|
||||||
defaultDir,
|
defaultDir,
|
||||||
defaultFile,
|
defaultFile,
|
||||||
FILE_FILTER,
|
FILE_FILTER,
|
||||||
|
#if wxCHECK_VERSION(2,9,2)
|
||||||
|
wxFD_SAVE | wxFD_OVERWRITE_PROMPT ) );
|
||||||
|
#else
|
||||||
wxSAVE | wxOVERWRITE_PROMPT ) );
|
wxSAVE | wxOVERWRITE_PROMPT ) );
|
||||||
|
#endif
|
||||||
if ( fd->ShowModal() == wxID_CANCEL )
|
if ( fd->ShowModal() == wxID_CANCEL )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -4737,7 +4757,7 @@ bool MyFrame::saveFile ( XmlDoc *doc, wxString& fileName, bool checkLastModified
|
||||||
finalBuffer = iconvBuffer; // iconvBuffer will be incremented by iconv
|
finalBuffer = iconvBuffer; // iconvBuffer will be incremented by iconv
|
||||||
size_t nconv;
|
size_t nconv;
|
||||||
|
|
||||||
#ifdef __WXMSW__
|
#if defined(__WXMSW__) && !wxCHECK_VERSION(2,9,2)
|
||||||
const char *
|
const char *
|
||||||
#else
|
#else
|
||||||
char *
|
char *
|
||||||
|
@ -4748,7 +4768,7 @@ bool MyFrame::saveFile ( XmlDoc *doc, wxString& fileName, bool checkLastModified
|
||||||
|
|
||||||
nconv = iconv (
|
nconv = iconv (
|
||||||
cd,
|
cd,
|
||||||
#ifdef __WXMSW__
|
#if defined(__WXMSW__) && !wxCHECK_VERSION(2,9,2)
|
||||||
( const char ** )
|
( const char ** )
|
||||||
#endif
|
#endif
|
||||||
&utf8BufferPtr,
|
&utf8BufferPtr,
|
||||||
|
@ -6141,7 +6161,11 @@ void MyFrame::OnActivateApp ( wxActivateEvent& event )
|
||||||
void MyFrame::OnIconize ( wxIconizeEvent& event )
|
void MyFrame::OnIconize ( wxIconizeEvent& event )
|
||||||
{
|
{
|
||||||
event.Skip();
|
event.Skip();
|
||||||
|
#if wxCHECK_VERSION(2,9,2)
|
||||||
|
if (event.IsIconized())
|
||||||
|
#else
|
||||||
if ( event.Iconized() )
|
if ( event.Iconized() )
|
||||||
|
#endif
|
||||||
return;
|
return;
|
||||||
restoreFocusToNotebook = true;
|
restoreFocusToNotebook = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,134 @@
|
||||||
|
//////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
// Generated from the TEXTINCLUDE 1 resource.
|
||||||
|
//
|
||||||
|
|
||||||
|
//
|
||||||
|
//////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
|
||||||
|
//////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
// Generated from the TEXTINCLUDE 2 resource.
|
||||||
|
//
|
||||||
|
|
||||||
|
#define APSTUDIO_READONLY_SYMBOLS
|
||||||
|
#define APSTUDIO_HIDDEN_SYMBOLS
|
||||||
|
#include <wx/msw/wx.rc>
|
||||||
|
#undef APSTUDIO_HIDDEN_SYMBOLS
|
||||||
|
|
||||||
|
#undef APSTUDIO_READONLY_SYMBOLS
|
||||||
|
//
|
||||||
|
//////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
|
||||||
|
//////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
// Additional include files
|
||||||
|
//
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
// English (United States) resources
|
||||||
|
//
|
||||||
|
|
||||||
|
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
|
||||||
|
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
||||||
|
|
||||||
|
//////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
// BITMAP : Bitmap
|
||||||
|
//
|
||||||
|
|
||||||
|
stock_calc-accept BITMAP "png/stock_calc-accept.bmp"
|
||||||
|
stock_calc-accept-green BITMAP "png/stock_calc-accept-green.bmp"
|
||||||
|
stock_copy_16 BITMAP "png/stock_copy-16.bmp"
|
||||||
|
stock_cut_16 BITMAP "png/stock_cut-16.bmp"
|
||||||
|
stock_filters BITMAP "png/stock_filters.bmp"
|
||||||
|
stock_help_16 BITMAP "png/stock_help-16.bmp"
|
||||||
|
stock_hyperlink BITMAP "png/stock_hyperlink.bmp"
|
||||||
|
stock_internet BITMAP "png/stock_internet.bmp"
|
||||||
|
stock_internet_16 BITMAP "png/stock_internet-16.bmp"
|
||||||
|
stock_new BITMAP "png/stock_new.bmp"
|
||||||
|
stock_new_16 BITMAP "png/stock_new-16.bmp"
|
||||||
|
stock_open BITMAP "png/stock_open.bmp"
|
||||||
|
stock_open_16 BITMAP "png/stock_open-16.bmp"
|
||||||
|
stock_paste_16 BITMAP "png/stock_paste-16.bmp"
|
||||||
|
stock_print BITMAP "png/stock_print.bmp"
|
||||||
|
stock_print_16 BITMAP "png/stock_print-16.bmp"
|
||||||
|
stock_print_preview_16 BITMAP "png/stock_print-preview-16.bmp"
|
||||||
|
stock_redo_16 BITMAP "png/stock_redo-16.bmp"
|
||||||
|
stock_save BITMAP "png/stock_save.bmp"
|
||||||
|
stock_save_16 BITMAP "png/stock_save-16.bmp"
|
||||||
|
stock_search_16 BITMAP "png/stock_search-16.bmp"
|
||||||
|
stock_spellcheck BITMAP "png/stock_spellcheck.bmp"
|
||||||
|
stock_spellcheck_16 BITMAP "png/stock_spellcheck-16.bmp"
|
||||||
|
stock_undo_16 BITMAP "png/stock_undo-16.bmp"
|
||||||
|
|
||||||
|
//////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
// MENUEX : Menu
|
||||||
|
//
|
||||||
|
|
||||||
|
|
||||||
|
//////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
// CURSOR : Cursor
|
||||||
|
//
|
||||||
|
|
||||||
|
|
||||||
|
//////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
// ICON : Icon
|
||||||
|
//
|
||||||
|
|
||||||
|
appicon ICON "res/appicon.ico"
|
||||||
|
appicondoc ICON "res/appicondoc.ico"
|
||||||
|
|
||||||
|
#endif // English (United States) resources
|
||||||
|
//////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
// RT_MANIFEST : Manifest
|
||||||
|
//
|
||||||
|
// Already taken care of by wxWidgets
|
||||||
|
|
||||||
|
#ifdef APSTUDIO_INVOKED
|
||||||
|
|
||||||
|
//////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
// TEXTINCLUDE
|
||||||
|
//
|
||||||
|
|
||||||
|
1 TEXTINCLUDE
|
||||||
|
BEGIN
|
||||||
|
"\0"
|
||||||
|
END
|
||||||
|
|
||||||
|
2 TEXTINCLUDE
|
||||||
|
BEGIN
|
||||||
|
"#define APSTUDIO_HIDDEN_SYMBOLS\r\n",
|
||||||
|
"#include <wx/msw/wx.rc>\r\n",
|
||||||
|
"#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
|
||||||
|
END
|
||||||
|
|
||||||
|
3 TEXTINCLUDE
|
||||||
|
BEGIN
|
||||||
|
"\0"
|
||||||
|
END
|
||||||
|
|
||||||
|
#endif // APSTUDIO_INVOKED
|
||||||
|
|
||||||
|
|
||||||
|
//////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
// Generated from the TEXTINCLUDE 3 resource.
|
||||||
|
//
|
||||||
|
|
||||||
|
#ifndef APSTUDIO_INVOKED
|
||||||
|
|
||||||
|
#endif // not APSTUDIO_INVOKED
|
||||||
|
//
|
||||||
|
//////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <cstring>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
#include <expat.h>
|
#include <expat.h>
|
||||||
|
|
Loading…
Reference in New Issue