summaryrefslogtreecommitdiff
path: root/support/dktools/DkWxAppHelper.cpp
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-09-20 03:03:26 +0000
committerNorbert Preining <norbert@preining.info>2020-09-20 03:03:26 +0000
commit1f457376b478257b88d4a857f5ec1b6155442dd7 (patch)
tree2a06a60551dea362cf8cb0cb0ba66c78608717c4 /support/dktools/DkWxAppHelper.cpp
parentac690ca29ad5bf8a5203a65fd6252f7b564f4727 (diff)
CTAN sync 202009200303
Diffstat (limited to 'support/dktools/DkWxAppHelper.cpp')
-rw-r--r--support/dktools/DkWxAppHelper.cpp307
1 files changed, 137 insertions, 170 deletions
diff --git a/support/dktools/DkWxAppHelper.cpp b/support/dktools/DkWxAppHelper.cpp
index 46e65d4b04..a3d694fc6b 100644
--- a/support/dktools/DkWxAppHelper.cpp
+++ b/support/dktools/DkWxAppHelper.cpp
@@ -1,43 +1,21 @@
/*
- WARNING: This file was generated by dkct.
- Changes you make here will be lost if dkct is run again!
- You should modify the original source and run dkct on it.
- Original source: DkWxAppHelper.cpt
+Copyright (C) 2011-2020, Dirk Krause
+SPDX-License-Identifier: BSD-3-Clause
*/
/*
-Copyright (C) 2011-2017, Dirk Krause
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above opyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-* Neither the name of the author nor the names of contributors may be used
- to endorse or promote products derived from this software without specific
- prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ WARNING: This file was generated by the dkct program (see
+ http://dktools.sourceforge.net/ for details).
+ Changes you make here will be lost if dkct is run again!
+ You should modify the original source and run dkct on it.
+ Original source: DkWxAppHelper.cpt
*/
/** @file DkWxAppHelper.cpp The DkWxAppHelper module.
*/
-#line 334 "DkWxAppHelper.cpt"
+#line 345 "DkWxAppHelper.cpt"
#include <dk3all.h>
@@ -50,7 +28,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#line 345 "DkWxAppHelper.cpt"
+#line 356 "DkWxAppHelper.cpt"
@@ -69,21 +47,6 @@ typedef struct {
typedef wxChar const *wxConstPtr;
-
-/** Error codes.
-*/
-enum {
- /** No error occured.
- */
- ERROR_NONE = 0,
-
- /** Failed to encode arg0 to dkChar.
- */
- ERROR_ENCODE_ARG0 ,
-};
-
-
-
/** Basic texts issued by wxWidgets applications.
*/
static wxChar const * const dkwxapphelper_defwxappstr[] = {
@@ -129,7 +92,7 @@ wxT("Failed to recode command line!"),
NULL
-#line 435 "DkWxAppHelper.cpt"
+#line 431 "DkWxAppHelper.cpt"
};
@@ -196,17 +159,17 @@ dkwxah_string_table_close(DkAppHelperWxStringTable *p)
size_t i;
-#line 500 "DkWxAppHelper.cpt"
+#line 496 "DkWxAppHelper.cpt"
if(p) {
if(p->array) {
if(p->nelem) {
-#line 503 "DkWxAppHelper.cpt"
+#line 499 "DkWxAppHelper.cpt"
ptr = p->array;
for(i = 0; i < p->nelem; i++) {
if(*ptr) {
-#line 506 "DkWxAppHelper.cpt"
+#line 502 "DkWxAppHelper.cpt"
}
dk3_release(*ptr);
ptr++;
@@ -218,7 +181,7 @@ dkwxah_string_table_close(DkAppHelperWxStringTable *p)
dk3_delete(p);
}
-#line 516 "DkWxAppHelper.cpt"
+#line 512 "DkWxAppHelper.cpt"
}
@@ -259,7 +222,7 @@ DkWxAppHelper::DkWxAppHelper(
wxChar const * const *ptrGetNumBasicStrings;
-#line 555 "DkWxAppHelper.cpt"
+#line 551 "DkWxAppHelper.cpt"
newargv[0] = NULL;
app = NULL;
sStringTables = NULL;
@@ -371,7 +334,7 @@ DkWxAppHelper::DkWxAppHelper(
reportProblemsIfAny();
-#line 665 "DkWxAppHelper.cpt"
+#line 661 "DkWxAppHelper.cpt"
}
@@ -380,7 +343,7 @@ DkWxAppHelper::~DkWxAppHelper()
{
-#line 672 "DkWxAppHelper.cpt"
+#line 668 "DkWxAppHelper.cpt"
DkAppHelperWxStringTable *e;
basicStrings = NULL;
if(sStringTables) {
@@ -404,7 +367,7 @@ DkWxAppHelper::~DkWxAppHelper()
dk3_release(vendorName);
-#line 694 "DkWxAppHelper.cpt"
+#line 690 "DkWxAppHelper.cpt"
}
@@ -415,52 +378,52 @@ DkWxAppHelper::checkSetup() const
int back = 0;
-#line 703 "DkWxAppHelper.cpt"
+#line 699 "DkWxAppHelper.cpt"
if(app) {
-#line 704 "DkWxAppHelper.cpt"
+#line 700 "DkWxAppHelper.cpt"
if(sStringTables) {
-#line 705 "DkWxAppHelper.cpt"
+#line 701 "DkWxAppHelper.cpt"
if(iStringTables) {
-#line 706 "DkWxAppHelper.cpt"
+#line 702 "DkWxAppHelper.cpt"
if(cmdName) {
-#line 707 "DkWxAppHelper.cpt"
+#line 703 "DkWxAppHelper.cpt"
if(appName) {
-#line 708 "DkWxAppHelper.cpt"
+#line 704 "DkWxAppHelper.cpt"
if(vendorName) {
-#line 709 "DkWxAppHelper.cpt"
+#line 705 "DkWxAppHelper.cpt"
back = 1;
} else {
-#line 711 "DkWxAppHelper.cpt"
+#line 707 "DkWxAppHelper.cpt"
}
} else {
-#line 713 "DkWxAppHelper.cpt"
+#line 709 "DkWxAppHelper.cpt"
}
} else {
-#line 715 "DkWxAppHelper.cpt"
+#line 711 "DkWxAppHelper.cpt"
}
} else {
-#line 717 "DkWxAppHelper.cpt"
+#line 713 "DkWxAppHelper.cpt"
}
} else {
-#line 719 "DkWxAppHelper.cpt"
+#line 715 "DkWxAppHelper.cpt"
}
} else {
-#line 721 "DkWxAppHelper.cpt"
+#line 717 "DkWxAppHelper.cpt"
}
-#line 722 "DkWxAppHelper.cpt"
+#line 718 "DkWxAppHelper.cpt"
return back;
}
@@ -493,52 +456,52 @@ DkWxAppHelper::getStringTable(
-#line 753 "DkWxAppHelper.cpt"
+#line 749 "DkWxAppHelper.cpt"
if((dt) && (tn)) {
-#line 754 "DkWxAppHelper.cpt"
+#line 750 "DkWxAppHelper.cpt"
if(checkSetup()) {
-#line 755 "DkWxAppHelper.cpt"
+#line 751 "DkWxAppHelper.cpt"
tp = (DkAppHelperWxStringTable *)dk3sto_it_find_like(
iStringTables, (void *)tn, 1
);
if(!(tp)) {
-#line 759 "DkWxAppHelper.cpt"
+#line 755 "DkWxAppHelper.cpt"
if(dk3app_find_data_file(app, tn, fnb, DK3_SIZEOF(fnb,dkChar))) {
-#line 760 "DkWxAppHelper.cpt"
+#line 756 "DkWxAppHelper.cpt"
fipo = dk3sf_fopen_app(fnb, dk3app_not_localized(22), app);
if(fipo) {
-#line 762 "DkWxAppHelper.cpt"
+#line 758 "DkWxAppHelper.cpt"
wxptr = (wxChar const **)dt; nelem = 0;
while(*(wxptr++)) { nelem++; }
if(nelem) {
-#line 765 "DkWxAppHelper.cpt"
+#line 761 "DkWxAppHelper.cpt"
tp = dk3_new_app(DkAppHelperWxStringTable,1,app);
if(tp) {
-#line 767 "DkWxAppHelper.cpt"
+#line 763 "DkWxAppHelper.cpt"
ok = 0;
tp->array = NULL;
tp->nelem = nelem;
tp->name = dk3str_dup_app(tn, app);
if(tp->name) {
-#line 772 "DkWxAppHelper.cpt"
+#line 768 "DkWxAppHelper.cpt"
tp->array = dk3_new_app(wxConstPtr,nelem,app);
if(tp->array) {
-#line 774 "DkWxAppHelper.cpt"
+#line 770 "DkWxAppHelper.cpt"
wxptr = tp->array;
tp->nelem = nelem;
for(i = 0; i < nelem; i++) { *(wxptr++) = NULL; }
if(dk3sto_add(sStringTables, (void *)tp)) {
-#line 778 "DkWxAppHelper.cpt"
+#line 774 "DkWxAppHelper.cpt"
ok = 1;
oldsource = dk3app_get_source_file(app);
oldline = dk3app_get_source_line(app);
@@ -548,23 +511,23 @@ DkWxAppHelper::getStringTable(
wxptr = tp->array; nelem = 0;
do {
-#line 786 "DkWxAppHelper.cpt"
+#line 782 "DkWxAppHelper.cpt"
cc = 0;
if(fgets(il, sizeof(il), fipo)) {
-#line 788 "DkWxAppHelper.cpt"
+#line 784 "DkWxAppHelper.cpt"
dk3app_set_source_line(app, ++lineno);
cc = 1;
if(il[0] != '#') {
-#line 791 "DkWxAppHelper.cpt"
+#line 787 "DkWxAppHelper.cpt"
dk3app_squeeze_line(il);
if(dk3wxs_from_utf8(wxb,DK3_SIZEOF(wxb,wxChar),il))
{
*wxptr = dk3wxs_dup_app(wxb, app);
if(!(*wxptr)) {
-#line 796 "DkWxAppHelper.cpt"
+#line 792 "DkWxAppHelper.cpt"
ok = 0;
}
wxptr++;
@@ -573,16 +536,16 @@ DkWxAppHelper::getStringTable(
{
ok = 0;
-#line 803 "DkWxAppHelper.cpt"
+#line 799 "DkWxAppHelper.cpt"
}
} else {
-#line 805 "DkWxAppHelper.cpt"
+#line 801 "DkWxAppHelper.cpt"
}
if(nelem >= tp->nelem) { cc = 0; }
} else {
-#line 808 "DkWxAppHelper.cpt"
+#line 804 "DkWxAppHelper.cpt"
}
} while((cc) && (ok));
if(nelem < tp->nelem) {
@@ -592,15 +555,15 @@ DkWxAppHelper::getStringTable(
dk3app_set_source_line(app, oldline);
} else {
-#line 816 "DkWxAppHelper.cpt"
+#line 812 "DkWxAppHelper.cpt"
}
} else {
-#line 818 "DkWxAppHelper.cpt"
+#line 814 "DkWxAppHelper.cpt"
}
} else {
-#line 820 "DkWxAppHelper.cpt"
+#line 816 "DkWxAppHelper.cpt"
}
if(ok) {
back = (wxChar const * const *)(tp->array);
@@ -609,43 +572,43 @@ DkWxAppHelper::getStringTable(
}
} else {
-#line 827 "DkWxAppHelper.cpt"
+#line 823 "DkWxAppHelper.cpt"
}
} else {
-#line 829 "DkWxAppHelper.cpt"
+#line 825 "DkWxAppHelper.cpt"
}
fclose(fipo);
} else {
-#line 832 "DkWxAppHelper.cpt"
+#line 828 "DkWxAppHelper.cpt"
}
} else {
-#line 834 "DkWxAppHelper.cpt"
+#line 830 "DkWxAppHelper.cpt"
}
} else {
-#line 836 "DkWxAppHelper.cpt"
+#line 832 "DkWxAppHelper.cpt"
}
if(tp) {
-#line 838 "DkWxAppHelper.cpt"
+#line 834 "DkWxAppHelper.cpt"
back = (wxChar const * const *)(tp->array);
}
} else {
-#line 841 "DkWxAppHelper.cpt"
+#line 837 "DkWxAppHelper.cpt"
}
} else {
-#line 843 "DkWxAppHelper.cpt"
+#line 839 "DkWxAppHelper.cpt"
}
if(!(back)) {
back = dt;
}
-#line 847 "DkWxAppHelper.cpt"
+#line 843 "DkWxAppHelper.cpt"
#else
dkChar fnb[DK3_MAX_PATH]; /* Full file name. */
char il[4096]; /* Input line */
@@ -664,30 +627,30 @@ DkWxAppHelper::getStringTable(
int ok; /* Flag: All strings read succes. */
-#line 864 "DkWxAppHelper.cpt"
+#line 860 "DkWxAppHelper.cpt"
if((dt) && (tn)) {
-#line 865 "DkWxAppHelper.cpt"
+#line 861 "DkWxAppHelper.cpt"
if(checkSetup()) {
-#line 866 "DkWxAppHelper.cpt"
+#line 862 "DkWxAppHelper.cpt"
tp = (DkAppHelperWxStringTable *)dk3sto_it_find_like(
iStringTables, (void *)tn, 1
);
if(!(tp)) {
-#line 870 "DkWxAppHelper.cpt"
+#line 866 "DkWxAppHelper.cpt"
res = dk3app_find_data_file(app,tn,fnb,DK3_SIZEOF(fnb,dkChar));
-#line 872 "DkWxAppHelper.cpt"
+#line 868 "DkWxAppHelper.cpt"
if(res) {
-#line 873 "DkWxAppHelper.cpt"
+#line 869 "DkWxAppHelper.cpt"
fipo = dk3sf_fopen_app(fnb, dk3app_not_localized(22), app);
if(fipo) {
-#line 875 "DkWxAppHelper.cpt"
+#line 871 "DkWxAppHelper.cpt"
wxptr = (wxChar const **)dt; nelem = 0;
while(*(wxptr++)) { nelem++; }
if(nelem) {
@@ -716,10 +679,10 @@ DkWxAppHelper::getStringTable(
if(fgets(il, sizeof(il), fipo)) {
cc = 1;
-#line 902 "DkWxAppHelper.cpt"
+#line 898 "DkWxAppHelper.cpt"
if(il[0] != '#') {
-#line 903 "DkWxAppHelper.cpt"
+#line 899 "DkWxAppHelper.cpt"
dk3app_squeeze_line(il);
if(dk3wxs_from_utf8(wxb,DK3_SIZEOF(wxb,wxChar),il)) {
*wxptr = dk3wxs_dup_app(wxb, app);
@@ -734,32 +697,35 @@ DkWxAppHelper::getStringTable(
wxptr++;
} else {
-#line 916 "DkWxAppHelper.cpt"
+#line 912 "DkWxAppHelper.cpt"
ok = 0; cc = 0;
}
} else {
-#line 919 "DkWxAppHelper.cpt"
+#line 915 "DkWxAppHelper.cpt"
}
}
} while(cc);
if(nelem < tp->nelem) {
ok = 0;
-#line 924 "DkWxAppHelper.cpt"
+#line 920 "DkWxAppHelper.cpt"
+
+
+#line 921 "DkWxAppHelper.cpt"
}
if(ok) {
-#line 926 "DkWxAppHelper.cpt"
+#line 923 "DkWxAppHelper.cpt"
if(!dk3sto_add(sStringTables, (void *)tp)) {
dkwxah_string_table_close(tp);
-#line 928 "DkWxAppHelper.cpt"
+#line 925 "DkWxAppHelper.cpt"
tp = NULL;
}
} else {
-#line 931 "DkWxAppHelper.cpt"
+#line 928 "DkWxAppHelper.cpt"
dkwxah_string_table_close(tp);
tp = NULL;
}
@@ -773,39 +739,39 @@ DkWxAppHelper::getStringTable(
}
} else {
-#line 943 "DkWxAppHelper.cpt"
+#line 940 "DkWxAppHelper.cpt"
}
}
fclose(fipo);
} else {
-#line 947 "DkWxAppHelper.cpt"
+#line 944 "DkWxAppHelper.cpt"
}
} else {
-#line 949 "DkWxAppHelper.cpt"
+#line 946 "DkWxAppHelper.cpt"
}
}
if(tp) {
-#line 952 "DkWxAppHelper.cpt"
+#line 949 "DkWxAppHelper.cpt"
back = (wxChar const * const *)(tp->array);
}
} else {
-#line 955 "DkWxAppHelper.cpt"
+#line 952 "DkWxAppHelper.cpt"
}
} else {
-#line 957 "DkWxAppHelper.cpt"
+#line 954 "DkWxAppHelper.cpt"
}
if(!(back)) {
-#line 959 "DkWxAppHelper.cpt"
+#line 956 "DkWxAppHelper.cpt"
back = dt;
}
-#line 961 "DkWxAppHelper.cpt"
+#line 958 "DkWxAppHelper.cpt"
#endif
return back;
}
@@ -823,7 +789,7 @@ DkWxAppHelper::retrieveMultipleInts(
long l;
-#line 977 "DkWxAppHelper.cpt"
+#line 974 "DkWxAppHelper.cpt"
if((appName) && (vendorName) && (names) && (values)) {
wxConfig *conf = new wxConfig(appName, vendorName);
if(conf) {
@@ -840,7 +806,7 @@ DkWxAppHelper::retrieveMultipleInts(
}
}
-#line 992 "DkWxAppHelper.cpt"
+#line 989 "DkWxAppHelper.cpt"
return back;
}
@@ -858,7 +824,7 @@ DkWxAppHelper::retrieveMultipleLongs(
long l;
-#line 1008 "DkWxAppHelper.cpt"
+#line 1005 "DkWxAppHelper.cpt"
if((appName) && (vendorName) && (names) && (values)) {
wxConfig *conf = new wxConfig(appName, vendorName);
if(conf) {
@@ -876,7 +842,7 @@ DkWxAppHelper::retrieveMultipleLongs(
}
-#line 1024 "DkWxAppHelper.cpt"
+#line 1021 "DkWxAppHelper.cpt"
return back;
}
@@ -893,7 +859,7 @@ DkWxAppHelper::retrieveMultipleDoubles(
double *vptr;
-#line 1039 "DkWxAppHelper.cpt"
+#line 1036 "DkWxAppHelper.cpt"
if((appName) && (vendorName) && (names) && (values)) {
wxConfig *conf = new wxConfig(appName, vendorName);
if(conf) {
@@ -910,7 +876,7 @@ DkWxAppHelper::retrieveMultipleDoubles(
}
}
-#line 1054 "DkWxAppHelper.cpt"
+#line 1051 "DkWxAppHelper.cpt"
return back;
}
@@ -927,16 +893,16 @@ DkWxAppHelper::saveMultipleInts(
long l;
-#line 1069 "DkWxAppHelper.cpt"
+#line 1066 "DkWxAppHelper.cpt"
if((appName) && (vendorName) && (names) && (values)) {
wxConfig *conf = new wxConfig(appName, vendorName);
if(conf) {
-#line 1072 "DkWxAppHelper.cpt"
+#line 1069 "DkWxAppHelper.cpt"
nptr = names; vptr = values;
while(*nptr) {
-#line 1074 "DkWxAppHelper.cpt"
+#line 1071 "DkWxAppHelper.cpt"
l = (long)(*vptr);
if(conf->Write(*nptr, l)) {
back++;
@@ -947,7 +913,7 @@ DkWxAppHelper::saveMultipleInts(
}
}
-#line 1083 "DkWxAppHelper.cpt"
+#line 1080 "DkWxAppHelper.cpt"
return back;
}
@@ -965,7 +931,7 @@ DkWxAppHelper::saveMultipleLongs(
long l;
-#line 1099 "DkWxAppHelper.cpt"
+#line 1096 "DkWxAppHelper.cpt"
if((appName) && (vendorName) && (names) && (values)) {
wxConfig *conf = new wxConfig(appName, vendorName);
if(conf) {
@@ -982,7 +948,7 @@ DkWxAppHelper::saveMultipleLongs(
}
-#line 1114 "DkWxAppHelper.cpt"
+#line 1111 "DkWxAppHelper.cpt"
return back;
}
@@ -1000,7 +966,7 @@ DkWxAppHelper::saveMultipleDoubles(
double *vptr;
-#line 1130 "DkWxAppHelper.cpt"
+#line 1127 "DkWxAppHelper.cpt"
if((appName) && (vendorName) && (names) && (values)) {
wxConfig *conf = new wxConfig(appName, vendorName);
if(conf) {
@@ -1016,7 +982,7 @@ DkWxAppHelper::saveMultipleDoubles(
}
}
-#line 1144 "DkWxAppHelper.cpt"
+#line 1141 "DkWxAppHelper.cpt"
return back;
}
@@ -1031,13 +997,14 @@ DkWxAppHelper::retrieveString(
wxChar const *ptr;
-#line 1157 "DkWxAppHelper.cpt"
+#line 1154 "DkWxAppHelper.cpt"
if((name) && (appName) && (vendorName)) {
wxConfig *conf = new wxConfig(appName, vendorName);
if(conf) {
wxString str;
if(conf->Read(name, &str)) {
- ptr = str.c_str();
+ wxCStrData strdata = str.c_str();
+ ptr = (wxChar const *)strdata;
if(ptr) {
back = dk3wxs_dup_app(ptr, app);
}
@@ -1046,7 +1013,7 @@ DkWxAppHelper::retrieveString(
}
}
-#line 1170 "DkWxAppHelper.cpt"
+#line 1168 "DkWxAppHelper.cpt"
return back;
}
@@ -1061,7 +1028,7 @@ DkWxAppHelper::saveString(
int back = 0;
-#line 1183 "DkWxAppHelper.cpt"
+#line 1181 "DkWxAppHelper.cpt"
if((name) && (value) && (appName) && (vendorName)) {
wxConfig *conf = new wxConfig(appName, vendorName);
if(conf) {
@@ -1070,7 +1037,7 @@ DkWxAppHelper::saveString(
}
}
-#line 1190 "DkWxAppHelper.cpt"
+#line 1188 "DkWxAppHelper.cpt"
return back;
}
@@ -1081,7 +1048,7 @@ DkWxAppHelper::getWxEncoding() const
{
-#line 1199 "DkWxAppHelper.cpt"
+#line 1197 "DkWxAppHelper.cpt"
return wxEncoding;
}
@@ -1092,7 +1059,7 @@ DkWxAppHelper::getDkEncoding() const
{
-#line 1208 "DkWxAppHelper.cpt"
+#line 1206 "DkWxAppHelper.cpt"
return dkEncoding;
}
@@ -1104,13 +1071,13 @@ DkWxAppHelper::getC8Encoding() const
int back;
-#line 1218 "DkWxAppHelper.cpt"
+#line 1216 "DkWxAppHelper.cpt"
back = dkEncoding;
if(DK3_ENCODING_UTF8 != back) {
back = DK3_ENCODING_PLAIN;
}
-#line 1222 "DkWxAppHelper.cpt"
+#line 1220 "DkWxAppHelper.cpt"
return back;
}
@@ -1121,7 +1088,7 @@ DkWxAppHelper::getApp() const
{
-#line 1231 "DkWxAppHelper.cpt"
+#line 1229 "DkWxAppHelper.cpt"
return app;
}
@@ -1135,13 +1102,13 @@ DkWxAppHelper::findDataFile(wxChar const *fn, wxChar *fnb, size_t szfnb)
int back = 0;
-#line 1243 "DkWxAppHelper.cpt"
+#line 1241 "DkWxAppHelper.cpt"
if((fn) && (fnb) && (szfnb)) {
-#line 1244 "DkWxAppHelper.cpt"
+#line 1242 "DkWxAppHelper.cpt"
if(checkSetup()) {
-#line 1245 "DkWxAppHelper.cpt"
+#line 1243 "DkWxAppHelper.cpt"
if(dk3wxs_to_dkstr(
shnDk, DK3_SIZEOF(shnDk,dkChar), dkEncoding, fn, wxEncoding
)
@@ -1149,32 +1116,32 @@ DkWxAppHelper::findDataFile(wxChar const *fn, wxChar *fnb, size_t szfnb)
{
if(app) {
-#line 1251 "DkWxAppHelper.cpt"
+#line 1249 "DkWxAppHelper.cpt"
if(dk3app_find_data_file(app,shnDk,ffnDk,DK3_SIZEOF(ffnDk,dkChar))) {
if(dk3wxs_from_dkstr(fnb, szfnb, wxEncoding, ffnDk, dkEncoding)) {
back = 1;
-#line 1254 "DkWxAppHelper.cpt"
+#line 1252 "DkWxAppHelper.cpt"
} else {
-#line 1255 "DkWxAppHelper.cpt"
+#line 1253 "DkWxAppHelper.cpt"
}
} else {
-#line 1257 "DkWxAppHelper.cpt"
+#line 1255 "DkWxAppHelper.cpt"
}
} else {
-#line 1259 "DkWxAppHelper.cpt"
+#line 1257 "DkWxAppHelper.cpt"
}
} else {
-#line 1261 "DkWxAppHelper.cpt"
+#line 1259 "DkWxAppHelper.cpt"
}
}
}
-#line 1264 "DkWxAppHelper.cpt"
+#line 1262 "DkWxAppHelper.cpt"
return back;
}
@@ -1186,14 +1153,14 @@ DkWxAppHelper::getBasicString(size_t i) const
wxChar const *back = NULL;
-#line 1274 "DkWxAppHelper.cpt"
+#line 1272 "DkWxAppHelper.cpt"
if(basicStrings) {
if(i < nBasicStrings) {
back = basicStrings[i];
}
}
-#line 1279 "DkWxAppHelper.cpt"
+#line 1277 "DkWxAppHelper.cpt"
return back;
}
@@ -1204,7 +1171,7 @@ DkWxAppHelper::getBasicStrings() const
{
-#line 1288 "DkWxAppHelper.cpt"
+#line 1286 "DkWxAppHelper.cpt"
return basicStrings;
}
@@ -1215,7 +1182,7 @@ DkWxAppHelper::getBasicStringNumbers() const
{
-#line 1297 "DkWxAppHelper.cpt"
+#line 1295 "DkWxAppHelper.cpt"
return nBasicStrings;
}
@@ -1227,14 +1194,14 @@ DkWxAppHelper::wxToDk(dkChar *bu, size_t sz, wxChar const *src) const
bool back = false;
-#line 1307 "DkWxAppHelper.cpt"
+#line 1305 "DkWxAppHelper.cpt"
if((bu) && (sz) && (src)) {
if(dk3wxs_to_dkstr(bu, sz, dkEncoding, src, wxEncoding)) {
back = true;
}
}
-#line 1312 "DkWxAppHelper.cpt"
+#line 1310 "DkWxAppHelper.cpt"
return back;
}
@@ -1246,14 +1213,14 @@ DkWxAppHelper::wxToC8(char *bu, size_t sz, wxChar const *src) const
bool back = false;
-#line 1322 "DkWxAppHelper.cpt"
+#line 1320 "DkWxAppHelper.cpt"
if((bu) && (sz) && (src)) {
if(dk3wxs_to_c8(bu, sz, getC8Encoding(), src, wxEncoding)) {
back = true;
}
}
-#line 1327 "DkWxAppHelper.cpt"
+#line 1325 "DkWxAppHelper.cpt"
return back;
}
@@ -1266,15 +1233,16 @@ DkWxAppHelper::wxToC8(char *bu, size_t sz, wxString & str) const
wxChar const *ptr;
-#line 1338 "DkWxAppHelper.cpt"
+#line 1336 "DkWxAppHelper.cpt"
if((bu) && (sz)) {
- ptr = str.c_str();
+ wxCStrData strdata = str.c_str();
+ ptr = (wxChar const *)strdata;
if(ptr) {
back = wxToC8(bu, sz, ptr);
}
}
-#line 1344 "DkWxAppHelper.cpt"
+#line 1343 "DkWxAppHelper.cpt"
return back;
}
@@ -1286,14 +1254,14 @@ DkWxAppHelper::dkToWx(wxChar *bu, size_t sz, dkChar const *src) const
bool back = false;
-#line 1354 "DkWxAppHelper.cpt"
+#line 1353 "DkWxAppHelper.cpt"
if((bu) && (sz) && (src)) {
if(dk3wxs_from_dkstr(bu, sz, wxEncoding, src, dkEncoding)) {
back = true;
}
}
-#line 1359 "DkWxAppHelper.cpt"
+#line 1358 "DkWxAppHelper.cpt"
return back;
}
@@ -1375,7 +1343,6 @@ DkWxAppHelper::reportProblemsIfAny(void)
}
if (!didReport) {
if ((NULL == cmdName) || (NULL == appName) || (NULL == vendorName)) {
- didReport = true;
/* ERROR: Memory */
showErrorMessage(3, 9);
}