summaryrefslogtreecommitdiff
path: root/support/dktools/dkct-gui.c
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/dkct-gui.c
parentac690ca29ad5bf8a5203a65fd6252f7b564f4727 (diff)
CTAN sync 202009200303
Diffstat (limited to 'support/dktools/dkct-gui.c')
-rw-r--r--support/dktools/dkct-gui.c1512
1 files changed, 1030 insertions, 482 deletions
diff --git a/support/dktools/dkct-gui.c b/support/dktools/dkct-gui.c
index df75933777..2267fc82f2 100644
--- a/support/dktools/dkct-gui.c
+++ b/support/dktools/dkct-gui.c
@@ -1,36 +1,14 @@
/*
- 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: dkct-gui.ctr
+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: dkct-gui.ctr
*/
/** @file dkct-gui.c The dkct-gui module.
@@ -39,15 +17,21 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#line 594 "dkct-gui.ctr"
+#include "dk4conf.h"
+
#if DK3_USE_WX
#include "dkwxtrace.h"
#else
#include "dkct.h"
#endif
+#include "dk3unused.h"
+
+
-#line 602 "dkct-gui.ctr"
+
+#line 608 "dkct-gui.ctr"
@@ -96,6 +80,12 @@ static char const * const dkct_gui_class_names[] = {
/* 39 */ "wxStatusBar",
/* 40 */ "wxToolBarToolBase", /* Not a wxWidgets class! */
/* 41 */ "wxGrid",
+/* 42 */ "wxChoicebook",
+/* 43 */ "wxListbook",
+/* 44 */ "wxSimplebook",
+/* 45 */ "wxToolbook",
+/* 46 */ "wxTreebook",
+/* 47 */ "wxScrolled<wxPanel>",
NULL
};
@@ -620,6 +610,15 @@ char const * const dkct_gui_out_kw[] = {
/* 217 */ "->SetColLabelSize(wxGRID_AUTOSIZE",
/* 218 */ "if(",
/* 219 */ ") { ",
+/* 220 */ "->AddPage(",
+/* 221 */ "wxCHB_TOP",
+/* 222 */ "wxLB_TOP",
+/* 223 */ "wxCHB_LEFT",
+/* 224 */ "wxLB_LEFT",
+/* 225 */ "wxCHB_RIGHT",
+/* 226 */ "wxLB_RIGHT",
+/* 227 */ "wxCHB_BOTTOM",
+/* 228 */ "wxLB_BOTTOM",
NULL
};
@@ -636,6 +635,233 @@ NULL
+/** IDs for stock buttons and menu items.
+*/
+static char const * const dkct_gui_stock_item_names[] = {
+/* 0 */
+"wxID_ABOUT",
+
+/* 1 */
+"wxID_ADD",
+
+/* 2 */
+"wxID_APPLY",
+
+/* 3 */
+"wxID_BACKWARD",
+
+/* 4 */
+"wxID_BOLD",
+
+/* 5 */
+"wxID_BOTTOM",
+
+/* 6 */
+"wxID_CANCEL",
+
+/* 7 */
+"wxID_CDROM",
+
+/* 8 */
+"wxID_CLEAR",
+
+/* 9 */
+"wxID_CLOSE",
+
+/* 10 */
+"wxID_CONVERT",
+
+/* 11 */
+"wxID_COPY",
+
+/* 12 */
+"wxID_CUT",
+
+/* 13 */
+"wxID_DELETE",
+
+/* 14 */
+"wxID_DOWN",
+
+/* 15 */
+"wxID_EDIT",
+
+/* 16 */
+"wxID_EXECUTE",
+
+/* 17 */
+"wxID_EXIT",
+
+/* 18 */
+"wxID_FILE",
+
+/* 19 */
+"wxID_FIND",
+
+/* 20 */
+"wxID_FIRST",
+
+/* 21 */
+"wxID_FLOPPY",
+
+/* 22 */
+"wxID_FORWARD",
+
+/* 23 */
+"wxID_HARDDISK",
+
+/* 24 */
+"wxID_HELP",
+
+/* 25 */
+"wxID_HOME",
+
+/* 26 */
+"wxID_INDENT",
+
+/* 27 */
+"wxID_INDEX",
+
+/* 28 */
+"wxID_INFO",
+
+/* 29 */
+"wxID_ITALIC",
+
+/* 30 */
+"wxID_JUMP_TO \t",
+
+/* 31 */
+"wxID_JUSTIFY_CENTER \t",
+
+/* 32 */
+"wxID_JUSTIFY_FILL",
+
+/* 33 */
+"wxID_JUSTIFY_LEFT \t",
+
+/* 34 */
+"wxID_JUSTIFY_RIGHT",
+
+/* 35 */
+"wxID_LAST",
+
+/* 36 */
+"wxID_NETWORK \t",
+
+/* 37 */
+"wxID_NEW",
+
+/* 38 */
+"wxID_NO",
+
+/* 39 */
+"wxID_OK",
+
+/* 40 */
+"wxID_OPEN",
+
+/* 41 */
+"wxID_PASTE",
+
+/* 42 */
+"wxID_PREFERENCES",
+
+/* 43 */
+"wxID_PREVIEW",
+
+/* 44 */
+"wxID_PRINT",
+
+/* 45 */
+"wxID_PROPERTIES",
+
+/* 46 */
+"wxID_REDO",
+
+/* 47 */
+"wxID_REFRESH",
+
+/* 48 */
+"wxID_REMOVE",
+
+/* 49 */
+"wxID_REPLACE",
+
+/* 50 */
+"wxID_REVERT_TO_SAVED",
+
+/* 51 */
+"wxID_SAVE",
+
+/* 52 */
+"wxID_SAVEAS",
+
+/* 53 */
+"wxID_SELECTALL",
+
+/* 54 */
+"wxID_SELECT_COLOR",
+
+/* 55 */
+"wxID_SELECT_FONT",
+
+/* 56 */
+"wxID_SORT_ASCENDING \t",
+
+/* 57 */
+"wxID_SORT_DESCENDING",
+
+/* 58 */
+"wxID_SPELL_CHECK",
+
+/* 59 */
+"wxID_STOP",
+
+/* 60 */
+"wxID_STRIKETHROUGH",
+
+/* 61 */
+"wxID_TOP",
+
+/* 62 */
+"wxID_UNDELETE",
+
+/* 63 */
+"wxID_UNDERLINE",
+
+/* 64 */
+"wxID_UNDO",
+
+/* 65 */
+"wxID_UNINDENT",
+
+/* 66 */
+"wxID_UP",
+
+/* 67 */
+"wxID_YES",
+
+/* 68 */
+"wxID_ZOOM_100",
+
+/* 69 */
+"wxID_ZOOM_FIT",
+
+/* 70 */
+"wxID_ZOOM_IN",
+
+/* 71 */
+"wxID_ZOOM_OUT",
+
+NULL
+
+
+#line 1288 "dkct-gui.ctr"
+};
+
+
+
/** Delete grid header data.
@param gh Header data to delete.
*/
@@ -712,12 +938,13 @@ dkct_grid_cell_new(char const *txt, int r, int c, DKCT_SRC *psrc)
static
int
-dkct_grid_cell_compare(const void *l, const void *r, int cr)
+dkct_grid_cell_compare(const void *l, const void *r, int DK3_ARG_UNUSED(cr) )
{
DKCT_CELL_DATA *pl;
DKCT_CELL_DATA *pr;
int back = 0;
+ DK3_UNUSED_ARG(cr)
if (l) {
if (r) {
pl = (DKCT_CELL_DATA *)l;
@@ -753,11 +980,13 @@ dkct_grid_cell_compare(const void *l, const void *r, int cr)
*/
static
int
-dkct_grid_head_compare(void const *l, void const *r, int cr)
+dkct_grid_head_compare(void const *l, void const *r, int DK3_ARG_UNUSED(cr) )
{
int back = 0;
DKCT_GRID_HEAD const *pl;
DKCT_GRID_HEAD const *pr;
+
+ DK3_UNUSED_ARG(cr)
if(l) {
if(r) {
pl = (DKCT_GRID_HEAD const *)l; pr = (DKCT_GRID_HEAD const *)r;
@@ -918,7 +1147,7 @@ dkct_gui_elem_delete(DKCT_GUI_ELEMENT *elp)
{
-#line 1471 "dkct-gui.ctr"
+#line 1576 "dkct-gui.ctr"
if(elp) {
dkct_remove_grid_cell_data(elp->sCellData, elp->iCellData);
elp->sCellData = NULL; elp->iCellData = NULL;
@@ -956,22 +1185,22 @@ dkct_gui_elem_delete(DKCT_GUI_ELEMENT *elp)
elp->parent = NULL;
-#line 1507 "dkct-gui.ctr"
+#line 1612 "dkct-gui.ctr"
elp->number = 0;
-#line 1509 "dkct-gui.ctr"
+#line 1614 "dkct-gui.ctr"
elp->lndef = 0UL;
-#line 1511 "dkct-gui.ctr"
+#line 1616 "dkct-gui.ctr"
elp->lndecl = 0UL;
elp->cln = 0;
elp->align = 0x00;
dk3_delete(elp);
}
-#line 1516 "dkct-gui.ctr"
+#line 1621 "dkct-gui.ctr"
}
@@ -999,7 +1228,7 @@ dkct_gui_elem_new(
int ok = 0; /* Flag: OK so far. */
-#line 1542 "dkct-gui.ctr"
+#line 1647 "dkct-gui.ctr"
back = dk3_new_app(DKCT_GUI_ELEMENT,1,psrc->app);
if(back) {
/*
@@ -1120,12 +1349,12 @@ dkct_gui_elem_new(
back->number = number;
if(!(ok)) {
-#line 1661 "dkct-gui.ctr"
+#line 1766 "dkct-gui.ctr"
dkct_gui_elem_delete(back); back = NULL;
}
}
-#line 1664 "dkct-gui.ctr"
+#line 1769 "dkct-gui.ctr"
return back;
}
@@ -1186,7 +1415,7 @@ dkct_gui_new(DKCT_SRC *psrc)
DKCT_GUI_ELEMENT *el; /* New element. */
-#line 1723 "dkct-gui.ctr"
+#line 1828 "dkct-gui.ctr"
back = dk3_new_app(DKCT_GUI,1,psrc->app);
if(back) {
/*
@@ -1236,7 +1465,7 @@ dkct_gui_new(DKCT_SRC *psrc)
}
}
-#line 1771 "dkct-gui.ctr"
+#line 1876 "dkct-gui.ctr"
return back;
}
@@ -1248,7 +1477,7 @@ dkct_gui_delete(DKCT_GUI *pg)
DKCT_GUI_ELEMENT *el; /* Current element to process. */
-#line 1781 "dkct-gui.ctr"
+#line 1886 "dkct-gui.ctr"
if(pg) {
pg->psrc = NULL;
pg->c_el = NULL;
@@ -1278,7 +1507,7 @@ dkct_gui_delete(DKCT_GUI *pg)
dk3_delete(pg);
}
-#line 1809 "dkct-gui.ctr"
+#line 1914 "dkct-gui.ctr"
}
@@ -1291,7 +1520,7 @@ void
dkct_gui_initialize_object_for_class(DKCT_GUI_ELEMENT *el)
{
switch(el->cln) {
- case 13: {
+ case 13: case 47: {
el->direction = DKCT_GUI_DIRECTION_BOTH;
} break;
}
@@ -1313,7 +1542,7 @@ dkct_gui_start_new_object_definition(DKCT_GUI *gui, char *il)
DKCT_GUI_ELEMENT *elp; /* Element to process. */
-#line 1842 "dkct-gui.ctr"
+#line 1947 "dkct-gui.ctr"
gui->c_el = NULL;
p2 = dk3str_c8_rchr(il, ']');
if(p2) {
@@ -1369,7 +1598,7 @@ dkct_gui_start_new_object_definition(DKCT_GUI *gui, char *il)
}
-#line 1896 "dkct-gui.ctr"
+#line 2001 "dkct-gui.ctr"
return back;
}
@@ -1388,12 +1617,12 @@ dkct_gui_set_menu_bar(DKCT_GUI *gui, char *il)
DKCT_GUI_ELEMENT *elp; /* Element to modify. */
-#line 1913 "dkct-gui.ctr"
+#line 2018 "dkct-gui.ctr"
if(gui->c_el) {
if(((gui->c_el)->number != 0) && (!((gui->c_el)->parent))) {
-#line 1916 "dkct-gui.ctr"
+#line 2021 "dkct-gui.ctr"
/* Warning: Attribute applicable to root element only! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 55);
}
@@ -1420,7 +1649,7 @@ dkct_gui_set_menu_bar(DKCT_GUI *gui, char *il)
}
}
-#line 1941 "dkct-gui.ctr"
+#line 2046 "dkct-gui.ctr"
return back;
}
@@ -1439,12 +1668,12 @@ dkct_gui_set_tool_bar(DKCT_GUI *gui, char *il)
DKCT_GUI_ELEMENT *elp; /* Toolbar object. */
-#line 1958 "dkct-gui.ctr"
+#line 2063 "dkct-gui.ctr"
if(gui->c_el) {
if(((gui->c_el)->number != 0) && (!((gui->c_el)->parent))) {
-#line 1961 "dkct-gui.ctr"
+#line 2066 "dkct-gui.ctr"
/* Warning: Attribute applicable to root object only! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 55);
}
@@ -1473,7 +1702,7 @@ dkct_gui_set_tool_bar(DKCT_GUI *gui, char *il)
}
-#line 1988 "dkct-gui.ctr"
+#line 2093 "dkct-gui.ctr"
return back;
}
@@ -1494,12 +1723,12 @@ dkct_gui_set_status_bar(DKCT_GUI *gui, char *il)
char *p2; /* Initial status text. */
-#line 2007 "dkct-gui.ctr"
+#line 2112 "dkct-gui.ctr"
if(gui->c_el) {
if(((gui->c_el)->number != 0) && (!((gui->c_el)->parent))) {
-#line 2010 "dkct-gui.ctr"
+#line 2115 "dkct-gui.ctr"
/* Warning: Attribute applicable to root element only! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 55);
}
@@ -1536,7 +1765,7 @@ dkct_gui_set_status_bar(DKCT_GUI *gui, char *il)
}
-#line 2045 "dkct-gui.ctr"
+#line 2150 "dkct-gui.ctr"
return back;
}
@@ -1555,13 +1784,13 @@ dkct_gui_set_id(DKCT_GUI *gui, char *il)
char *p1; /* Start of text. */
-#line 2062 "dkct-gui.ctr"
+#line 2167 "dkct-gui.ctr"
if(gui->c_el) {
switch((gui->c_el)->cln) {
case 5: case 6: case 7: case 8: case 9: case 10: {
-#line 2066 "dkct-gui.ctr"
+#line 2171 "dkct-gui.ctr"
/* Warning: Attribute not applicable to class! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 56);
} break;
@@ -1590,7 +1819,7 @@ dkct_gui_set_id(DKCT_GUI *gui, char *il)
}
-#line 2093 "dkct-gui.ctr"
+#line 2198 "dkct-gui.ctr"
return back;
}
@@ -1609,11 +1838,11 @@ dkct_gui_set_constructor(DKCT_GUI *gui, char *il)
char *p1; /* Start of text. */
-#line 2110 "dkct-gui.ctr"
+#line 2215 "dkct-gui.ctr"
if(gui->c_el) {
if((gui->c_el)->cln >= 0) {
-#line 2112 "dkct-gui.ctr"
+#line 2217 "dkct-gui.ctr"
/* Warning: Constructor attribute not recommended for class! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 56);
}
@@ -1641,7 +1870,7 @@ dkct_gui_set_constructor(DKCT_GUI *gui, char *il)
}
}
-#line 2138 "dkct-gui.ctr"
+#line 2243 "dkct-gui.ctr"
return back;
}
@@ -1662,12 +1891,12 @@ dkct_gui_set_border(DKCT_GUI *gui, char *il)
char *p2 = NULL; /* Next string to process. */
-#line 2157 "dkct-gui.ctr"
+#line 2262 "dkct-gui.ctr"
if(gui->c_el) {
switch((gui->c_el)->cln) {
case 0: case 1: case 2: case 3: case 4: {
-#line 2160 "dkct-gui.ctr"
+#line 2265 "dkct-gui.ctr"
/* Warning: Attribute not applicable to class! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 56);
} break;
@@ -1717,7 +1946,7 @@ dkct_gui_set_border(DKCT_GUI *gui, char *il)
}
-#line 2208 "dkct-gui.ctr"
+#line 2313 "dkct-gui.ctr"
return back;
}
@@ -1736,12 +1965,12 @@ dkct_gui_set_proportion(DKCT_GUI *gui, char *il)
int i; /* Proportion value. */
-#line 2225 "dkct-gui.ctr"
+#line 2330 "dkct-gui.ctr"
if(gui->c_el) {
switch((gui->c_el)->cln) {
case 0: case 1: case 2: case 3: {
-#line 2228 "dkct-gui.ctr"
+#line 2333 "dkct-gui.ctr"
/* Warning: Attribute not applicable to class! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 56);
} break;
@@ -1758,7 +1987,7 @@ dkct_gui_set_proportion(DKCT_GUI *gui, char *il)
}
-#line 2243 "dkct-gui.ctr"
+#line 2348 "dkct-gui.ctr"
return back;
}
@@ -1778,7 +2007,7 @@ dkct_gui_set_status_text(DKCT_GUI *gui, char *il)
int back = 0;
-#line 2261 "dkct-gui.ctr"
+#line 2366 "dkct-gui.ctr"
el = gui->c_el;
if(el) {
switch(el->cln) {
@@ -1790,7 +2019,7 @@ dkct_gui_set_status_text(DKCT_GUI *gui, char *il)
} break;
default: {
-#line 2271 "dkct-gui.ctr"
+#line 2376 "dkct-gui.ctr"
/* Warning: Attribute not applicable to class! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 56);
} break;
@@ -1815,7 +2044,7 @@ dkct_gui_set_status_text(DKCT_GUI *gui, char *il)
}
-#line 2294 "dkct-gui.ctr"
+#line 2399 "dkct-gui.ctr"
return back;
}
@@ -1834,7 +2063,7 @@ dkct_gui_set_expand(DKCT_GUI *gui, char *il)
char *p1; /* Start of text. */
-#line 2311 "dkct-gui.ctr"
+#line 2416 "dkct-gui.ctr"
if(gui->c_el) {
p1 = dk3str_c8_start(il, NULL);
if(p1) {
@@ -1854,7 +2083,7 @@ dkct_gui_set_expand(DKCT_GUI *gui, char *il)
}
}
-#line 2329 "dkct-gui.ctr"
+#line 2434 "dkct-gui.ctr"
return back;
}
@@ -1872,7 +2101,7 @@ dkct_gui_set_text(DKCT_GUI *gui, char *il)
char *p1; /* Start of text. */
-#line 2345 "dkct-gui.ctr"
+#line 2450 "dkct-gui.ctr"
if(gui->c_el) {
switch((gui->c_el)->cln) {
case -1:
@@ -1882,6 +2111,7 @@ dkct_gui_set_text(DKCT_GUI *gui, char *il)
case 3:
case 4:
case 9:
+ case 11:
case 15:
case 16:
case 19:
@@ -1892,14 +2122,16 @@ dkct_gui_set_text(DKCT_GUI *gui, char *il)
case 28:
case 29:
case 31:
+ case 34:
case 36:
case 37:
case 40:
{
} break;
- default: {
+ default: {
+
-#line 2370 "dkct-gui.ctr"
+#line 2478 "dkct-gui.ctr"
/* Warning: Attribute not applicable for class! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 56);
} break;
@@ -1928,7 +2160,7 @@ dkct_gui_set_text(DKCT_GUI *gui, char *il)
}
}
-#line 2397 "dkct-gui.ctr"
+#line 2505 "dkct-gui.ctr"
return back;
}
@@ -1947,7 +2179,7 @@ dkct_gui_set_tip_text(DKCT_GUI *gui, char *il)
char *p1; /* Start of text. */
-#line 2414 "dkct-gui.ctr"
+#line 2522 "dkct-gui.ctr"
if(gui->c_el) {
switch((gui->c_el)->cln) {
case -1:
@@ -1966,15 +2198,21 @@ dkct_gui_set_tip_text(DKCT_GUI *gui, char *il)
case 28:
case 29:
case 30:
+ case 31:
case 36:
case 37: /* wxMenuItem */
case 39:
case 40:
+ case 42:
+ case 43:
+ case 44:
+ case 45:
+ case 46:
{
} break;
default: {
-#line 2439 "dkct-gui.ctr"
+#line 2553 "dkct-gui.ctr"
/* Warning: Attribute not applicable to class! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 56);
} break;
@@ -2003,7 +2241,7 @@ dkct_gui_set_tip_text(DKCT_GUI *gui, char *il)
}
}
-#line 2466 "dkct-gui.ctr"
+#line 2580 "dkct-gui.ctr"
return back;
}
@@ -2021,7 +2259,7 @@ dkct_gui_set_type(DKCT_GUI *gui, char *il)
int back = 0;
-#line 2482 "dkct-gui.ctr"
+#line 2596 "dkct-gui.ctr"
if(gui->c_el) {
if(((gui->c_el)->number == 0) && (!((gui->c_el)->parent))) {
switch(dk3str_c8_array_index(dkct_gui_base_type_names, il, 0)) {
@@ -2041,14 +2279,14 @@ dkct_gui_set_type(DKCT_GUI *gui, char *il)
}
} else {
-#line 2500 "dkct-gui.ctr"
+#line 2614 "dkct-gui.ctr"
/* ERROR: Attribute applicable to root element only! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 55);
(gui->psrc)->ec = DK3_ERROR_SYNTAX;
}
}
-#line 2505 "dkct-gui.ctr"
+#line 2619 "dkct-gui.ctr"
return back;
}
@@ -2173,7 +2411,7 @@ dkct_gui_add_additional_placement_info(
int h; /* Number of rows. */
-#line 2628 "dkct-gui.ctr"
+#line 2742 "dkct-gui.ctr"
switch((gui->c_el)->cln) {
case 5: case 9: {
/*
@@ -2253,7 +2491,7 @@ dkct_gui_add_additional_placement_info(
} break;
}
-#line 2706 "dkct-gui.ctr"
+#line 2820 "dkct-gui.ctr"
return back;
}
@@ -2279,7 +2517,7 @@ dkct_gui_add_contents(DKCT_GUI *gui, char *il)
int i;
-#line 2730 "dkct-gui.ctr"
+#line 2844 "dkct-gui.ctr"
if(gui->c_el) {
switch((gui->c_el)->cln) {
case 0: /* wxFrame */
@@ -2296,44 +2534,51 @@ dkct_gui_add_contents(DKCT_GUI *gui, char *il)
case 12: /* wxNotebook */
case 13: /* wxScrolledWindow */
case 14: /* wxSplitterWindow */
+ case 34: /* wxStaticBox */
case 35: /* wxMenuBar */
case 36: /* wxMenu */
case 38: /* wxToolBar */
case 39: /* wxStatusBar */
+ case 42: /* wxChoicebook */
+ case 43: /* wxListbook */
+ case 44: /* wxSimplebook */
+ case 45: /* wxToolbook */
+ case 46: /* wxTreebook */
+ case 47: /* wxScrolled<wxPanel> */
{
} break;
default: {
-#line 2753 "dkct-gui.ctr"
+#line 2874 "dkct-gui.ctr"
/* Warning: Attribute not applicable to this class! */
- dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 56);
+ dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 125);
} break;
}
for(szp = 0; szp < 16; szp++) { p[szp] = NULL; }
szp = dk3str_c8_explode(p, 15, il, NULL);
if(szp > 0) {
-#line 2760 "dkct-gui.ctr"
+#line 2881 "dkct-gui.ctr"
gel = dkct_gui_elem_next(gui, p[0]);
if(gel) {
-#line 2762 "dkct-gui.ctr"
+#line 2883 "dkct-gui.ctr"
if(dk3sto_add((gui->c_el)->s_contents, gel)) {
-#line 2763 "dkct-gui.ctr"
+#line 2884 "dkct-gui.ctr"
if(*(p[0]) == '$') {
-#line 2764 "dkct-gui.ctr"
+#line 2885 "dkct-gui.ctr"
p1 = p[0]; p2 = NULL; p3 = NULL;
p2 = dk3str_c8_chr(p1, '(');
if(p2) {
-#line 2767 "dkct-gui.ctr"
+#line 2888 "dkct-gui.ctr"
*(p2++) = '\0';
p3 = dk3str_c8_rchr(p2, ')');
if(p3) {
-#line 2770 "dkct-gui.ctr"
+#line 2891 "dkct-gui.ctr"
*p3 = '\0';
}
}
@@ -2347,7 +2592,7 @@ dkct_gui_add_contents(DKCT_GUI *gui, char *il)
case 0: case 1: {
if(pso == 0) {
-#line 2782 "dkct-gui.ctr"
+#line 2903 "dkct-gui.ctr"
gel->proportion = 1;
#if 0
/*
@@ -2358,12 +2603,12 @@ dkct_gui_add_contents(DKCT_GUI *gui, char *il)
}
if(p2) {
-#line 2791 "dkct-gui.ctr"
+#line 2912 "dkct-gui.ctr"
p3 = dk3str_c8_chr(p2, ',');
if(p3) *(p3++) = '\0';
if(sscanf(p2, "%d", &i) == 1) {
-#line 2794 "dkct-gui.ctr"
+#line 2915 "dkct-gui.ctr"
gel->sizex = i;
gel->sizey = i;
} else {
@@ -2374,12 +2619,12 @@ dkct_gui_add_contents(DKCT_GUI *gui, char *il)
}
if(p3) {
-#line 2803 "dkct-gui.ctr"
+#line 2924 "dkct-gui.ctr"
p2 = dk3str_c8_chr(p3, ',');
if(p2) *(p2++) = '\0';
if(sscanf(p3, "%d", &i) == 1) {
-#line 2806 "dkct-gui.ctr"
+#line 2927 "dkct-gui.ctr"
gel->sizey = i;
} else {
/* ERROR: Not an integer! */
@@ -2389,10 +2634,10 @@ dkct_gui_add_contents(DKCT_GUI *gui, char *il)
}
if(p2) {
-#line 2814 "dkct-gui.ctr"
+#line 2935 "dkct-gui.ctr"
if(sscanf(p2, "%d", &i) == 1) {
-#line 2815 "dkct-gui.ctr"
+#line 2936 "dkct-gui.ctr"
gel->proportion = i;
} else {
/* ERROR: Not an integer! */
@@ -2413,38 +2658,38 @@ dkct_gui_add_contents(DKCT_GUI *gui, char *il)
}
} else {
-#line 2834 "dkct-gui.ctr"
+#line 2955 "dkct-gui.ctr"
back = dkct_gui_add_additional_placement_info(
gui, gui->c_el, gel, p, szp
);
}
} else {
-#line 2839 "dkct-gui.ctr"
+#line 2960 "dkct-gui.ctr"
/* ERROR: Memory */
(gui->psrc)->ec = DK3_ERROR_MEMORY;
dkct_to_log_1(gui->psrc, 1, DK3_LL_ERROR, 57);
}
} else {
-#line 2844 "dkct-gui.ctr"
+#line 2965 "dkct-gui.ctr"
/* ERROR: Memory */
(gui->psrc)->ec = DK3_ERROR_MEMORY;
dkct_to_log_1(gui->psrc, 1, DK3_LL_ERROR, 57);
}
} else {
-#line 2849 "dkct-gui.ctr"
+#line 2970 "dkct-gui.ctr"
/* ERROR: Empty line */
(gui->psrc)->ec = DK3_ERROR_SYNTAX;
dkct_to_log_1(gui->psrc, 1, DK3_LL_ERROR, 66);
}
} else {
-#line 2854 "dkct-gui.ctr"
+#line 2975 "dkct-gui.ctr"
}
-#line 2855 "dkct-gui.ctr"
+#line 2976 "dkct-gui.ctr"
return back;
}
@@ -2472,7 +2717,7 @@ dkct_gui_set_grid(DKCT_GUI *gui, char *pv)
int i4 = 0; /* Fourth int value. */
-#line 2881 "dkct-gui.ctr"
+#line 3002 "dkct-gui.ctr"
co = gui->c_el;
if(co) {
switch(co->cln) {
@@ -2481,7 +2726,7 @@ dkct_gui_set_grid(DKCT_GUI *gui, char *pv)
} break;
default: {
-#line 2888 "dkct-gui.ctr"
+#line 3009 "dkct-gui.ctr"
/* Warning: Attribute not applicable to class! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 56);
} break;
@@ -2563,7 +2808,7 @@ dkct_gui_set_grid(DKCT_GUI *gui, char *pv)
(gui->psrc)->ec = DK3_ERROR_SYNTAX;
}
-#line 2968 "dkct-gui.ctr"
+#line 3089 "dkct-gui.ctr"
return back;
}
@@ -2583,7 +2828,7 @@ dkct_gui_set_sash(DKCT_GUI *gui, char *pv)
int back = 0;
-#line 2986 "dkct-gui.ctr"
+#line 3107 "dkct-gui.ctr"
el = gui->c_el;
if(el) {
switch(el->cln) {
@@ -2591,7 +2836,7 @@ dkct_gui_set_sash(DKCT_GUI *gui, char *pv)
} break;
default: {
-#line 2992 "dkct-gui.ctr"
+#line 3113 "dkct-gui.ctr"
/* Warning: Attribute not applicable to class! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 56);
} break;
@@ -2606,7 +2851,7 @@ dkct_gui_set_sash(DKCT_GUI *gui, char *pv)
}
-#line 3005 "dkct-gui.ctr"
+#line 3126 "dkct-gui.ctr"
return back;
}
@@ -2626,7 +2871,7 @@ dkct_gui_set_min_pane_size(DKCT_GUI *gui, char *pv)
int back = 0;
-#line 3023 "dkct-gui.ctr"
+#line 3144 "dkct-gui.ctr"
el = gui->c_el;
if(el) {
switch(el->cln) {
@@ -2634,7 +2879,7 @@ dkct_gui_set_min_pane_size(DKCT_GUI *gui, char *pv)
} break;
default: {
-#line 3029 "dkct-gui.ctr"
+#line 3150 "dkct-gui.ctr"
/* Warning: Attribute not applicable to class! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 56);
} break;
@@ -2650,7 +2895,7 @@ dkct_gui_set_min_pane_size(DKCT_GUI *gui, char *pv)
}
-#line 3043 "dkct-gui.ctr"
+#line 3164 "dkct-gui.ctr"
return back;
}
@@ -2671,7 +2916,7 @@ dkct_gui_start_radio_button_group(DKCT_GUI *gui, char *pv)
char *p1; /* Start of text. */
-#line 3062 "dkct-gui.ctr"
+#line 3183 "dkct-gui.ctr"
co = gui->c_el;
if(co) {
p1 = dk3str_c8_start(pv, NULL);
@@ -2698,7 +2943,7 @@ dkct_gui_start_radio_button_group(DKCT_GUI *gui, char *pv)
}
-#line 3087 "dkct-gui.ctr"
+#line 3208 "dkct-gui.ctr"
return back;
}
@@ -2721,7 +2966,7 @@ dkct_gui_set_size_for_object(DKCT_GUI *gui, char *pv)
int back = 0;
-#line 3108 "dkct-gui.ctr"
+#line 3229 "dkct-gui.ctr"
if(gui->c_el) {
el = gui->c_el;
p1 = dk3str_c8_start(pv, NULL);
@@ -2747,7 +2992,7 @@ dkct_gui_set_size_for_object(DKCT_GUI *gui, char *pv)
}
-#line 3132 "dkct-gui.ctr"
+#line 3253 "dkct-gui.ctr"
return back;
}
@@ -2767,25 +3012,27 @@ dkct_gui_set_direction(DKCT_GUI *gui, char *il)
char *p1; /* Start of text. */
-#line 3150 "dkct-gui.ctr"
+#line 3271 "dkct-gui.ctr"
el = gui->c_el;
if(el) {
p1 = dk3str_c8_start(il, NULL);
if(p1) {
dk3str_c8_next(p1, NULL);
switch(el->cln) {
- case 5: /* box sizer */
- case 9: /* static box sizer */
- case 25: /* spin button */
- case 26: /* spin control */
- case 13: /* scrolled window */
- case 30: /* gauge */
- case 33: /* static line */
+ case 5: /* box sizer */
+ case 9: /* static box sizer */
+ case 24: /* scrollbar */
+ case 25: /* spin button */
+ case 26: /* spin control */
+ case 27: /* slider control */
+ case 13: case 47: /* scrolled window */
+ case 30: /* gauge */
+ case 33: /* static line */
{
} break;
default: {
-#line 3166 "dkct-gui.ctr"
+#line 3289 "dkct-gui.ctr"
/* Warning: Direction ignored for this class! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 56);
} break;
@@ -2800,7 +3047,7 @@ dkct_gui_set_direction(DKCT_GUI *gui, char *il)
back = 1;
} break;
case 2: {
- if(el->cln == 13) {
+ if((el->cln == 13) || (el->cln == 47)) {
el->direction = DKCT_GUI_DIRECTION_BOTH;
back = 1;
} else {
@@ -2819,7 +3066,7 @@ dkct_gui_set_direction(DKCT_GUI *gui, char *il)
}
-#line 3198 "dkct-gui.ctr"
+#line 3321 "dkct-gui.ctr"
return back;
}
@@ -2842,7 +3089,7 @@ dkct_gui_set_range(DKCT_GUI *gui, char *il)
int i2 = 100; /* Maximum. */
-#line 3219 "dkct-gui.ctr"
+#line 3342 "dkct-gui.ctr"
el = gui->c_el;
if(el) {
switch(el->cln) {
@@ -2886,7 +3133,7 @@ dkct_gui_set_range(DKCT_GUI *gui, char *il)
}
-#line 3261 "dkct-gui.ctr"
+#line 3384 "dkct-gui.ctr"
return back;
}
@@ -2907,7 +3154,7 @@ dkct_gui_set_value(DKCT_GUI *gui, char *il)
int i1 = 0; /* Value. */
-#line 3280 "dkct-gui.ctr"
+#line 3403 "dkct-gui.ctr"
el = gui->c_el;
if(el) {
switch(el->cln) {
@@ -2936,7 +3183,7 @@ dkct_gui_set_value(DKCT_GUI *gui, char *il)
}
-#line 3307 "dkct-gui.ctr"
+#line 3430 "dkct-gui.ctr"
return back;
}
@@ -2956,7 +3203,7 @@ dkct_gui_set_wrap(DKCT_GUI *gui, char *il)
DKCT_GUI_ELEMENT *el; /* Element to modify. */
-#line 3325 "dkct-gui.ctr"
+#line 3448 "dkct-gui.ctr"
el = gui->c_el;
if(el) {
switch(el->cln) {
@@ -2987,7 +3234,7 @@ dkct_gui_set_wrap(DKCT_GUI *gui, char *il)
}
}
-#line 3354 "dkct-gui.ctr"
+#line 3477 "dkct-gui.ctr"
return back;
}
@@ -3007,7 +3254,7 @@ dkct_gui_set_keys(DKCT_GUI *gui, char *il)
int back = 0;
-#line 3372 "dkct-gui.ctr"
+#line 3495 "dkct-gui.ctr"
el = gui->c_el;
if(el) {
switch(el->cln) {
@@ -3017,7 +3264,7 @@ dkct_gui_set_keys(DKCT_GUI *gui, char *il)
} break;
default: {
-#line 3380 "dkct-gui.ctr"
+#line 3503 "dkct-gui.ctr"
/* Warning: Keys setting ignored for this class! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 56);
} break;
@@ -3040,7 +3287,7 @@ dkct_gui_set_keys(DKCT_GUI *gui, char *il)
}
}
-#line 3401 "dkct-gui.ctr"
+#line 3524 "dkct-gui.ctr"
return back;
}
@@ -3059,7 +3306,7 @@ dkct_gui_set_validator(DKCT_GUI *gui, char *il)
int back = 0;
-#line 3418 "dkct-gui.ctr"
+#line 3541 "dkct-gui.ctr"
co = gui->c_el;
if(co) {
switch(co->cln) {
@@ -3083,7 +3330,7 @@ dkct_gui_set_validator(DKCT_GUI *gui, char *il)
} break;
default: {
-#line 3440 "dkct-gui.ctr"
+#line 3563 "dkct-gui.ctr"
/* Warning: Setting a validator is not recommended! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 56);
} break;
@@ -3103,7 +3350,7 @@ dkct_gui_set_validator(DKCT_GUI *gui, char *il)
}
-#line 3458 "dkct-gui.ctr"
+#line 3581 "dkct-gui.ctr"
return back;
}
@@ -3124,7 +3371,7 @@ dkct_gui_set_text_style(DKCT_GUI *gui, char *il)
int back = 0;
-#line 3477 "dkct-gui.ctr"
+#line 3600 "dkct-gui.ctr"
el = gui->c_el;
if(el) {
switch(el->cln) {
@@ -3135,7 +3382,7 @@ dkct_gui_set_text_style(DKCT_GUI *gui, char *il)
} break;
default: {
-#line 3486 "dkct-gui.ctr"
+#line 3609 "dkct-gui.ctr"
/* Warning: Attribute not applicable for class! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 56);
} break;
@@ -3216,7 +3463,7 @@ dkct_gui_set_text_style(DKCT_GUI *gui, char *il)
}
-#line 3565 "dkct-gui.ctr"
+#line 3688 "dkct-gui.ctr"
return back;
}
@@ -3237,7 +3484,7 @@ dkct_gui_set_button_style(DKCT_GUI *gui, char *il)
int back = 0;
-#line 3584 "dkct-gui.ctr"
+#line 3707 "dkct-gui.ctr"
el = gui->c_el;
if(el) {
p1 = dk3str_c8_start(il, NULL);
@@ -3277,7 +3524,7 @@ dkct_gui_set_button_style(DKCT_GUI *gui, char *il)
}
-#line 3622 "dkct-gui.ctr"
+#line 3745 "dkct-gui.ctr"
return back;
}
@@ -3298,15 +3545,21 @@ dkct_gui_set_notebook_style(DKCT_GUI *gui, char *il)
int back = 0;
-#line 3641 "dkct-gui.ctr"
+#line 3764 "dkct-gui.ctr"
el = gui->c_el;
if(el) {
switch(el->cln) {
- case 12: {
+ case 12:
+ case 42: /* 2018-05-29 Further books added */
+ case 43:
+ case 44:
+ case 45:
+ case 46:
+ {
} break;
default: {
-#line 3647 "dkct-gui.ctr"
+#line 3776 "dkct-gui.ctr"
/* Warning: Attribute not applicable for class! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 56);
} break;
@@ -3356,7 +3609,7 @@ dkct_gui_set_notebook_style(DKCT_GUI *gui, char *il)
}
-#line 3695 "dkct-gui.ctr"
+#line 3824 "dkct-gui.ctr"
return back;
}
@@ -3377,7 +3630,7 @@ dkct_gui_set_slider_style(DKCT_GUI *gui, char *il)
int back = 0;
-#line 3714 "dkct-gui.ctr"
+#line 3843 "dkct-gui.ctr"
el = gui->c_el;
if(el) {
switch(el->cln) {
@@ -3385,7 +3638,7 @@ dkct_gui_set_slider_style(DKCT_GUI *gui, char *il)
} break;
default: {
-#line 3720 "dkct-gui.ctr"
+#line 3849 "dkct-gui.ctr"
/* Warning: Attribute not applicable for class! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 56);
} break;
@@ -3433,7 +3686,7 @@ dkct_gui_set_slider_style(DKCT_GUI *gui, char *il)
}
-#line 3766 "dkct-gui.ctr"
+#line 3895 "dkct-gui.ctr"
return back;
}
@@ -3454,7 +3707,7 @@ dkct_gui_set_splitter_window_style(DKCT_GUI *gui, char *il)
int back = 0;
-#line 3785 "dkct-gui.ctr"
+#line 3914 "dkct-gui.ctr"
el = gui->c_el;
if(el) {
switch(el->cln) {
@@ -3462,7 +3715,7 @@ dkct_gui_set_splitter_window_style(DKCT_GUI *gui, char *il)
} break;
default: {
-#line 3791 "dkct-gui.ctr"
+#line 3920 "dkct-gui.ctr"
/* Warning: Attribute not applicable for class! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 56);
} break;
@@ -3511,7 +3764,7 @@ dkct_gui_set_splitter_window_style(DKCT_GUI *gui, char *il)
}
-#line 3838 "dkct-gui.ctr"
+#line 3967 "dkct-gui.ctr"
return back;
}
@@ -3532,7 +3785,7 @@ dkct_gui_set_bitmap_button_style(DKCT_GUI *gui, char *il)
int back = 0;
-#line 3857 "dkct-gui.ctr"
+#line 3986 "dkct-gui.ctr"
el = gui->c_el;
if(el) {
switch(el->cln) {
@@ -3543,7 +3796,7 @@ dkct_gui_set_bitmap_button_style(DKCT_GUI *gui, char *il)
} break;
default: {
-#line 3866 "dkct-gui.ctr"
+#line 3995 "dkct-gui.ctr"
/* Warning: Attribute not applicable to object! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 56);
} break;
@@ -3585,7 +3838,7 @@ dkct_gui_set_bitmap_button_style(DKCT_GUI *gui, char *il)
}
-#line 3906 "dkct-gui.ctr"
+#line 4035 "dkct-gui.ctr"
return back;
}
@@ -3606,7 +3859,7 @@ dkct_gui_set_gauge_style(DKCT_GUI *gui, char *il)
int back = 0;
-#line 3925 "dkct-gui.ctr"
+#line 4054 "dkct-gui.ctr"
el = gui->c_el;
if(el) {
switch(el->cln) {
@@ -3641,7 +3894,7 @@ dkct_gui_set_gauge_style(DKCT_GUI *gui, char *il)
}
-#line 3958 "dkct-gui.ctr"
+#line 4087 "dkct-gui.ctr"
return back;
}
@@ -3661,7 +3914,7 @@ dkct_gui_set_icon(DKCT_GUI *gui, char *il)
int back = 0;
-#line 3976 "dkct-gui.ctr"
+#line 4105 "dkct-gui.ctr"
el = gui->c_el;
if(el) {
dk3_release(el->icon);
@@ -3687,7 +3940,7 @@ dkct_gui_set_icon(DKCT_GUI *gui, char *il)
}
-#line 4000 "dkct-gui.ctr"
+#line 4129 "dkct-gui.ctr"
return back;
}
@@ -3708,7 +3961,7 @@ dkct_gui_set_menu_item_style(DKCT_GUI *gui, char *il)
int back = 0;
-#line 4019 "dkct-gui.ctr"
+#line 4148 "dkct-gui.ctr"
el = gui->c_el;
if(el) {
switch(el->cln) {
@@ -3718,7 +3971,7 @@ dkct_gui_set_menu_item_style(DKCT_GUI *gui, char *il)
} break;
default: {
-#line 4027 "dkct-gui.ctr"
+#line 4156 "dkct-gui.ctr"
/* Warning: Attribute not applicable for class! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 56);
} break;
@@ -3763,7 +4016,7 @@ dkct_gui_set_menu_item_style(DKCT_GUI *gui, char *il)
}
-#line 4070 "dkct-gui.ctr"
+#line 4199 "dkct-gui.ctr"
return back;
}
@@ -3784,7 +4037,7 @@ dkct_gui_set_toolbar_style(DKCT_GUI *gui, char *il)
int back = 0;
-#line 4089 "dkct-gui.ctr"
+#line 4218 "dkct-gui.ctr"
el = gui->c_el;
if(el) {
switch(el->cln) {
@@ -3792,7 +4045,7 @@ dkct_gui_set_toolbar_style(DKCT_GUI *gui, char *il)
} break;
default: {
-#line 4095 "dkct-gui.ctr"
+#line 4224 "dkct-gui.ctr"
/* Warning: Attribute not applicable for class! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 56);
} break;
@@ -3845,7 +4098,7 @@ dkct_gui_set_toolbar_style(DKCT_GUI *gui, char *il)
}
-#line 4146 "dkct-gui.ctr"
+#line 4275 "dkct-gui.ctr"
return back;
}
@@ -3867,7 +4120,7 @@ dkct_gui_set_choices(DKCT_GUI *gui, char *il)
int back = 0;
-#line 4166 "dkct-gui.ctr"
+#line 4295 "dkct-gui.ctr"
el = gui->c_el;
if(el) {
switch(el->cln) {
@@ -3880,7 +4133,7 @@ dkct_gui_set_choices(DKCT_GUI *gui, char *il)
} break;
default: {
-#line 4177 "dkct-gui.ctr"
+#line 4306 "dkct-gui.ctr"
/* Warning: Attribute not applicable to class! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 56);
} break;
@@ -3891,7 +4144,7 @@ dkct_gui_set_choices(DKCT_GUI *gui, char *il)
p2 = dk3str_c8_next(p1, NULL);
if(p2) {
-#line 4186 "dkct-gui.ctr"
+#line 4315 "dkct-gui.ctr"
if(sscanf(p1, "%i", &i) == 1) {
if(i > 0) {
el->nChoices = i;
@@ -3912,7 +4165,7 @@ dkct_gui_set_choices(DKCT_GUI *gui, char *il)
}
} else {
-#line 4205 "dkct-gui.ctr"
+#line 4334 "dkct-gui.ctr"
if(el->choices) {
/* Warning: Redefinition */
dkct_to_log_3(gui->psrc,1,DK3_LL_WARNING,74,75,el->choices);
@@ -3933,7 +4186,7 @@ dkct_gui_set_choices(DKCT_GUI *gui, char *il)
}
-#line 4224 "dkct-gui.ctr"
+#line 4353 "dkct-gui.ctr"
return back;
}
@@ -3953,7 +4206,7 @@ dkct_gui_set_list_box_style(DKCT_GUI *gui, char *il)
int back = 0;
-#line 4242 "dkct-gui.ctr"
+#line 4371 "dkct-gui.ctr"
el = gui->c_el;
if(el) {
switch(el->cln) {
@@ -3963,7 +4216,7 @@ dkct_gui_set_list_box_style(DKCT_GUI *gui, char *il)
} break;
default: {
-#line 4250 "dkct-gui.ctr"
+#line 4379 "dkct-gui.ctr"
/* Warning: Attribute not applicable to class! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 56);
} break;
@@ -3992,7 +4245,7 @@ dkct_gui_set_list_box_style(DKCT_GUI *gui, char *il)
}
-#line 4277 "dkct-gui.ctr"
+#line 4406 "dkct-gui.ctr"
return back;
}
@@ -4014,7 +4267,7 @@ dkct_gui_set_rb_max(DKCT_GUI *gui, char *il, int how)
int back = 0;
-#line 4297 "dkct-gui.ctr"
+#line 4426 "dkct-gui.ctr"
el = gui->c_el;
if(el) {
switch(el->cln) {
@@ -4023,7 +4276,7 @@ dkct_gui_set_rb_max(DKCT_GUI *gui, char *il, int how)
} break;
default: {
-#line 4304 "dkct-gui.ctr"
+#line 4433 "dkct-gui.ctr"
/* Warning: Attribute not applicable to class! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 56);
} break;
@@ -4058,7 +4311,7 @@ dkct_gui_set_rb_max(DKCT_GUI *gui, char *il, int how)
case 41: {
p1 = dk3str_c8_start(il, NULL);
-#line 4337 "dkct-gui.ctr"
+#line 4466 "dkct-gui.ctr"
if(p1) {
if(sscanf(p1, "%d", &i) == 1) {
if(i > 0) {
@@ -4070,26 +4323,26 @@ dkct_gui_set_rb_max(DKCT_GUI *gui, char *il, int how)
}
} else {
-#line 4347 "dkct-gui.ctr"
+#line 4476 "dkct-gui.ctr"
(gui->psrc)->ec = DK3_ERROR_SYNTAX;
dkct_to_log_3(gui->psrc, 1, DK3_LL_ERROR, 82, 83, p1);
}
} else {
-#line 4351 "dkct-gui.ctr"
+#line 4480 "dkct-gui.ctr"
(gui->psrc)->ec = DK3_ERROR_SYNTAX;
dkct_to_log_3(gui->psrc, 1, DK3_LL_ERROR, 76, 77, p1);
}
}
-#line 4355 "dkct-gui.ctr"
+#line 4484 "dkct-gui.ctr"
} break;
}
}
}
-#line 4360 "dkct-gui.ctr"
+#line 4489 "dkct-gui.ctr"
return back;
}
@@ -4111,7 +4364,7 @@ dkct_gui_set_states(DKCT_GUI *gui, char *il)
int back = 0;
-#line 4380 "dkct-gui.ctr"
+#line 4509 "dkct-gui.ctr"
el = gui->c_el;
if(el) {
switch(el->cln) {
@@ -4120,7 +4373,7 @@ dkct_gui_set_states(DKCT_GUI *gui, char *il)
} break;
default: {
-#line 4387 "dkct-gui.ctr"
+#line 4516 "dkct-gui.ctr"
/* Warning: Attribute not applicable to class! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 56);
} break;
@@ -4173,7 +4426,7 @@ dkct_gui_set_states(DKCT_GUI *gui, char *il)
}
-#line 4438 "dkct-gui.ctr"
+#line 4567 "dkct-gui.ctr"
return back;
}
@@ -4193,7 +4446,7 @@ dkct_gui_set_bitmap(DKCT_GUI *gui, char *il)
int back = 0;
-#line 4456 "dkct-gui.ctr"
+#line 4585 "dkct-gui.ctr"
el = gui->c_el;
if(el) {
switch(el->cln) {
@@ -4205,7 +4458,7 @@ dkct_gui_set_bitmap(DKCT_GUI *gui, char *il)
} break;
default: {
-#line 4466 "dkct-gui.ctr"
+#line 4595 "dkct-gui.ctr"
/* Warning: Attribute not applicable to class! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 56);
} break;
@@ -4228,7 +4481,7 @@ dkct_gui_set_bitmap(DKCT_GUI *gui, char *il)
}
-#line 4487 "dkct-gui.ctr"
+#line 4616 "dkct-gui.ctr"
return back;
}
@@ -4248,12 +4501,12 @@ dkct_gui_set_bitmap_disabled(DKCT_GUI *gui, char *il)
int back = 0;
-#line 4505 "dkct-gui.ctr"
+#line 4634 "dkct-gui.ctr"
el = gui->c_el;
if(el) {
if(!((el->cln == 16) || (el->cln == 40))) {
-#line 4508 "dkct-gui.ctr"
+#line 4637 "dkct-gui.ctr"
/* Warning: Attribute not applicable to class! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 56);
}
@@ -4273,7 +4526,7 @@ dkct_gui_set_bitmap_disabled(DKCT_GUI *gui, char *il)
}
-#line 4526 "dkct-gui.ctr"
+#line 4655 "dkct-gui.ctr"
return back;
}
@@ -4293,12 +4546,12 @@ dkct_gui_set_bitmap_selected(DKCT_GUI *gui, char *il)
int back = 0;
-#line 4544 "dkct-gui.ctr"
+#line 4673 "dkct-gui.ctr"
el = gui->c_el;
if(el) {
if(el->cln != 16) {
-#line 4547 "dkct-gui.ctr"
+#line 4676 "dkct-gui.ctr"
/* Warning: Attribute not applicable for class! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 56);
}
@@ -4320,7 +4573,7 @@ dkct_gui_set_bitmap_selected(DKCT_GUI *gui, char *il)
}
-#line 4567 "dkct-gui.ctr"
+#line 4696 "dkct-gui.ctr"
return back;
}
@@ -4340,12 +4593,12 @@ dkct_gui_set_bitmap_focus(DKCT_GUI *gui, char *il)
int back = 0;
-#line 4585 "dkct-gui.ctr"
+#line 4714 "dkct-gui.ctr"
el = gui->c_el;
if(el) {
if(el->cln != 16) {
-#line 4588 "dkct-gui.ctr"
+#line 4717 "dkct-gui.ctr"
/* Warning: Attribute not applicable for class! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 56);
}
@@ -4367,7 +4620,7 @@ dkct_gui_set_bitmap_focus(DKCT_GUI *gui, char *il)
}
-#line 4608 "dkct-gui.ctr"
+#line 4737 "dkct-gui.ctr"
return back;
}
@@ -4387,12 +4640,12 @@ dkct_gui_set_bitmap_hover(DKCT_GUI *gui, char *il)
int back = 0;
-#line 4626 "dkct-gui.ctr"
+#line 4755 "dkct-gui.ctr"
el = gui->c_el;
if(el) {
if(el->cln != 16) {
-#line 4629 "dkct-gui.ctr"
+#line 4758 "dkct-gui.ctr"
/* Warning: Attribute not applicable for class! */
dkct_to_log_1(gui->psrc, 1, DK3_LL_WARNING, 56);
}
@@ -4414,7 +4667,7 @@ dkct_gui_set_bitmap_hover(DKCT_GUI *gui, char *il)
}
-#line 4649 "dkct-gui.ctr"
+#line 4778 "dkct-gui.ctr"
return back;
}
@@ -4434,13 +4687,13 @@ dkct_add_grid_head(DKCT_GUI *gui, char const *pv, int how)
int back = 0;
-#line 4667 "dkct-gui.ctr"
+#line 4796 "dkct-gui.ctr"
if((gui->c_el) && (pv)) {
switch((gui->c_el)->cln) {
case 41: {
if(how) {
-#line 4671 "dkct-gui.ctr"
+#line 4800 "dkct-gui.ctr"
if(!((gui->c_el)->sColumnHeads)) {
(gui->c_el)->sColumnHeads = dk3sto_open_app((gui->psrc)->app);
if((gui->c_el)->sColumnHeads) {
@@ -4473,7 +4726,7 @@ dkct_add_grid_head(DKCT_GUI *gui, char const *pv, int how)
}
} else {
-#line 4702 "dkct-gui.ctr"
+#line 4831 "dkct-gui.ctr"
if(!((gui->c_el)->sRowHeads)) {
(gui->c_el)->sRowHeads = dk3sto_open_app((gui->psrc)->app);
if((gui->c_el)->sRowHeads) {
@@ -4510,7 +4763,7 @@ dkct_add_grid_head(DKCT_GUI *gui, char const *pv, int how)
}
}
-#line 4737 "dkct-gui.ctr"
+#line 4866 "dkct-gui.ctr"
return back;
}
@@ -4797,11 +5050,13 @@ dkct_set_minimum_size(DKCT_GUI *gui, char *pv)
*/
static
int
-dkct_int_compare(void const *l, void const *r, int cr)
+dkct_int_compare(void const *l, void const *r, int DK3_ARG_UNUSED(cr) )
{
int const *pl;
int const *pr;
int back = 0;
+
+ DK3_UNUSED_ARG(cr)
pl = (int const *)l; pr = (int const *)r;
if(pl) {
if(pr) {
@@ -4983,7 +5238,7 @@ dkct_gui_process_object_line(DKCT_GUI *gui, char *il)
int action; /* Attribute index. */
-#line 5208 "dkct-gui.ctr"
+#line 5339 "dkct-gui.ctr"
if(gui->c_el) {
pv = dk3str_c8_chr(il, '=');
if(pv) {
@@ -4995,67 +5250,67 @@ dkct_gui_process_object_line(DKCT_GUI *gui, char *il)
switch(action) {
case 0: case 23: {
-#line 5218 "dkct-gui.ctr"
+#line 5349 "dkct-gui.ctr"
back = dkct_gui_set_expand(gui, pv);
} break;
case 1: {
-#line 5221 "dkct-gui.ctr"
+#line 5352 "dkct-gui.ctr"
back = dkct_gui_set_type(gui, pv);
} break;
case 2: {
-#line 5224 "dkct-gui.ctr"
+#line 5355 "dkct-gui.ctr"
back = dkct_gui_set_menu_bar(gui, pv);
} break;
case 3: {
-#line 5227 "dkct-gui.ctr"
+#line 5358 "dkct-gui.ctr"
back = dkct_gui_set_tool_bar(gui, pv);
} break;
case 4: {
-#line 5230 "dkct-gui.ctr"
+#line 5361 "dkct-gui.ctr"
back = dkct_gui_set_status_bar(gui, pv);
} break;
case 5: {
-#line 5233 "dkct-gui.ctr"
+#line 5364 "dkct-gui.ctr"
back = dkct_gui_add_contents(gui, pv);
} break;
case 6: {
-#line 5236 "dkct-gui.ctr"
+#line 5367 "dkct-gui.ctr"
back = dkct_gui_set_text(gui, pv);
} break;
case 7: {
-#line 5239 "dkct-gui.ctr"
+#line 5370 "dkct-gui.ctr"
back = dkct_gui_set_id(gui, pv);
} break;
case 8: {
-#line 5242 "dkct-gui.ctr"
+#line 5373 "dkct-gui.ctr"
back = dkct_gui_set_tip_text(gui, pv);
} break;
case 9: {
-#line 5245 "dkct-gui.ctr"
+#line 5376 "dkct-gui.ctr"
back = dkct_gui_set_proportion(gui, pv);
} break;
case 10: {
-#line 5248 "dkct-gui.ctr"
+#line 5379 "dkct-gui.ctr"
back = dkct_gui_set_status_text(gui, pv);
} break;
case 11: {
-#line 5251 "dkct-gui.ctr"
+#line 5382 "dkct-gui.ctr"
back = dkct_gui_set_border(gui, pv);
} break;
case 12: {
-#line 5254 "dkct-gui.ctr"
+#line 5385 "dkct-gui.ctr"
back = dkct_gui_set_constructor(gui, pv);
} break;
case 13: {
@@ -5209,7 +5464,7 @@ dkct_gui_process_object_line(DKCT_GUI *gui, char *il)
}
-#line 5406 "dkct-gui.ctr"
+#line 5537 "dkct-gui.ctr"
return back;
}
@@ -5230,7 +5485,7 @@ dkct_gui_process_option(DKCT_GUI *gui, char *il)
char *p2; /* Next string to process. */
-#line 5425 "dkct-gui.ctr"
+#line 5556 "dkct-gui.ctr"
if(gui->c_el) {
pv = dk3str_c8_chr(il, '=');
if(pv) {
@@ -5266,7 +5521,7 @@ dkct_gui_process_option(DKCT_GUI *gui, char *il)
}
-#line 5459 "dkct-gui.ctr"
+#line 5590 "dkct-gui.ctr"
return back;
}
@@ -5284,18 +5539,18 @@ dkct_gui_add_line(DKCT_GUI *gui, char *il)
char *p1; /* Start of input line. */
-#line 5475 "dkct-gui.ctr"
+#line 5606 "dkct-gui.ctr"
p1 = dk3str_c8_start(il, NULL);
if(p1) {
switch(*p1) {
case '#': {
-#line 5479 "dkct-gui.ctr"
+#line 5610 "dkct-gui.ctr"
back = 1;
} break;
case '.': {
-#line 5482 "dkct-gui.ctr"
+#line 5613 "dkct-gui.ctr"
p1++;
p1 = dk3str_c8_start(p1, NULL);
if(p1) {
@@ -5308,7 +5563,7 @@ dkct_gui_add_line(DKCT_GUI *gui, char *il)
} break;
case '[': {
-#line 5493 "dkct-gui.ctr"
+#line 5624 "dkct-gui.ctr"
p1++;
p1 = dk3str_c8_start(p1, NULL);
if(p1) {
@@ -5321,14 +5576,14 @@ dkct_gui_add_line(DKCT_GUI *gui, char *il)
} break;
default: {
-#line 5504 "dkct-gui.ctr"
+#line 5635 "dkct-gui.ctr"
back = dkct_gui_process_object_line(gui, p1);
} break;
}
}
-#line 5509 "dkct-gui.ctr"
+#line 5640 "dkct-gui.ctr"
return back;
}
@@ -5368,7 +5623,7 @@ dkct_gui_report_illegal_parent_child(
char const *pname;
-#line 5547 "dkct-gui.ctr"
+#line 5678 "dkct-gui.ctr"
cname = pname = dkct_gui_out_kw[197];
if(co) {
if(co->cln >= 0) {
@@ -5383,7 +5638,36 @@ dkct_gui_report_illegal_parent_child(
dkct_to_log_5(psrc, 1, DK3_LL_ERROR, 88, 89, 90, pname, cname);
-#line 5560 "dkct-gui.ctr"
+#line 5691 "dkct-gui.ctr"
+}
+
+
+
+static
+int
+dkct_gui_is_stock_element(DKCT_GUI_ELEMENT *el)
+{
+ int back = 0;
+
+
+#line 5701 "dkct-gui.ctr"
+ if ((15 == el->cln) || (37 == el->cln)) {
+
+#line 5702 "dkct-gui.ctr"
+ if (NULL != el->idname) {
+
+#line 5703 "dkct-gui.ctr"
+ if (0 < dk3str_c8_array_index(dkct_gui_stock_item_names, el->idname, 1)) {
+ back = 1;
+
+#line 5705 "dkct-gui.ctr"
+ }
+ }
+ }
+
+
+#line 5709 "dkct-gui.ctr"
+ return back;
}
@@ -5404,7 +5688,7 @@ dkct_gui_element_check(DKCT_GUI_ELEMENT *el, DKCT_SRC *psrc)
int szfound = 0; /* Flag: Sizer found. */
-#line 5579 "dkct-gui.ctr"
+#line 5729 "dkct-gui.ctr"
dp = (DKCT_GUI_ELEMENT *)(el->parent);
psrc->lineno = ((el->lndef) > 0UL) ? (el->lndef) : (el->lndecl);
dk3app_set_source_line(psrc->app, psrc->lineno);
@@ -5415,6 +5699,7 @@ dkct_gui_element_check(DKCT_GUI_ELEMENT *el, DKCT_SRC *psrc)
case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7: case 8:
case 9: case 10: case 11: case 12: case 13: case 14: case 35: case 36:
case 38:
+ case 42: case 43: case 44: case 45: case 46: case 47: /* 2018-05-29 */
{
back = 0;
nco = dkct_gui_get_number_contents(el);
@@ -5435,7 +5720,7 @@ dkct_gui_element_check(DKCT_GUI_ELEMENT *el, DKCT_SRC *psrc)
}
if(!(back)) {
-#line 5608 "dkct-gui.ctr"
+#line 5759 "dkct-gui.ctr"
}
} break;
}
@@ -5452,14 +5737,29 @@ dkct_gui_element_check(DKCT_GUI_ELEMENT *el, DKCT_SRC *psrc)
|| (el->menuItemStyle != DKCT_GUI_MENU_ITEM_SEPARATOR)
)
{
- if(el->cln == 28) {
- /* ERROR: Missing text! */
+ if((el->cln == 28) || (0 != dkct_gui_is_stock_element(el))) {
+ /* Info: Missing text! */
+
+
+#line 5778 "dkct-gui.ctr"
+#if 0
+ /* 2018-05-28 Removed
+ Do not issue message about wxTextCtrl, wxMenuItem, wxButton
+ without text.
+ For wxTextCtrl the field is empty, user should type text.
+ For wxMenuItem and wxButton create stock objects if
+ no text present.
+ */
dkct_to_log_1(psrc, 1, DK3_LL_INFO, 49);
+#endif
} else {
back = 0;
-#line 5629 "dkct-gui.ctr"
+#line 5790 "dkct-gui.ctr"
/* ERROR: Missing text! */
+
+
+#line 5792 "dkct-gui.ctr"
dkct_to_log_1(psrc, 1, DK3_LL_ERROR, 49);
}
}
@@ -5477,7 +5777,7 @@ dkct_gui_element_check(DKCT_GUI_ELEMENT *el, DKCT_SRC *psrc)
if(!(el->idname)) {
back = 0;
-#line 5646 "dkct-gui.ctr"
+#line 5808 "dkct-gui.ctr"
/* ERROR: Missing ID! */
dkct_to_log_1(psrc, 1, DK3_LL_ERROR, 46);
}
@@ -5493,7 +5793,7 @@ dkct_gui_element_check(DKCT_GUI_ELEMENT *el, DKCT_SRC *psrc)
if(el->gridcolumns == 0) {
back = 0;
-#line 5660 "dkct-gui.ctr"
+#line 5822 "dkct-gui.ctr"
/* ERROR: Missing grid! */
dkct_to_log_1(psrc, 1, DK3_LL_ERROR, 50);
}
@@ -5515,7 +5815,7 @@ dkct_gui_element_check(DKCT_GUI_ELEMENT *el, DKCT_SRC *psrc)
{
back = 0;
-#line 5680 "dkct-gui.ctr"
+#line 5842 "dkct-gui.ctr"
/* ERROR: Missing bitmap! */
dkct_to_log_1(psrc, 1, DK3_LL_ERROR, 51);
}
@@ -5532,7 +5832,7 @@ dkct_gui_element_check(DKCT_GUI_ELEMENT *el, DKCT_SRC *psrc)
if((!(el->choices)) || (el->nChoices == 0)) {
back = 0;
-#line 5695 "dkct-gui.ctr"
+#line 5857 "dkct-gui.ctr"
/* ERROR: Missing choices! */
dkct_to_log_1(psrc, 1, DK3_LL_ERROR, 52);
}
@@ -5544,10 +5844,14 @@ dkct_gui_element_check(DKCT_GUI_ELEMENT *el, DKCT_SRC *psrc)
*/
if(back) {
switch(el->cln) {
- case 12: case 13: case 28: {
+ /*
+ 2018-05-29 Removed case 12 branch
+ Requiring a size is not necessary for a wxNotebook.
+ */
+ case 13: case 47: case 28: {
if(!((el->sizex > 0) && (el->sizey > 0))) {
-#line 5708 "dkct-gui.ctr"
+#line 5874 "dkct-gui.ctr"
if(el->cln == 28) {
/*
Warning: Missing size.
@@ -5574,7 +5878,7 @@ dkct_gui_element_check(DKCT_GUI_ELEMENT *el, DKCT_SRC *psrc)
if(el->maxRowsCols < 1) {
back = 0;
-#line 5733 "dkct-gui.ctr"
+#line 5899 "dkct-gui.ctr"
/* ERROR: Missing rows or columns maximum! */
dkct_to_log_1(psrc, 1, DK3_LL_ERROR, 54);
}
@@ -5597,7 +5901,7 @@ dkct_gui_element_check(DKCT_GUI_ELEMENT *el, DKCT_SRC *psrc)
} else {
back = 0;
-#line 5754 "dkct-gui.ctr"
+#line 5920 "dkct-gui.ctr"
/* ERROR: Illegal parent/child combination. */
dkct_gui_report_illegal_parent_child(el, dp, psrc);
}
@@ -5619,7 +5923,7 @@ dkct_gui_element_check(DKCT_GUI_ELEMENT *el, DKCT_SRC *psrc)
} else {
back = 0;
-#line 5774 "dkct-gui.ctr"
+#line 5940 "dkct-gui.ctr"
/* ERROR: Illegal parent/child combination. */
dkct_gui_report_illegal_parent_child(el, dp, psrc);
}
@@ -5634,7 +5938,7 @@ dkct_gui_element_check(DKCT_GUI_ELEMENT *el, DKCT_SRC *psrc)
if((dp->cln == 35) || (dp->cln == 36)) {
} else {
-#line 5787 "dkct-gui.ctr"
+#line 5953 "dkct-gui.ctr"
/* ERROR: Illegal parent/child combination. */
dkct_gui_report_illegal_parent_child(el, dp, psrc);
}
@@ -5668,7 +5972,7 @@ dkct_gui_element_check(DKCT_GUI_ELEMENT *el, DKCT_SRC *psrc)
}
}
-#line 5819 "dkct-gui.ctr"
+#line 5985 "dkct-gui.ctr"
return back;
}
@@ -5687,7 +5991,7 @@ dkct_gui_classnames_check(DKCT_SRC *psrc)
int back = 1;
-#line 5836 "dkct-gui.ctr"
+#line 6002 "dkct-gui.ctr"
if(psrc->gui) {
gui = (DKCT_GUI *)(psrc->gui);
dk3sto_it_reset(gui->i_el_by_num);
@@ -5704,7 +6008,7 @@ dkct_gui_classnames_check(DKCT_SRC *psrc)
if(!(el->cname)) {
back = 0;
-#line 5851 "dkct-gui.ctr"
+#line 6017 "dkct-gui.ctr"
/* ERROR: Missing object class name! */
if(el->name) {
dkct_to_log_3(gui->psrc, 1, DK3_LL_ERROR, 93, 94, el->name);
@@ -5721,7 +6025,7 @@ dkct_gui_classnames_check(DKCT_SRC *psrc)
}
}
-#line 5866 "dkct-gui.ctr"
+#line 6032 "dkct-gui.ctr"
return back;
}
@@ -5745,7 +6049,7 @@ dkct_gui_dependency_check(DKCT_SRC *psrc)
size_t i; /* Current index to check. */
-#line 5888 "dkct-gui.ctr"
+#line 6054 "dkct-gui.ctr"
if(psrc->gui) {
gui = (DKCT_GUI *)(psrc->gui);
bm = dk3bm_open(gui->no, gui->no, psrc->app);
@@ -5796,7 +6100,7 @@ dkct_gui_dependency_check(DKCT_SRC *psrc)
}
}
-#line 5937 "dkct-gui.ctr"
+#line 6103 "dkct-gui.ctr"
return back;
}
@@ -5808,14 +6112,14 @@ dkct_gui_check(DKCT_SRC *psrc)
int back = 0;
-#line 5947 "dkct-gui.ctr"
+#line 6113 "dkct-gui.ctr"
if(dkct_gui_classnames_check(psrc)) {
if(dkct_gui_dependency_check(psrc)) {
back = 1;
}
}
-#line 5952 "dkct-gui.ctr"
+#line 6118 "dkct-gui.ctr"
return back;
}
@@ -6151,14 +6455,15 @@ dkct_gui_add_object_to_sizer(
DKCT_GUI_ELEMENT *co,
DKCT_GUI_ELEMENT *pa,
DKCT_SRC *psrc,
- DKCT_GUI *gui
+ DKCT_GUI * DK3_SILENCE_ARG_UNUSED(gui)
)
{
char bu[64]; /* Buffer for integer values. */
int det = 0; /* Details to use. */
-#line 6293 "dkct-gui.ctr"
+#line 6459 "dkct-gui.ctr"
+ DK3_UNUSED_ARG(gui)
/*
Last modifications to object before adding it to parent.
*/
@@ -6175,17 +6480,17 @@ dkct_gui_add_object_to_sizer(
switch(pa->cln) {
case 7: {
-#line 6308 "dkct-gui.ctr"
+#line 6475 "dkct-gui.ctr"
/* sizer */
if(dkct_gui_need_flags(co)) {
det = 1;
-#line 6311 "dkct-gui.ctr"
+#line 6478 "dkct-gui.ctr"
}
if((co->border >= 0) && (co->borderPos)) {
det = 2;
-#line 6314 "dkct-gui.ctr"
+#line 6481 "dkct-gui.ctr"
}
fputs(dkct_gui_out_kw[8], psrc->fipo);
fputs(pa->name, psrc->fipo);
@@ -6249,7 +6554,7 @@ dkct_gui_add_object_to_sizer(
} break;
case 5: case 6: case 8: case 9: case 10: {
-#line 6376 "dkct-gui.ctr"
+#line 6543 "dkct-gui.ctr"
/*
sizer->Add(object, proportion, flags, border);
*/
@@ -6257,17 +6562,17 @@ dkct_gui_add_object_to_sizer(
if(co->proportion) {
det = 1;
-#line 6382 "dkct-gui.ctr"
+#line 6549 "dkct-gui.ctr"
}
if(dkct_gui_need_flags(co)) {
det = 2;
-#line 6385 "dkct-gui.ctr"
+#line 6552 "dkct-gui.ctr"
}
if((co->border >= 0) && (co->borderPos)) {
det = 3;
-#line 6388 "dkct-gui.ctr"
+#line 6555 "dkct-gui.ctr"
}
fputs(dkct_gui_out_kw[8], psrc->fipo);
fputs(pa->name, psrc->fipo);
@@ -6327,7 +6632,7 @@ dkct_gui_add_object_to_sizer(
}
-#line 6446 "dkct-gui.ctr"
+#line 6613 "dkct-gui.ctr"
}
@@ -6344,16 +6649,23 @@ dkct_gui_set_parents_sizer(
DKCT_GUI_ELEMENT *co,
DKCT_GUI_ELEMENT *pa,
DKCT_SRC *psrc,
- DKCT_GUI *gui
+ DKCT_GUI * DK3_SILENCE_ARG_UNUSED(gui)
)
{
char const *pname = NULL; /* Parent object name. */
-#line 6467 "dkct-gui.ctr"
+#line 6634 "dkct-gui.ctr"
+ DK3_UNUSED_ARG(gui)
if(pa) { pname = pa->name; }
if(!(pname)) {
- if(pa->cln != 1) { pname = dkct_gui_out_kw[30]; }
+ if (pa) {
+ if(pa->cln != 1) {
+ pname = dkct_gui_out_kw[30];
+ }
+ } else {
+ pname = dkct_gui_out_kw[30];
+ }
}
fputs(dkct_gui_out_kw[8], psrc->fipo);
if(pname) {
@@ -6366,7 +6678,7 @@ dkct_gui_set_parents_sizer(
fputs(dkct_gui_out_kw[0], psrc->fipo);
-#line 6481 "dkct-gui.ctr"
+#line 6655 "dkct-gui.ctr"
}
@@ -6439,9 +6751,13 @@ dkct_gui_write_idname(DKCT_GUI_ELEMENT *co, DKCT_SRC *psrc)
*/
static
void
-dkct_gui_write_size(DKCT_SRC *psrc, int w, int h, int rec, DKCT_GUI_ELEMENT *co)
+dkct_gui_write_size(
+ DKCT_SRC *psrc, int w, int h, int rec,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(co)
+)
{
char bu[256];
+ DK3_UNUSED_ARG(co)
if((w > 0) && (h > 0)) {
sprintf(bu, "%d, %d", w, h);
fputs(dkct_gui_out_kw[81], psrc->fipo);
@@ -6464,7 +6780,7 @@ static
void
dkct_gui_constructor_frame_dialog(
DKCT_GUI_ELEMENT *co,
- DKCT_GUI_ELEMENT *dp,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(dp),
DKCT_GUI_ELEMENT *pw,
DKCT_SRC *psrc,
DKCT_GUI *gui
@@ -6472,6 +6788,7 @@ dkct_gui_constructor_frame_dialog(
{
int det = 0; /* Details level. */
+ DK3_UNUSED_ARG(dp)
if(co->text) det = 1;
if((co->sizex > 0) && (co->sizey > 0)) det = 2;
fputs(dkct_gui_out_kw[2], psrc->fipo);
@@ -6508,12 +6825,15 @@ static
void
dkct_gui_constructor_boxsizer(
DKCT_GUI_ELEMENT *co,
- DKCT_GUI_ELEMENT *dp,
- DKCT_GUI_ELEMENT *pw,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(dp),
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(pw),
DKCT_SRC *psrc,
- DKCT_GUI *gui
+ DKCT_GUI * DK3_SILENCE_ARG_UNUSED(gui)
)
{
+ DK3_UNUSED_ARG(dp)
+ DK3_UNUSED_ARG(pw)
+ DK3_UNUSED_ARG(gui)
fputs(dkct_gui_out_kw[2], psrc->fipo);
switch(co->direction) {
case DKCT_GUI_DIRECTION_VERTICAL: {
@@ -6562,10 +6882,10 @@ static
void
dkct_gui_constructor_gridsizer(
DKCT_GUI_ELEMENT *co,
- DKCT_GUI_ELEMENT *dp,
- DKCT_GUI_ELEMENT *pw,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(dp),
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(pw),
DKCT_SRC *psrc,
- DKCT_GUI *gui
+ DKCT_GUI * DK3_SILENCE_ARG_UNUSED(gui)
)
{
char bu[256]; /* Buffer for integer values. */
@@ -6574,6 +6894,9 @@ dkct_gui_constructor_gridsizer(
int y = 0; /* Start row. */
int x = 0; /* Start column. */
+ DK3_UNUSED_ARG(dp)
+ DK3_UNUSED_ARG(pw)
+ DK3_UNUSED_ARG(gui)
c = co->gridcolumns;
r = co->gridrows;
x = co->gridgapx;
@@ -6611,16 +6934,19 @@ static
void
dkct_gui_constructor_gridbagsizer(
DKCT_GUI_ELEMENT *co,
- DKCT_GUI_ELEMENT *dp,
- DKCT_GUI_ELEMENT *pw,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(dp),
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(pw),
DKCT_SRC *psrc,
- DKCT_GUI *gui
+ DKCT_GUI * DK3_SILENCE_ARG_UNUSED(gui)
)
{
char bu[128]; /* Buffer for integer values. */
+ DK3_UNUSED_ARG(dp)
+ DK3_UNUSED_ARG(pw)
+ DK3_UNUSED_ARG(gui)
bu[0] = '\0';
- if((co->gridgapy > -1) || (co->gridgapy > -1)) {
+ if((co->gridgapx > -1) || (co->gridgapy > -1)) {
fputs(dkct_gui_out_kw[2], psrc->fipo);
if(co->gridgapx > -1) {
sprintf(
@@ -6649,12 +6975,13 @@ static
void
dkct_gui_constructor_staticboxsizer(
DKCT_GUI_ELEMENT *co,
- DKCT_GUI_ELEMENT *dp,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(dp),
DKCT_GUI_ELEMENT *pw,
DKCT_SRC *psrc,
DKCT_GUI *gui
)
{
+ DK3_UNUSED_ARG(dp)
fputs(dkct_gui_out_kw[2], psrc->fipo);
fputs(dkct_gui_out_kw[(co->direction) ? 35 : 34], psrc->fipo);
dkct_gui_next_argument(psrc);
@@ -6679,7 +7006,7 @@ static
void
dkct_gui_constructor_panel(
DKCT_GUI_ELEMENT *co,
- DKCT_GUI_ELEMENT *dp,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(dp),
DKCT_GUI_ELEMENT *pw,
DKCT_SRC *psrc,
DKCT_GUI *gui
@@ -6687,6 +7014,7 @@ dkct_gui_constructor_panel(
{
int det = 0; /* Details level. */
+ DK3_UNUSED_ARG(dp)
if((co->sizex > 0) && (co->sizey > 0)) det = 1;
fputs(dkct_gui_out_kw[2], psrc->fipo);
dkct_gui_write_parent_name(pw, psrc, gui);
@@ -6716,7 +7044,7 @@ static
void
dkct_gui_constructor_notebook(
DKCT_GUI_ELEMENT *co,
- DKCT_GUI_ELEMENT *dp,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(dp),
DKCT_GUI_ELEMENT *pw,
DKCT_SRC *psrc,
DKCT_GUI *gui
@@ -6725,6 +7053,7 @@ dkct_gui_constructor_notebook(
int det = 0; /* Details level. */
int fe = 0; /* Flag: Found elements. */
+ DK3_UNUSED_ARG(dp)
if((co->sizex > 0) && (co->sizey > 0)) det = 1;
if(co->notebookStyle) det = 2;
fputs(dkct_gui_out_kw[2], psrc->fipo);
@@ -6738,36 +7067,89 @@ dkct_gui_constructor_notebook(
dkct_gui_write_size(psrc, co->sizex, co->sizey, 0, co);
if(det > 1) {
if((co->notebookStyle) & DKCT_GUI_NB_TOP) {
- if(fe) { fputs(dkct_gui_out_kw[44], psrc->fipo); } fe = 1;
- fputs(dkct_gui_out_kw[113], psrc->fipo);
- }
- if((co->notebookStyle) & DKCT_GUI_NB_LEFT) {
- if(fe) { fputs(dkct_gui_out_kw[44], psrc->fipo); } fe = 1;
- fputs(dkct_gui_out_kw[114], psrc->fipo);
- }
- if((co->notebookStyle) & DKCT_GUI_NB_RIGHT) {
- if(fe) { fputs(dkct_gui_out_kw[44], psrc->fipo); } fe = 1;
- fputs(dkct_gui_out_kw[115], psrc->fipo);
- }
- if((co->notebookStyle) & DKCT_GUI_NB_BOTTOM) {
- if(fe) { fputs(dkct_gui_out_kw[44], psrc->fipo); } fe = 1;
- fputs(dkct_gui_out_kw[116], psrc->fipo);
- }
- if((co->notebookStyle) & DKCT_GUI_NB_FIXEDWIDTH) {
- if(fe) { fputs(dkct_gui_out_kw[44], psrc->fipo); } fe = 1;
- fputs(dkct_gui_out_kw[117], psrc->fipo);
- }
- if((co->notebookStyle) & DKCT_GUI_NB_MULTILINE) {
- if(fe) { fputs(dkct_gui_out_kw[44], psrc->fipo); } fe = 1;
- fputs(dkct_gui_out_kw[118], psrc->fipo);
- }
- if((co->notebookStyle) & DKCT_GUI_NB_NOPAGETHEME) {
- if(fe) { fputs(dkct_gui_out_kw[44], psrc->fipo); } fe = 1;
- fputs(dkct_gui_out_kw[119], psrc->fipo);
+ switch (co->cln) {
+ case 12: {
+ if(fe) { fputs(dkct_gui_out_kw[44], psrc->fipo); } fe = 1;
+ fputs(dkct_gui_out_kw[113], psrc->fipo);
+ } break;
+ case 42: {
+ if(fe) { fputs(dkct_gui_out_kw[44], psrc->fipo); } fe = 1;
+ fputs(dkct_gui_out_kw[221], psrc->fipo);
+ } break;
+ case 43: {
+ if(fe) { fputs(dkct_gui_out_kw[44], psrc->fipo); } fe = 1;
+ fputs(dkct_gui_out_kw[222], psrc->fipo);
+ } break;
+ }
+ } else {
+ if((co->notebookStyle) & DKCT_GUI_NB_LEFT) {
+ switch (co->cln) {
+ case 12: {
+ if(fe) { fputs(dkct_gui_out_kw[44], psrc->fipo); } fe = 1;
+ fputs(dkct_gui_out_kw[114], psrc->fipo);
+ } break;
+ case 42: {
+ if(fe) { fputs(dkct_gui_out_kw[44], psrc->fipo); } fe = 1;
+ fputs(dkct_gui_out_kw[223], psrc->fipo);
+ } break;
+ case 43: {
+ if(fe) { fputs(dkct_gui_out_kw[44], psrc->fipo); } fe = 1;
+ fputs(dkct_gui_out_kw[224], psrc->fipo);
+ } break;
+ }
+ } else {
+ if((co->notebookStyle) & DKCT_GUI_NB_RIGHT) {
+ switch (co->cln) {
+ case 12: {
+ if(fe) { fputs(dkct_gui_out_kw[44], psrc->fipo); } fe = 1;
+ fputs(dkct_gui_out_kw[115], psrc->fipo);
+ } break;
+ case 42: {
+ if(fe) { fputs(dkct_gui_out_kw[44], psrc->fipo); } fe = 1;
+ fputs(dkct_gui_out_kw[225], psrc->fipo);
+ } break;
+ case 43: {
+ if(fe) { fputs(dkct_gui_out_kw[44], psrc->fipo); } fe = 1;
+ fputs(dkct_gui_out_kw[226], psrc->fipo);
+ } break;
+ }
+ } else {
+ if((co->notebookStyle) & DKCT_GUI_NB_BOTTOM) {
+ switch (co->cln) {
+ case 12: {
+ if(fe) { fputs(dkct_gui_out_kw[44], psrc->fipo); } fe = 1;
+ fputs(dkct_gui_out_kw[116], psrc->fipo);
+ } break;
+ case 42: {
+ if(fe) { fputs(dkct_gui_out_kw[44], psrc->fipo); } fe = 1;
+ fputs(dkct_gui_out_kw[227], psrc->fipo);
+ } break;
+ case 43: {
+ if(fe) { fputs(dkct_gui_out_kw[44], psrc->fipo); } fe = 1;
+ fputs(dkct_gui_out_kw[228], psrc->fipo);
+ } break;
+ }
+ }
+ }
+ }
}
- if((co->notebookStyle) & DKCT_GUI_NB_FLAT) {
- if(fe) { fputs(dkct_gui_out_kw[44], psrc->fipo); } fe = 1;
- fputs(dkct_gui_out_kw[120], psrc->fipo);
+ if (12 == co->cln) {
+ if((co->notebookStyle) & DKCT_GUI_NB_FIXEDWIDTH) {
+ if(fe) { fputs(dkct_gui_out_kw[44], psrc->fipo); } fe = 1;
+ fputs(dkct_gui_out_kw[117], psrc->fipo);
+ }
+ if((co->notebookStyle) & DKCT_GUI_NB_MULTILINE) {
+ if(fe) { fputs(dkct_gui_out_kw[44], psrc->fipo); } fe = 1;
+ fputs(dkct_gui_out_kw[118], psrc->fipo);
+ }
+ if((co->notebookStyle) & DKCT_GUI_NB_NOPAGETHEME) {
+ if(fe) { fputs(dkct_gui_out_kw[44], psrc->fipo); } fe = 1;
+ fputs(dkct_gui_out_kw[119], psrc->fipo);
+ }
+ if((co->notebookStyle) & DKCT_GUI_NB_FLAT) {
+ if(fe) { fputs(dkct_gui_out_kw[44], psrc->fipo); } fe = 1;
+ fputs(dkct_gui_out_kw[120], psrc->fipo);
+ }
}
if(!(fe)) { fputs(dkct_gui_out_kw[52], psrc->fipo); }
}
@@ -6788,7 +7170,7 @@ static
void
dkct_gui_constructor_scrolledwindow(
DKCT_GUI_ELEMENT *co,
- DKCT_GUI_ELEMENT *dp,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(dp),
DKCT_GUI_ELEMENT *pw,
DKCT_SRC *psrc,
DKCT_GUI *gui
@@ -6796,6 +7178,7 @@ dkct_gui_constructor_scrolledwindow(
{
int det = 0; /* Details level. */
+ DK3_UNUSED_ARG(dp)
if((co->sizex > 0) && (co->sizey > 0)) det = 1;
if(co->direction != DKCT_GUI_DIRECTION_BOTH) det = 2;
fputs(dkct_gui_out_kw[2], psrc->fipo);
@@ -6838,7 +7221,7 @@ static
void
dkct_gui_constructor_splitterwindow(
DKCT_GUI_ELEMENT *co,
- DKCT_GUI_ELEMENT *dp,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(dp),
DKCT_GUI_ELEMENT *pw,
DKCT_SRC *psrc,
DKCT_GUI *gui
@@ -6847,6 +7230,7 @@ dkct_gui_constructor_splitterwindow(
int det = 0; /* Details level. */
int fe = 0; /* Flag: Found an element. */
+ DK3_UNUSED_ARG(dp)
if((co->sizex > 0) && (co->sizey > 0)) det = 1;
if(co->splitterStyle != DKCT_GUI_SPLITTERW_3D) det = 2;
fputs(dkct_gui_out_kw[2], psrc->fipo);
@@ -6916,7 +7300,7 @@ static
void
dkct_gui_constructor_button(
DKCT_GUI_ELEMENT *co,
- DKCT_GUI_ELEMENT *dp,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(dp),
DKCT_GUI_ELEMENT *pw,
DKCT_SRC *psrc,
DKCT_GUI *gui
@@ -6925,6 +7309,7 @@ dkct_gui_constructor_button(
int det = 0; /* Details level. */
int fe = 0; /* Flag: Found an entry. */
+ DK3_UNUSED_ARG(dp)
if(co->text) det = 1;
if((co->sizex > 0) && (co->sizey > 0)) det = 2;
if(co->buttonStyle) det = 3;
@@ -6998,7 +7383,7 @@ static
void
dkct_gui_constructor_bitmapbutton(
DKCT_GUI_ELEMENT *co,
- DKCT_GUI_ELEMENT *dp,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(dp),
DKCT_GUI_ELEMENT *pw,
DKCT_SRC *psrc,
DKCT_GUI *gui
@@ -7007,6 +7392,7 @@ dkct_gui_constructor_bitmapbutton(
int det = 0; /* Details level. */
int fe = 0; /* Flag: Found entry. */
+ DK3_UNUSED_ARG(dp)
if(co->bitmapVarName) {
det = 1;
if((co->sizex > 0) && (co->sizey > 0)) det = 2;
@@ -7073,7 +7459,7 @@ static
void
dkct_gui_constructor_choice_combo(
DKCT_GUI_ELEMENT *co,
- DKCT_GUI_ELEMENT *dp,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(dp),
DKCT_GUI_ELEMENT *pw,
DKCT_SRC *psrc,
DKCT_GUI *gui,
@@ -7082,6 +7468,7 @@ dkct_gui_constructor_choice_combo(
{
char bu[64]; /* Buffer for integer values. */
int details = 0; /* Details level. */
+ DK3_UNUSED_ARG(dp)
/*
parent, id, pos, size (1) , n (2), texts (3), validator (4)
parent, id, text, pos, size (1), n (2), texts (3), validator (4)
@@ -7143,7 +7530,7 @@ static
void
dkct_gui_constructor_checkbox(
DKCT_GUI_ELEMENT *co,
- DKCT_GUI_ELEMENT *dp,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(dp),
DKCT_GUI_ELEMENT *pw,
DKCT_SRC *psrc,
DKCT_GUI *gui
@@ -7151,6 +7538,7 @@ dkct_gui_constructor_checkbox(
{
int need_full_arguments = 0; /* Details level. */
+ DK3_UNUSED_ARG(dp)
if(co->text) need_full_arguments = 1;
if((co->sizex > 0) && (co->sizey > 0)) { need_full_arguments = 2; }
if(co->nStates == 0x03) {
@@ -7215,7 +7603,7 @@ static
void
dkct_gui_constructor_listbox(
DKCT_GUI_ELEMENT *co,
- DKCT_GUI_ELEMENT *dp,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(dp),
DKCT_GUI_ELEMENT *pw,
DKCT_SRC *psrc,
DKCT_GUI *gui
@@ -7223,6 +7611,7 @@ dkct_gui_constructor_listbox(
{
char bu[64]; /* Buffer for numeric values. */
+ DK3_UNUSED_ARG(dp)
fputs(dkct_gui_out_kw[2], psrc->fipo);
dkct_gui_write_parent_name(pw, psrc, gui);
dkct_gui_next_argument(psrc);
@@ -7298,7 +7687,7 @@ static
void
dkct_gui_constructor_radiobox(
DKCT_GUI_ELEMENT *co,
- DKCT_GUI_ELEMENT *dp,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(dp),
DKCT_GUI_ELEMENT *pw,
DKCT_SRC *psrc,
DKCT_GUI *gui
@@ -7311,6 +7700,7 @@ dkct_gui_constructor_radiobox(
int det = 0; /* Details level. */
char bu[64]; /* Buffer for numeric values. */
+ DK3_UNUSED_ARG(dp)
if((co->sizex > 0) && (co->sizey > 0)) det = 1;
if((co->nChoices > 0) || (co->nChoices == -1)) det = 2;
if(co->choices) det = 3;
@@ -7384,7 +7774,7 @@ static
void
dkct_gui_constructor_radiobutton(
DKCT_GUI_ELEMENT *co,
- DKCT_GUI_ELEMENT *dp,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(dp),
DKCT_GUI_ELEMENT *pw,
DKCT_SRC *psrc,
DKCT_GUI *gui
@@ -7392,6 +7782,7 @@ dkct_gui_constructor_radiobutton(
{
int det = 0; /* Details level. */
+ DK3_UNUSED_ARG(dp)
if((co->sizex > 0) && (co->sizey > 0)) det = 1;
if(co->startGroup) det = 2;
if(co->validator) det = 3;
@@ -7439,7 +7830,7 @@ static
void
dkct_gui_constructor_scrollbar(
DKCT_GUI_ELEMENT *co,
- DKCT_GUI_ELEMENT *dp,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(dp),
DKCT_GUI_ELEMENT *pw,
DKCT_SRC *psrc,
DKCT_GUI *gui
@@ -7447,6 +7838,7 @@ dkct_gui_constructor_scrollbar(
{
int must_write_details = 0; /* Details level. */
+ DK3_UNUSED_ARG(dp)
fputs(dkct_gui_out_kw[2], psrc->fipo);
dkct_gui_write_parent_name(pw, psrc, gui);
dkct_gui_next_argument(psrc);
@@ -7495,7 +7887,7 @@ static
void
dkct_gui_constructor_spinbutton(
DKCT_GUI_ELEMENT *co,
- DKCT_GUI_ELEMENT *dp,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(dp),
DKCT_GUI_ELEMENT *pw,
DKCT_SRC *psrc,
DKCT_GUI *gui
@@ -7503,6 +7895,7 @@ dkct_gui_constructor_spinbutton(
{
int need_details = 0; /* Details level. */
+ DK3_UNUSED_ARG(dp)
if(co->sizex > 0) { need_details = 1; }
if(co->sizey > 0) { need_details = 1; }
if(co->direction != DKCT_GUI_DIRECTION_HORIZONTAL) { need_details = 2; }
@@ -7548,7 +7941,7 @@ static
void
dkct_gui_constructor_spincontrol(
DKCT_GUI_ELEMENT *co,
- DKCT_GUI_ELEMENT *dp,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(dp),
DKCT_GUI_ELEMENT *pw,
DKCT_SRC *psrc,
DKCT_GUI *gui
@@ -7557,6 +7950,7 @@ dkct_gui_constructor_spincontrol(
char bu[64]; /* Buffer for numeric values. */
int need_details = 0; /* Details level. */
+ DK3_UNUSED_ARG(dp)
if(co->text) { need_details = 1; }
if((co->sizex > 0) && (co->sizey > 0)) { need_details = 2; }
if(co->useKeys) { need_details = 3; }
@@ -7646,7 +8040,7 @@ static
void
dkct_gui_constructor_slider(
DKCT_GUI_ELEMENT *co,
- DKCT_GUI_ELEMENT *dp,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(dp),
DKCT_GUI_ELEMENT *pw,
DKCT_SRC *psrc,
DKCT_GUI *gui
@@ -7656,6 +8050,7 @@ dkct_gui_constructor_slider(
/*
parent, id, value, min, max, pos, size (1), style (2), validator (3)
*/
+ DK3_UNUSED_ARG(dp)
if((co->sizex > 0) && (co->sizey > 0)) det = 1;
if(co->sliderStyle) det = 2;
if(co->direction != DKCT_GUI_DIRECTION_HORIZONTAL) det = 2;
@@ -7676,6 +8071,7 @@ dkct_gui_constructor_slider(
dkct_gui_next_argument(psrc);
dkct_gui_write_size(psrc, co->sizex, co->sizey, 0, co);
if(det > 1) {
+ dkct_gui_next_argument(psrc);
if(co->direction == DKCT_GUI_DIRECTION_HORIZONTAL) {
fputs(dkct_gui_out_kw[103], psrc->fipo);
} else {
@@ -7727,7 +8123,7 @@ static
void
dkct_gui_constructor_textctrl(
DKCT_GUI_ELEMENT *co,
- DKCT_GUI_ELEMENT *dp,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(dp),
DKCT_GUI_ELEMENT *pw,
DKCT_SRC *psrc,
DKCT_GUI *gui
@@ -7738,6 +8134,7 @@ dkct_gui_constructor_textctrl(
/*
parent, id, value (1), pos, size (2), style (3), validator (4)
*/
+ DK3_UNUSED_ARG(dp)
if(co->text) det = 1;
if((co->sizex > 0) && (co->sizey > 0)) det = 2;
if(co->textStyle) det = 3;
@@ -7848,7 +8245,7 @@ static
void
dkct_gui_constructor_togglebutton(
DKCT_GUI_ELEMENT *co,
- DKCT_GUI_ELEMENT *dp,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(dp),
DKCT_GUI_ELEMENT *pw,
DKCT_SRC *psrc,
DKCT_GUI *gui
@@ -7858,6 +8255,7 @@ dkct_gui_constructor_togglebutton(
/*
parent, id, label, pos, size (1), style (2), validator (3)
*/
+ DK3_UNUSED_ARG(dp)
if((co->sizex > 0) && (co->sizey > 0)) det = 1;
if(co->validator) det = 3;
fputs(dkct_gui_out_kw[2], psrc->fipo);
@@ -7899,7 +8297,7 @@ static
void
dkct_gui_constructor_gauge(
DKCT_GUI_ELEMENT *co,
- DKCT_GUI_ELEMENT *dp,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(dp),
DKCT_GUI_ELEMENT *pw,
DKCT_SRC *psrc,
DKCT_GUI *gui
@@ -7910,6 +8308,7 @@ dkct_gui_constructor_gauge(
/*
parent, id, range, pos, size (1), style (2), validator (3)
*/
+ DK3_UNUSED_ARG(dp)
if((co->sizex > 0) && (co->sizey > 0)) det = 1;
if(co->direction != DKCT_GUI_DIRECTION_HORIZONTAL) det = 2;
if(co->gaugeStyle) det = 2;
@@ -7958,7 +8357,7 @@ static
void
dkct_gui_constructor_statictext(
DKCT_GUI_ELEMENT *co,
- DKCT_GUI_ELEMENT *dp,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(dp),
DKCT_GUI_ELEMENT *pw,
DKCT_SRC *psrc,
DKCT_GUI *gui
@@ -7970,6 +8369,7 @@ dkct_gui_constructor_statictext(
/*
parent, id, label, pos, size (1), style (2)
*/
+ DK3_UNUSED_ARG(dp)
if((co->sizex > 0) && (co->sizey > 0)) det = 1;
mask = DKCT_GUI_TEXT_LEFT;
mask |= DKCT_GUI_TEXT_CENTRE;
@@ -8028,7 +8428,7 @@ static
void
dkct_gui_constructor_staticbitmap(
DKCT_GUI_ELEMENT *co,
- DKCT_GUI_ELEMENT *dp,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(dp),
DKCT_GUI_ELEMENT *pw,
DKCT_SRC *psrc,
DKCT_GUI *gui
@@ -8038,6 +8438,7 @@ dkct_gui_constructor_staticbitmap(
/*
parent, id, bitmap, pos, size (1), style (2)
*/
+ DK3_UNUSED_ARG(dp)
if((co->sizex > 0) && (co->sizey > 0)) det = 1;
if(co->bitmapVarName) {
fputs(dkct_gui_out_kw[2], psrc->fipo);
@@ -8072,7 +8473,7 @@ static
void
dkct_gui_constructor_staticline(
DKCT_GUI_ELEMENT *co,
- DKCT_GUI_ELEMENT *dp,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(dp),
DKCT_GUI_ELEMENT *pw,
DKCT_SRC *psrc,
DKCT_GUI *gui
@@ -8082,6 +8483,7 @@ dkct_gui_constructor_staticline(
/*
parent, id, pos, size (1), style (2)
*/
+ DK3_UNUSED_ARG(dp)
if((co->sizex > 0) && (co->sizey > 0)) det = 1;
if(co->direction != DKCT_GUI_DIRECTION_HORIZONTAL) det = 2;
fputs(dkct_gui_out_kw[2], psrc->fipo);
@@ -8118,7 +8520,7 @@ static
void
dkct_gui_constructor_staticbox(
DKCT_GUI_ELEMENT *co,
- DKCT_GUI_ELEMENT *dp,
+ DKCT_GUI_ELEMENT *DK3_SILENCE_ARG_UNUSED(dp),
DKCT_GUI_ELEMENT *pw,
DKCT_SRC *psrc,
DKCT_GUI *gui
@@ -8128,11 +8530,18 @@ dkct_gui_constructor_staticbox(
/*
parent, id, label, pos, size (1), style (2)
*/
+ DK3_UNUSED_ARG(dp)
if((co->sizex > 0) && (co->sizey > 0)) det = 1;
fputs(dkct_gui_out_kw[2], psrc->fipo);
dkct_gui_write_parent_name(pw, psrc, gui);
dkct_gui_next_argument(psrc);
dkct_gui_write_idname(co, psrc);
+ dkct_gui_next_argument(psrc);
+ if (NULL != co->text) {
+ fputs(co->text, psrc->fipo);
+ } else {
+ fputs(dkct_gui_out_kw[73], psrc->fipo);
+ }
if(det) {
dkct_gui_next_argument(psrc);
fputs(dkct_gui_out_kw[74], psrc->fipo);
@@ -8156,16 +8565,21 @@ dkct_gui_constructor_staticbox(
static
void
dkct_gui_constructor_menubar(
- DKCT_GUI_ELEMENT *co,
- DKCT_GUI_ELEMENT *dp,
- DKCT_GUI_ELEMENT *pw,
- DKCT_SRC *psrc,
- DKCT_GUI *gui
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(co),
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(dp),
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(pw),
+ DKCT_SRC * DK3_SILENCE_ARG_UNUSED(psrc),
+ DKCT_GUI * DK3_SILENCE_ARG_UNUSED(gui)
)
{
/*
No constructor arguments.
*/
+ DK3_UNUSED_ARG(co)
+ DK3_UNUSED_ARG(dp)
+ DK3_UNUSED_ARG(pw)
+ DK3_UNUSED_ARG(psrc)
+ DK3_UNUSED_ARG(gui)
}
@@ -8180,16 +8594,21 @@ dkct_gui_constructor_menubar(
static
void
dkct_gui_constructor_menu(
- DKCT_GUI_ELEMENT *co,
- DKCT_GUI_ELEMENT *dp,
- DKCT_GUI_ELEMENT *pw,
- DKCT_SRC *psrc,
- DKCT_GUI *gui
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(co),
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(dp),
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(pw),
+ DKCT_SRC * DK3_SILENCE_ARG_UNUSED(psrc),
+ DKCT_GUI * DK3_SILENCE_ARG_UNUSED(gui)
)
{
/*
No constructor arguments.
*/
+ DK3_UNUSED_ARG(co)
+ DK3_UNUSED_ARG(dp)
+ DK3_UNUSED_ARG(pw)
+ DK3_UNUSED_ARG(psrc)
+ DK3_UNUSED_ARG(gui)
}
@@ -8206,14 +8625,16 @@ void
dkct_gui_constructor_menuitem(
DKCT_GUI_ELEMENT *co,
DKCT_GUI_ELEMENT *dp,
- DKCT_GUI_ELEMENT *pw,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(pw),
DKCT_SRC *psrc,
- DKCT_GUI *gui
+ DKCT_GUI * DK3_SILENCE_ARG_UNUSED(gui)
)
{
/*
parent->Append(id, label, helpstring, kind);
*/
+ DK3_UNUSED_ARG(pw)
+ DK3_UNUSED_ARG(gui)
#if 0
fputs(dkct_gui_out_kw[2], psrc->fipo);
dkct_gui_write_parent_name(pw, psrc, gui);
@@ -8320,14 +8741,16 @@ void
dkct_gui_constructor_toolbartoolbase(
DKCT_GUI_ELEMENT *co,
DKCT_GUI_ELEMENT *dp,
- DKCT_GUI_ELEMENT *pw,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(pw),
DKCT_SRC *psrc,
- DKCT_GUI *gui
+ DKCT_GUI * DK3_SILENCE_ARG_UNUSED(gui)
)
{
/*
id, text, bitmap, disbitmap (1), kind (2), tip (3)
*/
+ DK3_UNUSED_ARG(pw)
+ DK3_UNUSED_ARG(gui)
fputs(dkct_gui_out_kw[8], psrc->fipo);
if(co->menuItemStyle != DKCT_GUI_MENU_ITEM_SEPARATOR) {
fputs(co->name, psrc->fipo);
@@ -8391,15 +8814,17 @@ void
dkct_gui_constructor_toolbar(
DKCT_GUI_ELEMENT *co,
DKCT_GUI_ELEMENT *dp,
- DKCT_GUI_ELEMENT *pw,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(pw),
DKCT_SRC *psrc,
- DKCT_GUI *gui
+ DKCT_GUI * DK3_SILENCE_ARG_UNUSED(gui)
)
{
int det = 0; /* Details level. */
/*
parent, id, pos, size (1), style (2)
*/
+ DK3_UNUSED_ARG(pw)
+ DK3_UNUSED_ARG(gui)
if((co->sizex > 0) && (co->sizey > 0)) det = 1;
if(co->direction != DKCT_GUI_DIRECTION_HORIZONTAL) det = 2;
if(co->toolbarStyle != DKCT_GUI_TOOLBAR_FLAT) det = 2;
@@ -8482,7 +8907,7 @@ static
void
dkct_gui_constructor_grid(
DKCT_GUI_ELEMENT *co,
- DKCT_GUI_ELEMENT *dp,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(dp),
DKCT_GUI_ELEMENT *pw,
DKCT_SRC *psrc,
DKCT_GUI *gui
@@ -8490,6 +8915,7 @@ dkct_gui_constructor_grid(
{
/* parent, id, pos, size (1), style, name */
int det = 0;
+ DK3_UNUSED_ARG(dp)
if((co->sizex > 0) && (co->sizey > 0)) det = 1;
fputs(dkct_gui_out_kw[2], psrc->fipo);
dkct_gui_write_parent_name(pw, psrc, gui);
@@ -8615,10 +9041,10 @@ static
void
dkct_gui_finalize_after_constructor(
DKCT_GUI_ELEMENT *co,
- DKCT_GUI_ELEMENT *dp,
- DKCT_GUI_ELEMENT *pw,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(dp),
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(pw),
DKCT_SRC *psrc,
- DKCT_GUI *gui
+ DKCT_GUI * DK3_SILENCE_ARG_UNUSED(gui)
)
{
DKCT_GRID_HEAD *gh = NULL;
@@ -8628,7 +9054,10 @@ dkct_gui_finalize_after_constructor(
int columns= 0;
-#line 8741 "dkct-gui.ctr"
+#line 9029 "dkct-gui.ctr"
+ DK3_UNUSED_ARG(dp)
+ DK3_UNUSED_ARG(pw)
+ DK3_UNUSED_ARG(gui)
/*
Jump to end if construction failed.
if(!(object)) {
@@ -8642,7 +9071,7 @@ dkct_gui_finalize_after_constructor(
if((psrc->dkcto).deb) {
-#line 8753 "dkct-gui.ctr"
+#line 9044 "dkct-gui.ctr"
fputs(dkct_tr_get_kw8(24), psrc->fipo);
if((psrc->dkcto).win) {
fputs(dkct_tr_get_kw8(21), psrc->fipo);
@@ -8713,14 +9142,14 @@ dkct_gui_finalize_after_constructor(
}
-#line 8822 "dkct-gui.ctr"
+#line 9113 "dkct-gui.ctr"
fputs(dkct_gui_out_kw[27], psrc->fipo);
fputs(dkct_gui_out_kw[28], psrc->fipo);
/* SUCCESS DEBUG CODE */
if((psrc->dkcto).deb) {
-#line 8827 "dkct-gui.ctr"
+#line 9118 "dkct-gui.ctr"
fputs(dkct_tr_get_kw8(24), psrc->fipo);
if((psrc->dkcto).win) {
fputs(dkct_tr_get_kw8(21), psrc->fipo);
@@ -8795,72 +9224,72 @@ dkct_gui_finalize_after_constructor(
switch(co->cln) {
case 0: {
-#line 8900 "dkct-gui.ctr"
+#line 9191 "dkct-gui.ctr"
} break;
case 1: {
-#line 8902 "dkct-gui.ctr"
+#line 9193 "dkct-gui.ctr"
} break;
case 2: {
-#line 8904 "dkct-gui.ctr"
+#line 9195 "dkct-gui.ctr"
} break;
case 3: {
-#line 8906 "dkct-gui.ctr"
+#line 9197 "dkct-gui.ctr"
} break;
case 4: {
-#line 8908 "dkct-gui.ctr"
+#line 9199 "dkct-gui.ctr"
} break;
case 5: {
-#line 8910 "dkct-gui.ctr"
+#line 9201 "dkct-gui.ctr"
} break;
case 6: {
-#line 8912 "dkct-gui.ctr"
+#line 9203 "dkct-gui.ctr"
} break;
case 7: {
-#line 8914 "dkct-gui.ctr"
+#line 9205 "dkct-gui.ctr"
} break;
case 8: {
-#line 8916 "dkct-gui.ctr"
+#line 9207 "dkct-gui.ctr"
} break;
case 9: {
-#line 8918 "dkct-gui.ctr"
+#line 9209 "dkct-gui.ctr"
} break;
case 10: {
-#line 8920 "dkct-gui.ctr"
+#line 9211 "dkct-gui.ctr"
} break;
case 11: {
-#line 8922 "dkct-gui.ctr"
+#line 9213 "dkct-gui.ctr"
} break;
case 12: {
-#line 8924 "dkct-gui.ctr"
+#line 9215 "dkct-gui.ctr"
} break;
- case 13: {
+ case 13: case 47: {
-#line 8926 "dkct-gui.ctr"
+#line 9217 "dkct-gui.ctr"
/* Set size */
} break;
case 14: {
-#line 8929 "dkct-gui.ctr"
+#line 9220 "dkct-gui.ctr"
} break;
case 15: {
-#line 8931 "dkct-gui.ctr"
+#line 9222 "dkct-gui.ctr"
} break;
case 16: {
-#line 8933 "dkct-gui.ctr"
+#line 9224 "dkct-gui.ctr"
if(co->bitmapDisabled) {
dkct_gui_write_set_bitmap(co, psrc, 156, co->bitmapDisabled);
}
@@ -8876,15 +9305,15 @@ dkct_gui_finalize_after_constructor(
} break;
case 17: {
-#line 8947 "dkct-gui.ctr"
+#line 9238 "dkct-gui.ctr"
} break;
case 18: {
-#line 8949 "dkct-gui.ctr"
+#line 9240 "dkct-gui.ctr"
} break;
case 19: {
-#line 8951 "dkct-gui.ctr"
+#line 9242 "dkct-gui.ctr"
if(co->state != 0x00) {
fputs(co->name, psrc->fipo);
if(co->nStates == 0x03) {
@@ -8900,90 +9329,90 @@ dkct_gui_finalize_after_constructor(
} break;
case 20: {
-#line 8965 "dkct-gui.ctr"
+#line 9256 "dkct-gui.ctr"
} break;
case 21: {
-#line 8967 "dkct-gui.ctr"
+#line 9258 "dkct-gui.ctr"
} break;
case 22: {
-#line 8969 "dkct-gui.ctr"
+#line 9260 "dkct-gui.ctr"
} break;
case 23: {
-#line 8971 "dkct-gui.ctr"
+#line 9262 "dkct-gui.ctr"
} break;
case 24: {
-#line 8973 "dkct-gui.ctr"
+#line 9264 "dkct-gui.ctr"
} break;
case 25: {
-#line 8975 "dkct-gui.ctr"
+#line 9266 "dkct-gui.ctr"
} break;
case 26: {
-#line 8977 "dkct-gui.ctr"
+#line 9268 "dkct-gui.ctr"
} break;
case 27: {
-#line 8979 "dkct-gui.ctr"
+#line 9270 "dkct-gui.ctr"
} break;
case 28: {
-#line 8981 "dkct-gui.ctr"
+#line 9272 "dkct-gui.ctr"
} break;
case 29: {
-#line 8983 "dkct-gui.ctr"
+#line 9274 "dkct-gui.ctr"
} break;
case 30: {
-#line 8985 "dkct-gui.ctr"
+#line 9276 "dkct-gui.ctr"
} break;
case 31: {
-#line 8987 "dkct-gui.ctr"
+#line 9278 "dkct-gui.ctr"
} break;
case 32: {
-#line 8989 "dkct-gui.ctr"
+#line 9280 "dkct-gui.ctr"
} break;
case 33: {
-#line 8991 "dkct-gui.ctr"
+#line 9282 "dkct-gui.ctr"
} break;
case 34: {
-#line 8993 "dkct-gui.ctr"
+#line 9284 "dkct-gui.ctr"
} break;
case 35: {
-#line 8995 "dkct-gui.ctr"
+#line 9286 "dkct-gui.ctr"
} break;
case 36: {
-#line 8997 "dkct-gui.ctr"
+#line 9288 "dkct-gui.ctr"
} break;
case 37: {
-#line 8999 "dkct-gui.ctr"
+#line 9290 "dkct-gui.ctr"
} break;
case 38: {
-#line 9001 "dkct-gui.ctr"
+#line 9292 "dkct-gui.ctr"
} break;
case 39: {
-#line 9003 "dkct-gui.ctr"
+#line 9294 "dkct-gui.ctr"
} break;
case 41: {
-#line 9005 "dkct-gui.ctr"
+#line 9296 "dkct-gui.ctr"
if(co->gridTable) {
-#line 9006 "dkct-gui.ctr"
+#line 9297 "dkct-gui.ctr"
fputs(dkct_gui_out_kw[8], psrc->fipo);
fputs(co->name, psrc->fipo);
fputs(dkct_gui_out_kw[198], psrc->fipo);
@@ -8996,7 +9425,7 @@ dkct_gui_finalize_after_constructor(
fputs(dkct_gui_out_kw[0], psrc->fipo);
} else {
-#line 9017 "dkct-gui.ctr"
+#line 9308 "dkct-gui.ctr"
#if VERSION_BEFORE_20150821
rows = columns = 0;
#endif
@@ -9096,6 +9525,26 @@ dkct_gui_finalize_after_constructor(
fputs(dkct_gui_out_kw[0], psrc->fipo);
}
} break;
+ case 42: {
+
+#line 9408 "dkct-gui.ctr"
+ } break;
+ case 43: {
+
+#line 9410 "dkct-gui.ctr"
+ } break;
+ case 44: {
+
+#line 9412 "dkct-gui.ctr"
+ } break;
+ case 45: {
+
+#line 9414 "dkct-gui.ctr"
+ } break;
+ case 46: {
+
+#line 9416 "dkct-gui.ctr"
+ } break;
}
/*
Minimal size, if any.
@@ -9110,7 +9559,7 @@ dkct_gui_finalize_after_constructor(
}
-#line 9129 "dkct-gui.ctr"
+#line 9430 "dkct-gui.ctr"
}
@@ -9127,13 +9576,14 @@ static
void
dkct_gui_constructor_constructor(
DKCT_GUI_ELEMENT *co,
- DKCT_GUI_ELEMENT *dp,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(dp),
DKCT_GUI_ELEMENT *pw,
DKCT_SRC *psrc,
DKCT_GUI *gui,
int comma
)
{
+ DK3_UNUSED_ARG(dp)
fputs(dkct_gui_out_kw[2], psrc->fipo);
dkct_gui_write_parent_name(pw, psrc, gui);
fputs(dkct_gui_out_kw[209], psrc->fipo);
@@ -9170,7 +9620,7 @@ dkct_gui_write_element_constructor(
{
-#line 9187 "dkct-gui.ctr"
+#line 9489 "dkct-gui.ctr"
/*
Write tests to check constructor prerequisitions.
*/
@@ -9185,7 +9635,7 @@ dkct_gui_write_element_constructor(
if(co->bitmapVarName) {
-#line 9200 "dkct-gui.ctr"
+#line 9502 "dkct-gui.ctr"
fputs(dkct_gui_out_kw[25], psrc->fipo);
fputs(co->bitmapVarName, psrc->fipo);
fputs(dkct_gui_out_kw[26], psrc->fipo);
@@ -9203,18 +9653,21 @@ dkct_gui_write_element_constructor(
case 37: {
if(dp) {
if(dp->cln == 36) {
- if(co->text) {
+ if((NULL != co->text) || (0 != dkct_gui_is_stock_element(co))) {
dkct_gui_constructor_menuitem(co, dp, pw, psrc, gui);
if(co->menuItemStyle != DKCT_GUI_MENU_ITEM_SEPARATOR) {
dkct_gui_finalize_after_constructor(co, dp, pw, psrc, gui);
}
} else {
/* ERROR: No text specified */
+
+
+#line 9527 "dkct-gui.ctr"
dkct_to_log_1(gui->psrc, 1, DK3_LL_ERROR, 49);
}
} else {
-#line 9227 "dkct-gui.ctr"
+#line 9530 "dkct-gui.ctr"
/* ERROR: Parent is not a menu */
dkct_gui_report_illegal_parent_child(co, dp, gui->psrc);
}
@@ -9235,6 +9688,9 @@ dkct_gui_write_element_constructor(
}
} else {
/* ERROR: No text */
+
+
+#line 9551 "dkct-gui.ctr"
dkct_to_log_1(gui->psrc, 1, DK3_LL_ERROR, 49);
}
} else {
@@ -9247,7 +9703,7 @@ dkct_gui_write_element_constructor(
}
} else {
-#line 9258 "dkct-gui.ctr"
+#line 9562 "dkct-gui.ctr"
/* ERROR: Parent is not a toolbar */
dkct_gui_report_illegal_parent_child(co, dp, gui->psrc);
}
@@ -9279,192 +9735,192 @@ dkct_gui_write_element_constructor(
switch(co->cln) {
case 0: {
-#line 9288 "dkct-gui.ctr"
+#line 9592 "dkct-gui.ctr"
dkct_gui_constructor_frame_dialog(co,dp,pw,psrc,gui);
} break;
case 1: {
-#line 9291 "dkct-gui.ctr"
+#line 9595 "dkct-gui.ctr"
dkct_gui_constructor_frame_dialog(co,dp,pw,psrc,gui);
} break;
case 2: {
-#line 9294 "dkct-gui.ctr"
+#line 9598 "dkct-gui.ctr"
dkct_gui_constructor_frame_dialog(co,dp,pw,psrc,gui);
} break;
case 3: {
-#line 9297 "dkct-gui.ctr"
+#line 9601 "dkct-gui.ctr"
dkct_gui_constructor_frame_dialog(co,dp,pw,psrc,gui);
} break;
case 4: {
-#line 9300 "dkct-gui.ctr"
+#line 9604 "dkct-gui.ctr"
} break;
case 5: {
-#line 9302 "dkct-gui.ctr"
+#line 9606 "dkct-gui.ctr"
dkct_gui_constructor_boxsizer(co, dp, pw, psrc, gui);
} break;
case 6: {
-#line 9305 "dkct-gui.ctr"
+#line 9609 "dkct-gui.ctr"
dkct_gui_constructor_gridsizer(co,dp,pw,psrc,gui);
} break;
case 7: {
-#line 9308 "dkct-gui.ctr"
+#line 9612 "dkct-gui.ctr"
dkct_gui_constructor_gridbagsizer(co,dp,pw,psrc,gui);
} break;
case 8: {
-#line 9311 "dkct-gui.ctr"
+#line 9615 "dkct-gui.ctr"
dkct_gui_constructor_gridsizer(co,dp,pw,psrc,gui);
} break;
case 9: {
-#line 9314 "dkct-gui.ctr"
+#line 9618 "dkct-gui.ctr"
dkct_gui_constructor_staticboxsizer(co,dp,pw,psrc,gui);
} break;
case 10: {
-#line 9317 "dkct-gui.ctr"
+#line 9621 "dkct-gui.ctr"
/* No constructor arguments at all. */
} break;
case 11: {
-#line 9320 "dkct-gui.ctr"
+#line 9624 "dkct-gui.ctr"
dkct_gui_constructor_panel(co, dp, pw, psrc, gui);
} break;
case 12: {
-#line 9323 "dkct-gui.ctr"
+#line 9627 "dkct-gui.ctr"
dkct_gui_constructor_notebook(co, dp, pw, psrc, gui);
} break;
- case 13: {
+ case 13: case 47 : {
-#line 9326 "dkct-gui.ctr"
+#line 9630 "dkct-gui.ctr"
dkct_gui_constructor_scrolledwindow(co, dp, pw, psrc, gui);
} break;
case 14: {
-#line 9329 "dkct-gui.ctr"
+#line 9633 "dkct-gui.ctr"
dkct_gui_constructor_splitterwindow(co, dp, pw, psrc, gui);
} break;
case 15: {
-#line 9332 "dkct-gui.ctr"
+#line 9636 "dkct-gui.ctr"
dkct_gui_constructor_button(co, dp, pw, psrc, gui);
} break;
case 16: {
-#line 9335 "dkct-gui.ctr"
+#line 9639 "dkct-gui.ctr"
dkct_gui_constructor_bitmapbutton(co, dp, pw, psrc, gui);
} break;
case 17: {
-#line 9338 "dkct-gui.ctr"
+#line 9642 "dkct-gui.ctr"
dkct_gui_constructor_choice_combo(co, dp, pw, psrc, gui, 0);
} break;
case 18: {
-#line 9341 "dkct-gui.ctr"
+#line 9645 "dkct-gui.ctr"
dkct_gui_constructor_choice_combo(co, dp, pw, psrc, gui, 1);
} break;
case 19: {
-#line 9344 "dkct-gui.ctr"
+#line 9648 "dkct-gui.ctr"
dkct_gui_constructor_checkbox(co, dp, pw, psrc, gui);
} break;
case 20: {
-#line 9347 "dkct-gui.ctr"
+#line 9651 "dkct-gui.ctr"
dkct_gui_constructor_listbox(co, dp, pw, psrc, gui);
} break;
case 21: {
-#line 9350 "dkct-gui.ctr"
+#line 9654 "dkct-gui.ctr"
dkct_gui_constructor_checklistbox(co, dp, pw, psrc, gui);
} break;
case 22: {
-#line 9353 "dkct-gui.ctr"
+#line 9657 "dkct-gui.ctr"
dkct_gui_constructor_radiobox(co, dp, pw, psrc, gui);
} break;
case 23: {
-#line 9356 "dkct-gui.ctr"
+#line 9660 "dkct-gui.ctr"
dkct_gui_constructor_radiobutton(co, dp, pw, psrc, gui);
} break;
case 24: {
-#line 9359 "dkct-gui.ctr"
+#line 9663 "dkct-gui.ctr"
dkct_gui_constructor_scrollbar(co, dp, pw, psrc, gui);
} break;
case 25: {
-#line 9362 "dkct-gui.ctr"
+#line 9666 "dkct-gui.ctr"
dkct_gui_constructor_spinbutton(co, dp, pw, psrc, gui);
} break;
case 26: {
-#line 9365 "dkct-gui.ctr"
+#line 9669 "dkct-gui.ctr"
dkct_gui_constructor_spincontrol(co, dp, pw, psrc, gui);
} break;
case 27: {
-#line 9368 "dkct-gui.ctr"
+#line 9672 "dkct-gui.ctr"
dkct_gui_constructor_slider(co, dp, pw, psrc, gui);
} break;
case 28: {
-#line 9371 "dkct-gui.ctr"
+#line 9675 "dkct-gui.ctr"
dkct_gui_constructor_textctrl(co, dp, pw, psrc, gui);
} break;
case 29: {
-#line 9374 "dkct-gui.ctr"
+#line 9678 "dkct-gui.ctr"
dkct_gui_constructor_togglebutton(co, dp, pw, psrc, gui);
} break;
case 30: {
-#line 9377 "dkct-gui.ctr"
+#line 9681 "dkct-gui.ctr"
dkct_gui_constructor_gauge(co, dp, pw, psrc, gui);
} break;
case 31: {
-#line 9380 "dkct-gui.ctr"
+#line 9684 "dkct-gui.ctr"
dkct_gui_constructor_statictext(co, dp, pw, psrc, gui);
} break;
case 32: {
-#line 9383 "dkct-gui.ctr"
+#line 9687 "dkct-gui.ctr"
dkct_gui_constructor_staticbitmap(co, dp, pw, psrc, gui);
} break;
case 33: {
-#line 9386 "dkct-gui.ctr"
+#line 9690 "dkct-gui.ctr"
dkct_gui_constructor_staticline(co, dp, pw, psrc, gui);
} break;
case 34: {
-#line 9389 "dkct-gui.ctr"
+#line 9693 "dkct-gui.ctr"
dkct_gui_constructor_staticbox(co, dp, pw, psrc, gui);
} break;
case 35: {
-#line 9392 "dkct-gui.ctr"
+#line 9696 "dkct-gui.ctr"
dkct_gui_constructor_menubar(co, dp, pw, psrc, gui);
} break;
case 36: {
-#line 9395 "dkct-gui.ctr"
+#line 9699 "dkct-gui.ctr"
dkct_gui_constructor_menu(co, dp, pw, psrc, gui);
} break;
#if 0
case 37: {
-#line 9399 "dkct-gui.ctr"
+#line 9703 "dkct-gui.ctr"
/*
Never happens.
*/
@@ -9472,16 +9928,43 @@ dkct_gui_write_element_constructor(
#endif
case 38: {
-#line 9405 "dkct-gui.ctr"
+#line 9709 "dkct-gui.ctr"
dkct_gui_constructor_toolbar(co, dp, pw, psrc, gui);
} break;
case 39: {
-#line 9408 "dkct-gui.ctr"
+#line 9712 "dkct-gui.ctr"
} break;
- case 41: {
+ case 41: {
+
+#line 9714 "dkct-gui.ctr"
dkct_gui_constructor_grid(co, dp, pw, psrc, gui);
} break;
+ case 42: {
+
+#line 9717 "dkct-gui.ctr"
+ dkct_gui_constructor_notebook(co, dp, pw, psrc, gui);
+ } break;
+ case 43: {
+
+#line 9720 "dkct-gui.ctr"
+ dkct_gui_constructor_notebook(co, dp, pw, psrc, gui);
+ } break;
+ case 44: {
+
+#line 9723 "dkct-gui.ctr"
+ dkct_gui_constructor_notebook(co, dp, pw, psrc, gui);
+ } break;
+ case 45: {
+
+#line 9726 "dkct-gui.ctr"
+ dkct_gui_constructor_notebook(co, dp, pw, psrc, gui);
+ } break;
+ case 46: {
+
+#line 9729 "dkct-gui.ctr"
+ dkct_gui_constructor_notebook(co, dp, pw, psrc, gui);
+ } break;
default: {
if(!(co->compConst)) {
dkct_gui_constructor_constructor(co,dp,pw,psrc,gui,0);
@@ -9495,7 +9978,7 @@ dkct_gui_write_element_constructor(
}
-#line 9424 "dkct-gui.ctr"
+#line 9743 "dkct-gui.ctr"
}
@@ -9512,7 +9995,7 @@ void
dkct_gui_add_pseudo_object(
DKCT_GUI_ELEMENT *co,
DKCT_GUI_ELEMENT *dp,
- DKCT_GUI_ELEMENT *pw,
+ DKCT_GUI_ELEMENT * DK3_SILENCE_ARG_UNUSED(pw),
DKCT_SRC *psrc,
DKCT_GUI *gui
)
@@ -9520,14 +10003,15 @@ dkct_gui_add_pseudo_object(
char bu[256]; /* Buffer for numeric values. */
-#line 9447 "dkct-gui.ctr"
+#line 9766 "dkct-gui.ctr"
+ DK3_UNUSED_ARG(pw)
if(dp) {
switch(dp->cln) {
case 7: { /* gridbag sizer */
switch(co->pseudoobj) {
case 1: case 2: {
-#line 9452 "dkct-gui.ctr"
+#line 9772 "dkct-gui.ctr"
fputs(dkct_gui_out_kw[8], psrc->fipo);
if(dp->name) {
fputs(dp->name, psrc->fipo);
@@ -9573,7 +10057,7 @@ dkct_gui_add_pseudo_object(
switch(co->pseudoobj) {
case 1: case 2: {
-#line 9496 "dkct-gui.ctr"
+#line 9816 "dkct-gui.ctr"
fputs(dkct_gui_out_kw[8], psrc->fipo);
if(dp->name) {
fputs(dp->name, psrc->fipo);
@@ -9640,7 +10124,7 @@ dkct_gui_add_pseudo_object(
}
-#line 9561 "dkct-gui.ctr"
+#line 9881 "dkct-gui.ctr"
}
@@ -9740,7 +10224,7 @@ dkct_gui_finish_current_element(
{
-#line 9659 "dkct-gui.ctr"
+#line 9979 "dkct-gui.ctr"
/*
Class-dependant finish.
*/
@@ -9749,7 +10233,7 @@ dkct_gui_finish_current_element(
case 38: /* toolbar */
{
-#line 9666 "dkct-gui.ctr"
+#line 9986 "dkct-gui.ctr"
/*
Call ->Realize() for the standard diaglog button sizer.
*/
@@ -9759,7 +10243,7 @@ dkct_gui_finish_current_element(
} break;
case 14: {
-#line 9674 "dkct-gui.ctr"
+#line 9994 "dkct-gui.ctr"
/*
Set wxSplitterWindow children and sash.
*/
@@ -9786,7 +10270,7 @@ dkct_gui_finish_current_element(
}
if(co->tipText) {
-#line 9699 "dkct-gui.ctr"
+#line 10019 "dkct-gui.ctr"
switch(co->cln) {
case 36: /* wxMenu */
case 37: /* wxMenuItem */
@@ -9796,7 +10280,7 @@ dkct_gui_finish_current_element(
} break;
default: {
-#line 9707 "dkct-gui.ctr"
+#line 10027 "dkct-gui.ctr"
fputs(dkct_gui_out_kw[8], psrc->fipo);
if ((NULL != co->ttflag) || (NULL != gui->ttflag)) {
fputs(dkct_gui_out_kw[218], psrc->fipo);
@@ -9868,7 +10352,7 @@ dkct_gui_finish_current_element(
}
-#line 9777 "dkct-gui.ctr"
+#line 10097 "dkct-gui.ctr"
}
@@ -9912,7 +10396,7 @@ dkct_gui_write_members(DKCT_SRC *psrc, DKCT_GUI *gui)
int pcln; /* Parent class name. */
-#line 9819 "dkct-gui.ctr"
+#line 10139 "dkct-gui.ctr"
fnptr = dkct_tr_get_kw8(((psrc->dkcto).deb == 2) ? 28 : 29);
co = gui->r_el;
if(co->cln != 1) {
@@ -9926,7 +10410,7 @@ dkct_gui_write_members(DKCT_SRC *psrc, DKCT_GUI *gui)
if((psrc->dkcto).deb) {
-#line 9831 "dkct-gui.ctr"
+#line 10151 "dkct-gui.ctr"
fputs(dkct_tr_get_kw8(24), psrc->fipo);
if((psrc->dkcto).win) {
fputs(dkct_tr_get_kw8(21), psrc->fipo);
@@ -9996,7 +10480,7 @@ dkct_gui_write_members(DKCT_SRC *psrc, DKCT_GUI *gui)
if((psrc->dkcto).deb) {
-#line 9899 "dkct-gui.ctr"
+#line 10219 "dkct-gui.ctr"
fputs(dkct_tr_get_kw8(24), psrc->fipo);
if((psrc->dkcto).win) {
fputs(dkct_tr_get_kw8(21), psrc->fipo);
@@ -10065,7 +10549,7 @@ dkct_gui_write_members(DKCT_SRC *psrc, DKCT_GUI *gui)
dk3sto_it_reset(co->i_contents);
while(co) {
-#line 9966 "dkct-gui.ctr"
+#line 10286 "dkct-gui.ctr"
psrc->lineno = ((co->lndef) > 0UL) ? (co->lndef) : (co->lndecl);
dk3app_set_source_line(psrc->app, psrc->lineno);
dp = pw = (DKCT_GUI_ELEMENT *)(co->parent);
@@ -10086,27 +10570,27 @@ dkct_gui_write_members(DKCT_SRC *psrc, DKCT_GUI *gui)
if(dkct_gui_need_element_constructor(co)) {
-#line 9985 "dkct-gui.ctr"
+#line 10305 "dkct-gui.ctr"
dkct_gui_write_element_constructor(co, dp, pw, psrc, gui);
}
}
dk3sto_it_reset(co->i_contents);
if(co->menubar) {
-#line 9990 "dkct-gui.ctr"
+#line 10310 "dkct-gui.ctr"
fputs(dkct_gui_out_kw[19], psrc->fipo);
co->prost = DKCT_GUI_PROCESSING_STATE_MENU;
co = (DKCT_GUI_ELEMENT *)(co->menubar);
} else {
if(co->toolbar) {
-#line 9995 "dkct-gui.ctr"
+#line 10315 "dkct-gui.ctr"
fputs(dkct_gui_out_kw[20], psrc->fipo);
co->prost = DKCT_GUI_PROCESSING_STATE_TOOL;
co = (DKCT_GUI_ELEMENT *)(co->toolbar);
} else {
-#line 9999 "dkct-gui.ctr"
+#line 10319 "dkct-gui.ctr"
co->prost = DKCT_GUI_PROCESSING_STATE_CONTENTS;
}
}
@@ -10119,13 +10603,13 @@ dkct_gui_write_members(DKCT_SRC *psrc, DKCT_GUI *gui)
fputs(dkct_gui_out_kw[22], psrc->fipo);
if(co->toolbar) {
-#line 10010 "dkct-gui.ctr"
+#line 10330 "dkct-gui.ctr"
fputs(dkct_gui_out_kw[20], psrc->fipo);
co->prost = DKCT_GUI_PROCESSING_STATE_TOOL;
co = (DKCT_GUI_ELEMENT *)(co->toolbar);
} else {
-#line 10014 "dkct-gui.ctr"
+#line 10334 "dkct-gui.ctr"
co->prost = DKCT_GUI_PROCESSING_STATE_CONTENTS;
}
} break;
@@ -10136,21 +10620,21 @@ dkct_gui_write_members(DKCT_SRC *psrc, DKCT_GUI *gui)
fputs(dkct_gui_out_kw[22], psrc->fipo);
co->prost = DKCT_GUI_PROCESSING_STATE_CONTENTS;
-#line 10023 "dkct-gui.ctr"
+#line 10343 "dkct-gui.ctr"
} break;
case DKCT_GUI_PROCESSING_STATE_CONTENTS: {
-#line 10025 "dkct-gui.ctr"
+#line 10345 "dkct-gui.ctr"
ne = (DKCT_GUI_ELEMENT *)dk3sto_it_next(co->i_contents);
-#line 10026 "dkct-gui.ctr"
+#line 10346 "dkct-gui.ctr"
if(ne) {
-#line 10027 "dkct-gui.ctr"
+#line 10347 "dkct-gui.ctr"
co = ne;
} else {
-#line 10029 "dkct-gui.ctr"
+#line 10349 "dkct-gui.ctr"
co->prost = DKCT_GUI_PROCESSING_STATE_DONE;
/*
Finish current element.
@@ -10216,6 +10700,9 @@ dkct_gui_write_members(DKCT_SRC *psrc, DKCT_GUI *gui)
default: {
pcln = -1;
if(dp) { pcln = dp->cln; }
+
+
+#line 10415 "dkct-gui.ctr"
switch(pcln) {
case 35: { /* Appending to a menu bar. */
switch(co->cln) {
@@ -10317,6 +10804,26 @@ dkct_gui_write_members(DKCT_SRC *psrc, DKCT_GUI *gui)
the splitter window.
*/
} break;
+ case 12: case 42: case 43: case 44: case 45: case 46: {
+ /* Parent is wxNotebook */
+ if (
+ (NULL != co->name) && (NULL != dp->name)
+ && (NULL != co->text))
+ {
+ fputs(dkct_gui_out_kw[8], psrc->fipo);
+ fputs(dp->name, psrc->fipo);
+ fputs(dkct_gui_out_kw[220], psrc->fipo);
+ fputs(co->name, psrc->fipo);
+ fputs(dkct_gui_out_kw[55], psrc->fipo);
+ fputs(co->text, psrc->fipo);
+ fputs(dkct_gui_out_kw[24], psrc->fipo);
+ fputs(dkct_gui_out_kw[0], psrc->fipo);
+ }
+ else {
+ /* ERROR: Missing text */
+ dkct_to_log_1(gui->psrc, 1, DK3_LL_ERROR, 124);
+ }
+ } break;
default: {
if((co->number) && (co->parent)) {
char const *pname;
@@ -10344,7 +10851,45 @@ dkct_gui_write_members(DKCT_SRC *psrc, DKCT_GUI *gui)
}
}
-#line 10221 "dkct-gui.ctr"
+#line 10562 "dkct-gui.ctr"
+}
+
+
+
+/** Complain if an element is not in the contents of a parent object.
+ @param psrc Source structure.
+ @param el Element to complain about.
+*/
+static
+void
+complain_about_missing_parent(
+ DKCT_SRC *gpsrc, DKCT_SRC *psrc, DKCT_GUI_ELEMENT *el
+)
+{
+ DKCT_SRC *xpsrc;
+ unsigned long oldlineno;
+ int must_complain;
+
+
+
+#line 10581 "dkct-gui.ctr"
+ /*
+ Check element el whether complaint is really necessary
+ */
+ must_complain = 1;
+ /*
+ Write warning
+ */
+ xpsrc = ((NULL != gpsrc) ? (gpsrc) : (psrc));
+ if ((0 != must_complain) && (NULL != xpsrc)) {
+ oldlineno = xpsrc->lineno;
+ xpsrc->lineno = el->lndef;
+ dkct_to_log_3(xpsrc, 1, DK3_LL_WARNING, 126, 127, el->name);
+ xpsrc->lineno = oldlineno;
+ }
+
+
+#line 10596 "dkct-gui.ctr"
}
@@ -10384,6 +10929,9 @@ dkct_gui_write_constructor(DKCT_SRC *psrc)
fputs(dkct_gui_out_kw[8], psrc->fipo);
fputs(el->name, psrc->fipo);
fputs(dkct_gui_out_kw[14], psrc->fipo);
+ if (NULL == el->parent) {
+ complain_about_missing_parent(gui->psrc, psrc, el);
+ }
}
}
}
@@ -10398,10 +10946,10 @@ dkct_gui_write_constructor(DKCT_SRC *psrc)
el = gui->r_el;
if(el) {
-#line 10273 "dkct-gui.ctr"
+#line 10651 "dkct-gui.ctr"
w = el->sizex; h = el->sizey;
-#line 10274 "dkct-gui.ctr"
+#line 10652 "dkct-gui.ctr"
}
fputs(dkct_gui_out_kw[8], psrc->fipo);
fputs(dkct_gui_out_kw[10], psrc->fipo);