DialogEd now compiles, links and runs under wxGTK

  I didn't say it worked, eh.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/dialoged/Makefile b/utils/dialoged/Makefile
new file mode 100644 (file)
index 0000000..3684ed3
--- /dev/null
+++ b/utils/dialoged/Makefile
@@ -0,0 +1 @@
+include ../../install/unix/setup/general/makedirs

diff --git a/utils/dialoged/src/.cvsignore b/utils/dialoged/src/.cvsignore
new file mode 100644 (file)
index 0000000..4646a42
--- /dev/null
+++ b/utils/dialoged/src/.cvsignore
@@ -0,0 +1,3 @@
+Linux
+linux-gnu
+linux

diff --git a/utils/dialoged/src/Makefile b/utils/dialoged/src/Makefile
new file mode 100644 (file)
index 0000000..e871237
--- /dev/null
+++ b/utils/dialoged/src/Makefile
@@ -0,0 +1 @@
+include ../../../install/unix/setup/general/makedirs

diff --git a/utils/dialoged/src/Makefile.in b/utils/dialoged/src/Makefile.in
new file mode 100644 (file)
index 0000000..c4bf48b
--- /dev/null
+++ b/utils/dialoged/src/Makefile.in
@@ -0,0 +1,28 @@
+# WXXT base directory
+WXBASEDIR=@WXBASEDIR@
+
+# set the OS type for compilation
+OS=@OS@
+# compile a library only
+RULE=bin
+
+# define library name
+BIN_TARGET=dialoged
+# define library sources
+BIN_SRC=dialoged.cpp dlghndlr.cpp edlist.cpp edtree.cpp \
+  reseditr.cpp reswrite.cpp symbtabl.cpp winprop.cpp winstyle.cpp
+
+#define library objects
+BIN_OBJ=dialoged.o dlghndlr.o edlist.o edtree.o \
+  reseditr.o reswrite.o symbtabl.o winprop.o winstyle.o
+  
+# additional things needed to link
+BIN_LINK= \
+  -lwx_prop_gtk
+
+# additional things needed to compile
+ADD_COMPILE= \
+  -I../../../wxprop/src
+
+# include the definitions now
+include ../../../../template.mak

diff --git a/utils/dialoged/src/bitmaps/aiai.xpm b/utils/dialoged/src/bitmaps/aiai.xpm
new file mode 100644 (file)
index 0000000..4cbaeec
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/aiai.xpm
@@ -0,0 +1,44 @@
+/* XPM */
+static char * aiai_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"32 32 6 1",
+/* colors */
+"      s None  c None",
+".     c #000000",
+"+     c #808080",
+"@     c #c0c0c0",
+"#     c #ffff00",
+"$     c #ffffff",
+/* pixels */
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
+"$$$$$$$$$$$$$$$..$$$$$$$$$$$$$$$",
+"$$$$$$$$$$$$$$$..$$$$$$$$$$$$$$$",
+"$$$$$$$$$$$$$$....$$$$$...$$$$$$",
+"$$$$$$$$$$$$$.....$$$$.....$$$$$",
+"$$$$$$$$$$$$$......$$$$...$$$$$$",
+"$$$$$$$$$$$$.......$$$$$$$$$$$$$",
+"$$$$$$$$$$$@+.......$$.....$$$$$",
+"$$$$$$$$$$$@@+..######.....$$$$$",
+"$$$$$$#$##@$@@+.$$$$$$.....#####",
+"#########$$$$@@#######.....#####",
+"#########$$$$@$$$$$$$$.....#####",
+"########$@@$@$########.....####$",
+"$$$$$$$.@$$@$$$$@+.........#$#$$",
+"$$$$$$$..@@$@$@@$@+........$$$$$",
+"$$$$$$...+@$@$@@$@$+.......$$$$$",
+"$$$$$......@$@$$$$@$+......$$$$$",
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
+"$$$$$$$$.$$$$$.$$$$$.$$$$$.$$$$$",
+"$$$$$$$...$$$$.$$$$...$$$$.$$$$$",
+"$$$$$$$.$.$$.$.$.$$.$.$$.$.$$$$$",
+"$$$$$$.....$$$.$$$.....$$$.$$$$$",
+"$$$$$$.$$$.$$$.$$$.$$$.$$$.$$$$$",
+"$$$$$.$$$$$.$$.$$.$$$$$.$$.$$$$$",
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$"};

diff --git a/utils/dialoged/src/bitmaps/arrow.xpm b/utils/dialoged/src/bitmaps/arrow.xpm
new file mode 100644 (file)
index 0000000..ad9d577
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/arrow.xpm
@@ -0,0 +1,24 @@
+/* XPM */
+static char * arrow_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 2 1",
+/* colors */
+"      s None  c None",
+".     c #000000",
+/* pixels */
+"                ",
+"    .           ",
+"    ..          ",
+"    ...         ",
+"    ....        ",
+"    .....       ",
+"    ......      ",
+"    .......     ",
+"    ........    ",
+"    .....       ",
+"    .. ..       ",
+"    .   ..      ",
+"        ..      ",
+"         ..     ",
+"         ..     ",
+"                "};

diff --git a/utils/dialoged/src/bitmaps/bmpbuttn.xpm b/utils/dialoged/src/bitmaps/bmpbuttn.xpm
new file mode 100644 (file)
index 0000000..669246d
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/bmpbuttn.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char * bmpbuttn_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 8 1",
+/* colors */
+"      s None  c None",
+".     c #000000",
+"+     c #c0c0c0",
+"@     c #ff0000",
+"#     c #00ff00",
+"$     c #ffff00",
+"%     c #0000ff",
+"&     c #ffffff",
+/* pixels */
+"                ",
+"                ",
+"                ",
+"+++++++++++++++.",
+"+@@.&&&&&&&&&&&.",
+"+@@.&&&&&&&&&&&.",
+"+@@.&&&&&&&&&&&.",
+"+...............",
+"+&&.&&&&&&&.%%%.",
+"+&&.&&&&&&&.%%%.",
+"+&&.........%%%.",
+"+&&.$$$$.##.%%%.",
+"+&&.$$$$.##.%%%.",
+"+...............",
+"                ",
+"                "};

diff --git a/utils/dialoged/src/bitmaps/button.xpm b/utils/dialoged/src/bitmaps/button.xpm
new file mode 100644 (file)
index 0000000..40ad7e2
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/button.xpm
@@ -0,0 +1,26 @@
+/* XPM */
+static char * button_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 4 1",
+/* colors */
+"      s None  c None",
+".     c #000000",
+"+     c #c0c0c0",
+"@     c #808080",
+/* pixels */
+"                ",
+"                ",
+"                ",
+"+++++++++++++++.",
+"+@@@@@@@@@@@@@@.",
+"+@@@@@@@@@@@@@@.",
+"+@@@@@@@@@@@@@@.",
+"+@@@@@@@@@@@@@@.",
+"+@@@@@@@@@@@@@@.",
+"+@@@@@@@@@@@@@@.",
+"+@@@@@@@@@@@@@@.",
+"+@@@@@@@@@@@@@@.",
+"+@@@@@@@@@@@@@@.",
+"+...............",
+"                ",
+"                "};

diff --git a/utils/dialoged/src/bitmaps/buttonsm.xpm b/utils/dialoged/src/bitmaps/buttonsm.xpm
new file mode 100644 (file)
index 0000000..818fb50
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/buttonsm.xpm
@@ -0,0 +1,26 @@
+/* XPM */
+static char * buttonsm_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 4 1",
+/* colors */
+"      s None  c None",
+".     c #000000",
+"+     c #c0c0c0",
+"@     c #808080",
+/* pixels */
+"                ",
+"                ",
+"                ",
+"                ",
+"                ",
+"  ++++++++++++  ",
+"  +@@@@@@@@@@.  ",
+"  +@@@@@@@@@@.  ",
+"  +@@@@@@@@@@.  ",
+"  +...........  ",
+"                ",
+"                ",
+"                ",
+"                ",
+"                ",
+"                "};

diff --git a/utils/dialoged/src/bitmaps/checkbox.xpm b/utils/dialoged/src/bitmaps/checkbox.xpm
new file mode 100644 (file)
index 0000000..5814e84
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/checkbox.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * checkbox_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 5 1",
+/* colors */
+"      s None  c None",
+".     c #000000",
+"+     c #c0c0c0",
+"@     c #808080",
+"#     c #ffffff",
+/* pixels */
+"                ",
+" @@@@@@@@@@@@@@ ",
+" @............@ ",
+" @.##########+@ ",
+" @.#..####..#+@ ",
+" @.#...##...#+@ ",
+" @.##......##+@ ",
+" @.###....###+@ ",
+" @.###....###+@ ",
+" @.##......##+@ ",
+" @.#...##...#+@ ",
+" @.#..####..#+@ ",
+" @.##########+@ ",
+" @.+++++++++++@ ",
+" @@@@@@@@@@@@@@ ",
+"                "};

diff --git a/utils/dialoged/src/bitmaps/choice.xpm b/utils/dialoged/src/bitmaps/choice.xpm
new file mode 100644 (file)
index 0000000..c46aaf5
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/choice.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * choice_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 5 1",
+/* colors */
+"      s None  c None",
+".     c #000000",
+"+     c #c0c0c0",
+"@     c #808080",
+"#     c #ffffff",
+/* pixels */
+"@@@@@@@@@@@@@@@@",
+"@..............@",
+"@.########+++++@",
+"@.########.....@",
+"@.########+...+@",
+"@.########++.++@",
+"@.+++++++++++++@",
+"@@@@@@@@@@@@@@@@",
+"  ##############",
+"  ..............",
+"  .#########+.+.",
+"  .#########....",
+"  .#########+++.",
+"  .#########....",
+"  .#########+.+.",
+"  .............."};

diff --git a/utils/dialoged/src/bitmaps/combobox.xpm b/utils/dialoged/src/bitmaps/combobox.xpm
new file mode 100644 (file)
index 0000000..e0d2aa8
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/combobox.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * combobox_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 5 1",
+/* colors */
+"      s None  c None",
+".     c #000000",
+"+     c #c0c0c0",
+"@     c #808080",
+"#     c #ffffff",
+/* pixels */
+"@@@@@@@@@@@@@@@@",
+"@..............@",
+"@....#####+++++@",
+"@.#.######.....@",
+"@.#.######+...+@",
+"@....#####++.++@",
+"@.+++++++++++++@",
+"@@@@@@@@@@@@@@@@",
+"  ##############",
+"  ..............",
+"  .#########+.+.",
+"  .#########....",
+"  .#########+++.",
+"  .#########....",
+"  .#########+.+.",
+"  .............."};

diff --git a/utils/dialoged/src/bitmaps/dialog.xpm b/utils/dialoged/src/bitmaps/dialog.xpm
new file mode 100644 (file)
index 0000000..24e2276
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/dialog.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * dialog_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"      s None  c None",
+".     c #000000",
+"+     c #c0c0c0",
+"@     c #808080",
+"#     c #0000ff",
+"$     c #ffffff",
+/* pixels */
+"                ",
+" $$$$$$$$$$$$$. ",
+" $############. ",
+" $############. ",
+" $############. ",
+" $++++++++++++. ",
+" $+$$$$$+@@@@+. ",
+" $+$$$$$+@@@@+. ",
+" $+$$$$$++++++. ",
+" $+$$$$$+@@@@+. ",
+" $+++++++@@@@+. ",
+" $++++++++++++. ",
+" $++++++++++++. ",
+" $++++++++++++. ",
+" .............. ",
+"                "};

diff --git a/utils/dialoged/src/bitmaps/dialoged.xpm b/utils/dialoged/src/bitmaps/dialoged.xpm
new file mode 100644 (file)
index 0000000..4b94e8e
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/dialoged.xpm
@@ -0,0 +1,44 @@
+/* XPM */
+static char * dialoged_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"32 32 6 1",
+/* colors */
+"      s None  c None",
+".     c #000000",
+"+     c #800000",
+"@     c #c0c0c0",
+"#     c #808080",
+"$     c #ffffff",
+/* pixels */
+"              ..                ",
+"              ..                ",
+"  @@@@@@@@@@@@@@@@@@@@@@@@@@@.  ",
+"  @++++++++++++++++++++++++++.  ",
+"  @++++++++++++++++++++++++++.  ",
+"  @++++++++++++++++++++++++++.  ",
+"  @##########################.  ",
+"  @##########################.  ",
+"  @#.............##@@@@@@@@.#.  ",
+"  @#.$$$$$$$$$$$.##@@@@@@@@.#.  ",
+"  @#.$$$$$$$$$$$.##@@@@@@@@.#.  ",
+"  @#.............##.........#.  ",
+"  @##########################.  ",
+"  @##########################.  ",
+"  @#.............##@@@@@@@@.#.  ",
+"  @#.$$$$$$$$$$$.##@@@@@@@@.#.  ",
+"  @#.............##@@@@@@@@.#.  ",
+"  @#.$$$$$$$$$$$.##.........#.  ",
+"  @#.............############.  ",
+"  @#.$$$$$$$$$$$.############.  ",
+"  @#.............############.  ",
+"  @#.$$$$$$$$$$$.############.  ",
+"  @#.............############.  ",
+"  @##########################.  ",
+"  @##########################.  ",
+"  ............................  ",
+"       ..             ..        ",
+"      ..               ..       ",
+"      ..               ..       ",
+"     ..                 ..      ",
+"     ..                 ..      ",
+"    ..                   ..     "};

diff --git a/utils/dialoged/src/bitmaps/folder1.xpm b/utils/dialoged/src/bitmaps/folder1.xpm
new file mode 100644 (file)
index 0000000..03f6f03
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/folder1.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * folder1_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"      s None  c None",
+".     c #000000",
+"+     c #c0c0c0",
+"@     c #808080",
+"#     c #ffff00",
+"$     c #ffffff",
+/* pixels */
+"                ",
+"   @@@@@        ",
+"  @#+#+#@       ",
+" @#+#+#+#@@@@@@ ",
+" @$$$$$$$$$$$$@.",
+" @$#+#+#+#+#+#@.",
+" @$+#+#+#+#+#+@.",
+" @$#+#+#+#+#+#@.",
+" @$+#+#+#+#+#+@.",
+" @$#+#+#+#+#+#@.",
+" @$+#+#+#+#+#+@.",
+" @$#+#+#+#+#+#@.",
+" @@@@@@@@@@@@@@.",
+"  ..............",
+"                ",
+"                "};

diff --git a/utils/dialoged/src/bitmaps/folder2.xpm b/utils/dialoged/src/bitmaps/folder2.xpm
new file mode 100644 (file)
index 0000000..93f4610
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/folder2.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * folder2_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"      s None  c None",
+".     c #000000",
+"+     c #c0c0c0",
+"@     c #808080",
+"#     c #ffff00",
+"$     c #ffffff",
+/* pixels */
+"                ",
+"   @@@@@        ",
+"  @$$$$$@       ",
+" @$#+#+#$@@@@@@ ",
+" @$+#+#+$$$$$$@.",
+" @$#+#+#+#+#+#@.",
+"@@@@@@@@@@@@@#@.",
+"@$$$$$$$$$$@@+@.",
+"@$#+#+#+#+##.@@.",
+" @$#+#+#+#+#+.@.",
+" @$+#+#+#+#+#.@.",
+"  @$+#+#+#+##@..",
+"  @@@@@@@@@@@@@.",
+"   .............",
+"                ",
+"                "};

diff --git a/utils/dialoged/src/bitmaps/gauge.xpm b/utils/dialoged/src/bitmaps/gauge.xpm
new file mode 100644 (file)
index 0000000..947bbdf
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/gauge.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * gauge_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 5 1",
+/* colors */
+"      s None  c None",
+".     c #000000",
+"+     c #000080",
+"@     c #c0c0c0",
+"#     c #808080",
+/* pixels */
+"                ",
+"                ",
+"                ",
+"################",
+"#..............#",
+"#.++++++++@@@@@#",
+"#.++++++++@@@@@#",
+"#.++++++++@@@@@#",
+"#.++++++++@@@@@#",
+"#.++++++++@@@@@#",
+"#.++++++++@@@@@#",
+"#.++++++++@@@@@#",
+"################",
+"                ",
+"                ",
+"                "};

diff --git a/utils/dialoged/src/bitmaps/listbox.xpm b/utils/dialoged/src/bitmaps/listbox.xpm
new file mode 100644 (file)
index 0000000..3d6b7b0
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/listbox.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * listbox_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 5 1",
+/* colors */
+"      s None  c None",
+".     c #000000",
+"+     c #c0c0c0",
+"@     c #808080",
+"#     c #ffffff",
+/* pixels */
+"@@@@@@@@@@@@@@@@",
+"@..............@",
+"@.##########+++@",
+"@.##########+.+@",
+"@.++++++++++...@",
+"@.##########+++@",
+"@.##########+++@",
+"@.+++++++++++++@",
+"@.##########+++@",
+"@.##########+++@",
+"@.+++++++++++++@",
+"@.##########+++@",
+"@.##########...@",
+"@.##########+.+@",
+"@.+++++++++++++@",
+"@@@@@@@@@@@@@@@@"};

diff --git a/utils/dialoged/src/bitmaps/load.xpm b/utils/dialoged/src/bitmaps/load.xpm
new file mode 100644 (file)
index 0000000..ac643a2
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/load.xpm
@@ -0,0 +1,26 @@
+/* XPM */
+static char *load_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 5 1",
+"  c #c0c0c0",
+". c Black",
+"X c Yellow",
+"o c Gray100",
+"O c #808000",
+/* pixels */
+"                ",
+"          ...   ",
+"         .   . .",
+"              ..",
+"  ...        ...",
+" .XoX.......    ",
+" .oXoXoXoXo.    ",
+" .XoXoXoXoX.    ",
+" .oXoX..........",
+" .XoX.OOOOOOOOO.",
+" .oo.OOOOOOOOO. ",
+" .X.OOOOOOOOO.  ",
+" ..OOOOOOOOO.   ",
+" ...........    ",
+"                "
+};

diff --git a/utils/dialoged/src/bitmaps/new.xpm b/utils/dialoged/src/bitmaps/new.xpm
new file mode 100644 (file)
index 0000000..754d2d2
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/new.xpm
@@ -0,0 +1,24 @@
+/* XPM */
+static char *new_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 3 1",
+"  c None",
+". c Black",
+"X c Gray100",
+/* pixels */
+"                ",
+"   ........     ",
+"   .XXXXXX..    ",
+"   .XXXXXX.X.   ",
+"   .XXXXXX....  ",
+"   .XXXXXXXXX.  ",
+"   .XXXXXXXXX.  ",
+"   .XXXXXXXXX.  ",
+"   .XXXXXXXXX.  ",
+"   .XXXXXXXXX.  ",
+"   .XXXXXXXXX.  ",
+"   .XXXXXXXXX.  ",
+"   .XXXXXXXXX.  ",
+"   ...........  ",
+"                "
+};

diff --git a/utils/dialoged/src/bitmaps/radiobox.xpm b/utils/dialoged/src/bitmaps/radiobox.xpm
new file mode 100644 (file)
index 0000000..8efbf84
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/radiobox.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * radiobox_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 5 1",
+/* colors */
+"      s None  c None",
+".     c #000000",
+"+     c #c0c0c0",
+"@     c #808080",
+"#     c #ffffff",
+/* pixels */
+"    .           ",
+"    ..   ..     ",
+"+++.+.++...++++.",
+"+@.@...@@..@@@@.",
+"+@.+++.+....++@.",
+"+@++++++++++++@.",
+"+@++++++++++++@.",
+"+@++++...+++++@.",
+"+@+++.###@++++@.",
+"+@+++.#.#@++++@.",
+"+@+++.###@++++@.",
+"+@++++@@@+++++@.",
+"+@++++++++++++@.",
+"+@++++++++++++@.",
+"+@@@@@@@@@@@@@@.",
+"................"};

diff --git a/utils/dialoged/src/bitmaps/radiobtn.xpm b/utils/dialoged/src/bitmaps/radiobtn.xpm
new file mode 100644 (file)
index 0000000..30110a6
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/radiobtn.xpm
@@ -0,0 +1,26 @@
+/* XPM */
+static char * radiobtn_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 4 1",
+/* colors */
+"      s None  c None",
+".     c #000000",
+"+     c #c0c0c0",
+"@     c #ffffff",
+/* pixels */
+"                ",
+"                ",
+"                ",
+"                ",
+"      ....      ",
+"     .@@@@+     ",
+"    .@@@@@@+    ",
+"   .@@@..@@@+   ",
+"   .@@....@@+   ",
+"   .@@@..@@@+   ",
+"    .@@@@@@+    ",
+"     .@@@@+     ",
+"      ++++      ",
+"                ",
+"                ",
+"                "};

diff --git a/utils/dialoged/src/bitmaps/save.xpm b/utils/dialoged/src/bitmaps/save.xpm
new file mode 100644 (file)
index 0000000..01b18f9
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/save.xpm
@@ -0,0 +1,25 @@
+/* XPM */
+static char *save_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 15 4 1",
+"  c None",
+". c Black",
+"X c #808000",
+"o c #808080",
+/* pixels */
+"                ",
+" .............. ",
+" .X.        . . ",
+" .X.        ... ",
+" .X.        .X. ",
+" .X.        .X. ",
+" .X.        .X. ",
+" .X.        .X. ",
+" .XX........oX. ",
+" .XXXXXXXXXXXX. ",
+" .XX.........X. ",
+" .XX......  .X. ",
+" .XX......  .X. ",
+" .XX......  .X. ",
+"  ............. "
+};

diff --git a/utils/dialoged/src/bitmaps/scrolbar.xpm b/utils/dialoged/src/bitmaps/scrolbar.xpm
new file mode 100644 (file)
index 0000000..4ec940c
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/scrolbar.xpm
@@ -0,0 +1,26 @@
+/* XPM */
+static char * scrolbar_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 4 1",
+/* colors */
+"      s None  c None",
+".     c #000000",
+"+     c #c0c0c0",
+"@     c #808080",
+/* pixels */
+"                ",
+"                ",
+"                ",
+"                ",
+"                ",
+"                ",
+"++++.@@@@@@++++.",
+"+@@@.@@@@@@+@@@.",
+"+@@@.@@@@@@+@@@.",
+"+....@@@@@@+....",
+"                ",
+"                ",
+"                ",
+"                ",
+"                ",
+"                "};

diff --git a/utils/dialoged/src/bitmaps/slider.xpm b/utils/dialoged/src/bitmaps/slider.xpm
new file mode 100644 (file)
index 0000000..9b6be67
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/slider.xpm
@@ -0,0 +1,26 @@
+/* XPM */
+static char * slider_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 4 1",
+/* colors */
+"      s None  c None",
+".     c #000000",
+"+     c #c0c0c0",
+"@     c #808080",
+/* pixels */
+"                ",
+"                ",
+"                ",
+"++++.           ",
+"+@@@.           ",
+"+@@@.@@@@@@@@@@@",
+"+@@@............",
+"+@@@.+++++++++++",
+"+@@@.           ",
+"+@@@.           ",
+" +@.            ",
+"  +             ",
+"                ",
+"                ",
+"                ",
+"                "};

diff --git a/utils/dialoged/src/bitmaps/statbmp.xpm b/utils/dialoged/src/bitmaps/statbmp.xpm
new file mode 100644 (file)
index 0000000..573e42e
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/statbmp.xpm
@@ -0,0 +1,30 @@
+/* XPM */
+static char * statbmp_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 8 1",
+/* colors */
+"      s None  c None",
+".     c #000000",
+"+     c #c0c0c0",
+"@     c #ff0000",
+"#     c #00ff00",
+"$     c #ffff00",
+"%     c #0000ff",
+"&     c #ffffff",
+/* pixels */
+"                ",
+"                ",
+"                ",
+"+++++++++++++++.",
+"+@@.&&&&&&&&&&&.",
+"+@@.&&&&&&&&&&&.",
+"+@@.&&&&&&&&&&&.",
+"+...............",
+"+&&.&&&&&&&.%%%.",
+"+&&.&&&&&&&.%%%.",
+"+&&.........%%%.",
+"+&&.$$$$.##.%%%.",
+"+&&.$$$$.##.%%%.",
+"+...............",
+"                ",
+"                "};

diff --git a/utils/dialoged/src/bitmaps/statbox.xpm b/utils/dialoged/src/bitmaps/statbox.xpm
new file mode 100644 (file)
index 0000000..1c3efb2
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/statbox.xpm
@@ -0,0 +1,26 @@
+/* XPM */
+static char * statbox_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 4 1",
+/* colors */
+"      s None  c None",
+".     c #000000",
+"+     c #c0c0c0",
+"@     c #808080",
+/* pixels */
+"    .           ",
+"    ..   ..     ",
+"+++.+.++...++++.",
+"+@.@...@@..@@@@.",
+"+@.   . ....  @.",
+"+@            @.",
+"+@            @.",
+"+@            @.",
+"+@            @.",
+"+@            @.",
+"+@            @.",
+"+@            @.",
+"+@            @.",
+"+@            @.",
+"+@@@@@@@@@@@@@@.",
+"................"};

diff --git a/utils/dialoged/src/bitmaps/stattext.xpm b/utils/dialoged/src/bitmaps/stattext.xpm
new file mode 100644 (file)
index 0000000..1ff8e94
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/stattext.xpm
@@ -0,0 +1,24 @@
+/* XPM */
+static char * stattext_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 2 1",
+/* colors */
+"      s None  c None",
+".     c #000000",
+/* pixels */
+"                ",
+"                ",
+"                ",
+"   ..           ",
+"   ..           ",
+"  ....          ",
+"  ....    ....  ",
+"  .  .   ..  .. ",
+" ..  ..    .... ",
+" ..  ..   .. .. ",
+" ......  ..  .. ",
+"..    .. ..  .. ",
+"..    ..  ..... ",
+"                ",
+"                ",
+"                "};

diff --git a/utils/dialoged/src/bitmaps/textmult.xpm b/utils/dialoged/src/bitmaps/textmult.xpm
new file mode 100644 (file)
index 0000000..ad9c5d7
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/textmult.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * textmult_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 5 1",
+/* colors */
+"      s None  c None",
+".     c #000000",
+"+     c #c0c0c0",
+"@     c #808080",
+"#     c #ffffff",
+/* pixels */
+"@@@@@@@@@@@@@@@@",
+"@..............@",
+"@.##########+++@",
+"@.#.#####.##+.+@",
+"@.#.###.#.##...@",
+"@.#.#.#.#.##+++@",
+"@.##########+++@",
+"@.##########+++@",
+"@.#.#.######+++@",
+"@.###.#.####+++@",
+"@.#.#.#.####+++@",
+"@.##########+++@",
+"@.##########...@",
+"@.##########+.+@",
+"@.+++++++++++++@",
+"@@@@@@@@@@@@@@@@"};

diff --git a/utils/dialoged/src/bitmaps/textsing.xpm b/utils/dialoged/src/bitmaps/textsing.xpm
new file mode 100644 (file)
index 0000000..346ce3b
--- /dev/null
+++ b/utils/dialoged/src/bitmaps/textsing.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * textsing_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 5 1",
+/* colors */
+"      s None  c None",
+".     c #000000",
+"+     c #c0c0c0",
+"@     c #808080",
+"#     c #ffffff",
+/* pixels */
+"                ",
+"                ",
+"                ",
+"@@@@@@@@@@@@@@@@",
+"@..............@",
+"@.############+@",
+"@.#...########+@",
+"@.##.#########+@",
+"@.##.#########+@",
+"@.#...########+@",
+"@.############+@",
+"@.+++++++++++++@",
+"@@@@@@@@@@@@@@@@",
+"                ",
+"                ",
+"                "};

diff --git a/utils/dialoged/src/dialoged.cpp b/utils/dialoged/src/dialoged.cpp
index 1a1b6b4b91a91f3b6b9bfd55d4cc285301fee7a7..21029951717df7f1ef7d0c6837a2ce6f13008714 100644 (file)
--- a/utils/dialoged/src/dialoged.cpp
+++ b/utils/dialoged/src/dialoged.cpp
@@ -1,4 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////

 // Name:        dialoged.cpp
 // Purpose:     Main Dialog Editor implementation file
 // Author:      Julian Smart
 // Name:        dialoged.cpp
 // Purpose:     Main Dialog Editor implementation file
 // Author:      Julian Smart

diff --git a/utils/dialoged/src/dlghndlr.cpp b/utils/dialoged/src/dlghndlr.cpp
index ae7e5768386994110c762d688e186e8b57253864..aad48c3e3b6b492edee3c57842d2e8c2f388dc34 100644 (file)
--- a/utils/dialoged/src/dlghndlr.cpp
+++ b/utils/dialoged/src/dlghndlr.cpp
@@ -89,7 +89,7 @@ void wxResourceEditorDialogHandler::OnItemSelect(wxControl *item, bool select)
     resourceManager->RemoveSelection(item);
 }
 
     resourceManager->RemoveSelection(item);
 }
 

-void wxResourceEditorDialogHandler::OnPaint(wxPaintEvent& event)
+void wxResourceEditorDialogHandler::OnPaint(wxPaintEvent& WXUNUSED(event))

 {
        wxPaintDC dc(handlerDialog);
 
 {
        wxPaintDC dc(handlerDialog);
 


@@ -207,7 +207,7 @@ void wxResourceEditorDialogHandler::OnLeftClick(int x, int y, int keys)
   }
 }
 
   }
 }
 

-void wxResourceEditorDialogHandler::OnRightClick(int x, int y, int keys)
+void wxResourceEditorDialogHandler::OnRightClick(int x, int y, int WXUNUSED(keys))

 {
   wxMenu *menu = resourceManager->GetPopupMenu();
   menu->SetClientData((char *)handlerDialog);
 {
   wxMenu *menu = resourceManager->GetPopupMenu();
   menu->SetClientData((char *)handlerDialog);


@@ -279,7 +279,7 @@ void wxResourceEditorDialogHandler::OnItemLeftClick(wxControl *item, int x, int
   }
 }
 
   }
 }
 

-void wxResourceEditorDialogHandler::OnItemRightClick(wxControl *item, int x, int y, int keys)
+void wxResourceEditorDialogHandler::OnItemRightClick(wxControl *item, int x, int y, int WXUNUSED(keys))

 {
 /*
   if (keys & wxKEY_CTRL)
 {
 /*
   if (keys & wxKEY_CTRL)

diff --git a/utils/dialoged/src/dlghndlr.h b/utils/dialoged/src/dlghndlr.h
index 5d2369c421ccb90e13fc87f293be16b0f6ae146a..948261a22ebc15c6ceaa50051ae25c34606bc0d1 100644 (file)
--- a/utils/dialoged/src/dlghndlr.h
+++ b/utils/dialoged/src/dlghndlr.h
@@ -57,8 +57,10 @@ DECLARE_CLASS(wxResourceEditorDialogHandler)
   virtual void OnItemLeftClick(wxControl *item, int x, int y, int keys);
   virtual void OnItemRightClick(wxControl *item, int x, int y, int keys);
   virtual void OnItemSelect(wxControl *item, bool select);
   virtual void OnItemLeftClick(wxControl *item, int x, int y, int keys);
   virtual void OnItemRightClick(wxControl *item, int x, int y, int keys);
   virtual void OnItemSelect(wxControl *item, bool select);

-  virtual void OnItemMove(wxControl *item, int x, int y) {};
-  virtual void OnItemSize(wxControl *item, int w, int h) {};
+  virtual void OnItemMove(
+    wxControl *WXUNUSED(item), int WXUNUSED(x), int WXUNUSED(y) ) {};
+  virtual void OnItemSize(
+    wxControl *WXUNUSED(item), int WXUNUSED(w), int WXUNUSED(h) ) {};

 
   void AddChildHandlers(void);
   void PaintSelectionHandles(wxDC& dc);
 
   void AddChildHandlers(void);
   void PaintSelectionHandles(wxDC& dc);

diff --git a/utils/dialoged/src/edlist.cpp b/utils/dialoged/src/edlist.cpp
index 57ddca9959e292790cfe796e4c69f033d3ab48aa..087736aaf434a38b3d7ecdeb487227ae43935b48 100644 (file)
--- a/utils/dialoged/src/edlist.cpp
+++ b/utils/dialoged/src/edlist.cpp
@@ -55,57 +55,80 @@ wxResourceEditorControlList::~wxResourceEditorControlList()
 // Load icons and add to the list
 void wxResourceEditorControlList::Initialize()
 {
 // Load icons and add to the list
 void wxResourceEditorControlList::Initialize()
 {

+#ifdef __WXMSW__

     wxIcon icon1("ARROW_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon1("ARROW_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon1);
-

     wxIcon icon2("BUTTON_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon2("BUTTON_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon2);
-

     wxIcon icon3("BMPBUTTON_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon3("BMPBUTTON_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon3);
-

     wxIcon icon4("STATICTEXT_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon4("STATICTEXT_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon4);
-

     wxIcon icon5("STATICBMP_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon5("STATICBMP_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon5);
-

     wxIcon icon6("STATICBOX_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon6("STATICBOX_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon6);
-

     wxIcon icon7("TEXTSING_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon7("TEXTSING_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon7);
-

     wxIcon icon8("TEXTMULT_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon8("TEXTMULT_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon8);
-

     wxIcon icon9("LISTBOX_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon9("LISTBOX_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon9);
-

     wxIcon icon10("CHOICE_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon10("CHOICE_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon10);
-

     wxIcon icon11("COMBOBOX_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon11("COMBOBOX_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon11);
-

     wxIcon icon12("CHECKBOX_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon12("CHECKBOX_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon12);
-

     wxIcon icon13("SLIDER_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon13("SLIDER_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon13);
-

     wxIcon icon14("GAUGE_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon14("GAUGE_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon14);
-

     wxIcon icon15("RADIOBOX_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon15("RADIOBOX_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon15);
-

     wxIcon icon16("RADIOBTN_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon16("RADIOBTN_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon16);
-

     wxIcon icon17("SCROLBAR_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
     wxIcon icon17("SCROLBAR_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);

-    m_imageList.Add(icon17);
+#else
+
+#include "bitmaps/arrow.xpm"
+    wxIcon icon1( arrow_xpm );
+#include "bitmaps/button.xpm"
+    wxIcon icon2( button_xpm );
+#include "bitmaps/bmpbuttn.xpm"
+    wxIcon icon3( bmpbuttn_xpm );
+#include "bitmaps/stattext.xpm"
+    wxIcon icon4( stattext_xpm );
+#include "bitmaps/statbmp.xpm"
+    wxIcon icon5( statbmp_xpm );
+#include "bitmaps/statbox.xpm"
+    wxIcon icon6( statbox_xpm );
+#include "bitmaps/textsing.xpm"
+    wxIcon icon7( textsing_xpm );
+#include "bitmaps/textmult.xpm"
+    wxIcon icon8( textmult_xpm );
+#include "bitmaps/listbox.xpm"
+    wxIcon icon9( listbox_xpm );
+#include "bitmaps/choice.xpm"
+    wxIcon icon10( choice_xpm );
+#include "bitmaps/combobox.xpm"
+    wxIcon icon11( combobox_xpm );
+#include "bitmaps/checkbox.xpm"
+    wxIcon icon12( checkbox_xpm );
+#include "bitmaps/slider.xpm"
+    wxIcon icon13( slider_xpm );
+#include "bitmaps/gauge.xpm"
+    wxIcon icon14( gauge_xpm );
+#include "bitmaps/radiobox.xpm"
+    wxIcon icon15( radiobox_xpm );
+#include "bitmaps/radiobtn.xpm"
+    wxIcon icon16( radiobtn_xpm );
+#include "bitmaps/scrolbar.xpm"
+    wxIcon icon17( scrolbar_xpm );
+#endif

 
 

+    m_imageList.Add(icon1);
+    m_imageList.Add(icon2);
+    m_imageList.Add(icon3);
+    m_imageList.Add(icon4);
+    m_imageList.Add(icon5);
+    m_imageList.Add(icon6);
+    m_imageList.Add(icon7);
+    m_imageList.Add(icon8);
+    m_imageList.Add(icon9);
+    m_imageList.Add(icon10);
+    m_imageList.Add(icon11);
+    m_imageList.Add(icon12);
+    m_imageList.Add(icon13);
+    m_imageList.Add(icon14);
+    m_imageList.Add(icon15);
+    m_imageList.Add(icon16);
+    m_imageList.Add(icon17);
+    

     SetImageList(& m_imageList, wxIMAGE_LIST_SMALL);
 
     long id = InsertItem(0,             "Pointer", 0);
     SetImageList(& m_imageList, wxIMAGE_LIST_SMALL);
 
     long id = InsertItem(0,             "Pointer", 0);

diff --git a/utils/dialoged/src/reseditr.cpp b/utils/dialoged/src/reseditr.cpp
index 2e82eb8c27702bdca543cd1865a9d630409bf711..ebdfdc6a8aa73d70999b63f893f7658c80e07a7d 100644 (file)
--- a/utils/dialoged/src/reseditr.cpp
+++ b/utils/dialoged/src/reseditr.cpp
@@ -32,6 +32,8 @@
 #include "wx/gauge.h"
 #include "wx/slider.h"
 #include "wx/textctrl.h"
 #include "wx/gauge.h"
 #include "wx/slider.h"
 #include "wx/textctrl.h"

+#include "wx/menu.h"
+#include "wx/toolbar.h"

 #endif
 
 #include "wx/scrolbar.h"
 #endif
 
 #include "wx/scrolbar.h"


@@ -51,7 +53,9 @@
 #include <windows.h>
 #endif
 
 #include <windows.h>
 #endif
 

+#ifndef __WXGTK__

 #include "wx/help.h"
 #include "wx/help.h"

+#endif

 
 #include "reseditr.h"
 #include "winprop.h"
 
 #include "reseditr.h"
 #include "winprop.h"


@@ -62,10 +66,10 @@
 static void ObjectMenuProc(wxMenu& menu, wxCommandEvent& event);
 wxResourceManager *wxResourceManager::sm_currentResourceManager = NULL;
 
 static void ObjectMenuProc(wxMenu& menu, wxCommandEvent& event);
 wxResourceManager *wxResourceManager::sm_currentResourceManager = NULL;
 

-#ifdef __X__
-#include "bitmaps/load.xbm"
-#include "bitmaps/save.xbm"
-#include "bitmaps/new.xbm"
+#ifdef __WXGTK__
+#include "bitmaps/load.xpm"
+#include "bitmaps/save.xpm"
+#include "bitmaps/new.xpm"

 #include "bitmaps/vert.xbm"
 #include "bitmaps/alignt.xbm"
 #include "bitmaps/alignb.xbm"
 #include "bitmaps/vert.xbm"
 #include "bitmaps/alignt.xbm"
 #include "bitmaps/alignb.xbm"


@@ -109,7 +113,9 @@ wxResourceManager::wxResourceManager():
   m_propertyWindowSize.width = 300;
   m_propertyWindowSize.height = 300;
 
   m_propertyWindowSize.width = 300;
   m_propertyWindowSize.height = 300;
 

+#ifndef __WXGTK__

   m_helpController = NULL;
   m_helpController = NULL;

+#endif

 
   m_bitmapImage = NULL;
   m_rootDialogItem = 0;
 
   m_bitmapImage = NULL;
   m_rootDialogItem = 0;


@@ -120,12 +126,15 @@ wxResourceManager::~wxResourceManager()
   sm_currentResourceManager = NULL;
   SaveOptions();
 
   sm_currentResourceManager = NULL;
   SaveOptions();
 

+#ifndef __WXGTK__

   if (m_helpController)
   {
     m_helpController->Quit();
     delete m_helpController;
     m_helpController = NULL;
   }
   if (m_helpController)
   {
     m_helpController->Quit();
     delete m_helpController;
     m_helpController = NULL;
   }

+#endif  
+  

   delete m_bitmapImage;
   delete m_popupMenu;
 }
   delete m_bitmapImage;
   delete m_popupMenu;
 }


@@ -139,7 +148,7 @@ bool wxResourceManager::Initialize()
   GetWindowsDirectory(buf, 256);
   strcat(buf, "\\dialoged.ini");
   m_optionsResourceFilename = buf;
   GetWindowsDirectory(buf, 256);
   strcat(buf, "\\dialoged.ini");
   m_optionsResourceFilename = buf;

-#elif defined(__X__)
+#elif defined(__WXGTK__)

   char buf[500];
   wxGetHomeDir(buf);
   strcat(buf, "/.dialogedrc");
   char buf[500];
   wxGetHomeDir(buf);
   strcat(buf, "/.dialogedrc");


@@ -150,8 +159,10 @@ bool wxResourceManager::Initialize()
 
   LoadOptions();
 
 
   LoadOptions();
 

+#ifndef __WXGTK__

   m_helpController = new wxHelpController;
   m_helpController->Initialize("dialoged");
   m_helpController = new wxHelpController;
   m_helpController->Initialize("dialoged");

+#endif

 
   m_popupMenu = new wxMenu("", (wxFunction)ObjectMenuProc);
   m_popupMenu->Append(OBJECT_MENU_EDIT, "Edit properties");
 
   m_popupMenu = new wxMenu("", (wxFunction)ObjectMenuProc);
   m_popupMenu->Append(OBJECT_MENU_EDIT, "Edit properties");


@@ -162,7 +173,7 @@ bool wxResourceManager::Initialize()
 #ifdef __WXMSW__
     m_bitmapImage = new wxBitmap("WXWINBMP", wxBITMAP_TYPE_BMP_RESOURCE);
 #endif
 #ifdef __WXMSW__
     m_bitmapImage = new wxBitmap("WXWINBMP", wxBITMAP_TYPE_BMP_RESOURCE);
 #endif

-#ifdef __X__
+#ifdef __WXGTK__

     m_bitmapImage = new wxBitmap(wxwin_bits, wxwin_width, wxwin_height);
 #endif
   }
     m_bitmapImage = new wxBitmap(wxwin_bits, wxwin_width, wxwin_height);
 #endif
   }


@@ -214,7 +225,7 @@ bool wxResourceManager::SaveOptions()
 
 // Show or hide the resource editor frame, which displays a list
 // of resources with ability to edit them.
 
 // Show or hide the resource editor frame, which displays a list
 // of resources with ability to edit them.

-bool wxResourceManager::ShowResourceEditor(bool show, wxWindow *parent, const char *title)
+bool wxResourceManager::ShowResourceEditor(bool show, wxWindow *WXUNUSED(parent), const char *title)

 {
   if (show)
   {
 {
   if (show)
   {


@@ -273,7 +284,12 @@ bool wxResourceManager::ShowResourceEditor(bool show, wxWindow *parent, const ch
     c->right.SameAs      (m_editorFrame, wxRight, 0);
     c->bottom.SameAs     (m_editorFrame, wxBottom, 0);
     c->width.Unconstrained();
     c->right.SameAs      (m_editorFrame, wxRight, 0);
     c->bottom.SameAs     (m_editorFrame, wxBottom, 0);
     c->width.Unconstrained();

+#ifdef __WXGTK__
+    c->height.Absolute(70);
+#else

     c->height.Absolute(60);
     c->height.Absolute(60);

+#endif
+

     m_editorControlList->SetConstraints(c);
 
     m_editorFrame->SetAutoLayout(TRUE);
     m_editorControlList->SetConstraints(c);
 
     m_editorFrame->SetAutoLayout(TRUE);


@@ -413,7 +429,7 @@ bool wxResourceManager::New(bool loadFromFile, const wxString& filename)
         str += m_symbolFilename;
         str += ".\nDialog Editor maintains a header file containing id symbols to be used in the application.\n";
         str += "The next time this .wxr file is saved, a header file will be saved also.";
         str += m_symbolFilename;
         str += ".\nDialog Editor maintains a header file containing id symbols to be used in the application.\n";
         str += "The next time this .wxr file is saved, a header file will be saved also.";

-        wxMessageBox(str, "Dialog Editor Warning", MB_OK);
+        wxMessageBox(str, "Dialog Editor Warning", wxOK );

 
         m_symbolIdCounter = 99;
     }
 
         m_symbolIdCounter = 99;
     }


@@ -428,7 +444,8 @@ bool wxResourceManager::New(bool loadFromFile, const wxString& filename)
     bool altered = RepairResourceIds();
     if (altered)
     {
     bool altered = RepairResourceIds();
     if (altered)
     {

-        wxMessageBox("Some resources have had new identifiers associated with them, since they were missing.", "Dialog Editor Warning", MB_OK);
+        wxMessageBox("Some resources have had new identifiers associated with them, since they were missing.", 
+                    "Dialog Editor Warning", wxOK );

         Modify(TRUE);
     }
     else
         Modify(TRUE);
     }
     else


@@ -446,7 +463,7 @@ bool wxResourceManager::New(bool loadFromFile, const wxString& filename)
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxResourceManager::Clear(bool deleteWindows, bool force)
+bool wxResourceManager::Clear(bool WXUNUSED(deleteWindows), bool force)

 {
   if (!force && Modified())
   {
 {
   if (!force && Modified())
   {


@@ -652,7 +669,7 @@ wxFrame *wxResourceManager::OnCreateEditorFrame(const char *title)
   return frame;
 }
 
   return frame;
 }
 

-wxMenuBar *wxResourceManager::OnCreateEditorMenuBar(wxFrame *parent)
+wxMenuBar *wxResourceManager::OnCreateEditorMenuBar(wxFrame *WXUNUSED(parent))

 {
   wxMenuBar *menuBar = new wxMenuBar;
 
 {
   wxMenuBar *menuBar = new wxMenuBar;
 


@@ -713,10 +730,10 @@ wxToolBar *wxResourceManager::OnCreateToolBar(wxFrame *parent)
   wxBitmap ToolbarToFrontBitmap("TOFRONTTOOL");
   wxBitmap ToolbarHelpBitmap("HELPTOOL");
 #endif
   wxBitmap ToolbarToFrontBitmap("TOFRONTTOOL");
   wxBitmap ToolbarHelpBitmap("HELPTOOL");
 #endif

-#ifdef __X__
-  wxBitmap ToolbarLoadBitmap(load_bits, load_width, load_height);
-  wxBitmap ToolbarSaveBitmap(save_bits, save_width, save_height);
-  wxBitmap ToolbarNewBitmap(new_bits, save_width, save_height);
+#ifdef __WXGTK__
+  wxBitmap ToolbarLoadBitmap( load_xpm );
+  wxBitmap ToolbarSaveBitmap( save_xpm);
+  wxBitmap ToolbarNewBitmap( new_xpm );

   wxBitmap ToolbarVertBitmap(vert_bits, vert_width, vert_height);
   wxBitmap ToolbarAlignTBitmap(alignt_bits, alignt_width, alignt_height);
   wxBitmap ToolbarAlignBBitmap(alignb_bits, alignb_width, alignb_height);
   wxBitmap ToolbarVertBitmap(vert_bits, vert_width, vert_height);
   wxBitmap ToolbarAlignTBitmap(alignt_bits, alignt_width, alignt_height);
   wxBitmap ToolbarAlignBBitmap(alignb_bits, alignb_width, alignb_height);


@@ -738,7 +755,7 @@ wxToolBar *wxResourceManager::OnCreateToolBar(wxFrame *parent)
   int dx = 2;
   int gap = 6;
 #else
   int dx = 2;
   int gap = 6;
 #else

-  int width = ToolbarLoadBitmap->GetWidth();
+  int width = 24; // ToolbarLoadBitmap->GetWidth();  ???

   int dx = 2;
   int gap = 6;
 #endif
   int dx = 2;
   int gap = 6;
 #endif


@@ -1980,68 +1997,70 @@ wxResourceEditorFrame::~wxResourceEditorFrame()
 {
 }
 
 {
 }
 

-void wxResourceEditorFrame::OnNew(wxCommandEvent& event)
+void wxResourceEditorFrame::OnNew(wxCommandEvent& WXUNUSED(event))

 {
       manager->New(FALSE);
 }
 
 {
       manager->New(FALSE);
 }
 

-void wxResourceEditorFrame::OnNewDialog(wxCommandEvent& event)
+void wxResourceEditorFrame::OnNewDialog(wxCommandEvent& WXUNUSED(event))

 {
       manager->CreateNewPanel();
 }
 
 {
       manager->CreateNewPanel();
 }
 

-void wxResourceEditorFrame::OnOpen(wxCommandEvent& event)
+void wxResourceEditorFrame::OnOpen(wxCommandEvent& WXUNUSED(event))

 {
       manager->New(TRUE);
 }
 
 {
       manager->New(TRUE);
 }
 

-void wxResourceEditorFrame::OnClear(wxCommandEvent& event)
+void wxResourceEditorFrame::OnClear(wxCommandEvent& WXUNUSED(event))

 {
       manager->Clear(TRUE, FALSE);
 }
 
 {
       manager->Clear(TRUE, FALSE);
 }
 

-void wxResourceEditorFrame::OnSave(wxCommandEvent& event)
+void wxResourceEditorFrame::OnSave(wxCommandEvent& WXUNUSED(event))

 {
       manager->Save();
 }
 
 {
       manager->Save();
 }
 

-void wxResourceEditorFrame::OnSaveAs(wxCommandEvent& event)
+void wxResourceEditorFrame::OnSaveAs(wxCommandEvent& WXUNUSED(event))

 {
       manager->SaveAs();
 }
 
 {
       manager->SaveAs();
 }
 

-void wxResourceEditorFrame::OnExit(wxCommandEvent& event)
+void wxResourceEditorFrame::OnExit(wxCommandEvent& WXUNUSED(event))

 {
          manager->Clear(TRUE, FALSE) ;
       this->Close();
 }
 
 {
          manager->Clear(TRUE, FALSE) ;
       this->Close();
 }
 

-void wxResourceEditorFrame::OnAbout(wxCommandEvent& event)
+void wxResourceEditorFrame::OnAbout(wxCommandEvent& WXUNUSED(event))

 {
       char buf[300];
       sprintf(buf, "wxWindows Dialog Editor %.1f\nAuthor: Julian Smart J.Smart@ed.ac.uk\nJulian Smart (c) 1996", wxDIALOG_EDITOR_VERSION);
       wxMessageBox(buf, "About Dialog Editor", wxOK|wxCENTRE);
 }
 
 {
       char buf[300];
       sprintf(buf, "wxWindows Dialog Editor %.1f\nAuthor: Julian Smart J.Smart@ed.ac.uk\nJulian Smart (c) 1996", wxDIALOG_EDITOR_VERSION);
       wxMessageBox(buf, "About Dialog Editor", wxOK|wxCENTRE);
 }
 

-void wxResourceEditorFrame::OnTest(wxCommandEvent& event)
+void wxResourceEditorFrame::OnTest(wxCommandEvent& WXUNUSED(event))

 {
     manager->TestCurrentDialog(this);
 }
 
 {
     manager->TestCurrentDialog(this);
 }
 

-void wxResourceEditorFrame::OnContents(wxCommandEvent& event)
+void wxResourceEditorFrame::OnContents(wxCommandEvent& WXUNUSED(event))

 {
 {

+#ifndef __WXGTK__

       wxBeginBusyCursor();
       manager->GetHelpController()->LoadFile();
       manager->GetHelpController()->DisplayContents();
       wxEndBusyCursor();
       wxBeginBusyCursor();
       manager->GetHelpController()->LoadFile();
       manager->GetHelpController()->DisplayContents();
       wxEndBusyCursor();

+#endif

 }
 
 }
 

-void wxResourceEditorFrame::OnDeleteSelection(wxCommandEvent& event)
+void wxResourceEditorFrame::OnDeleteSelection(wxCommandEvent& WXUNUSED(event))

 {
       manager->DeleteSelection();
 }
 
 {
       manager->DeleteSelection();
 }
 

-void wxResourceEditorFrame::OnRecreateSelection(wxCommandEvent& event)
+void wxResourceEditorFrame::OnRecreateSelection(wxCommandEvent& WXUNUSED(event))

 {
       manager->RecreateSelection();
 }
 {
       manager->RecreateSelection();
 }


@@ -2106,7 +2125,7 @@ void wxResourceEditorScrolledWindow::OnScroll(wxScrollEvent& event)
         m_childWindow->Move(m_marginX + (- x * 10), m_marginY + (- y * 10));
 }
 
         m_childWindow->Move(m_marginX + (- x * 10), m_marginY + (- y * 10));
 }
 

-void wxResourceEditorScrolledWindow::OnPaint(wxPaintEvent& event)
+void wxResourceEditorScrolledWindow::OnPaint(wxPaintEvent& WXUNUSED(event))

 {
     wxPaintDC dc(this);
 
 {
     wxPaintDC dc(this);
 


@@ -2201,10 +2220,12 @@ bool EditorToolBar::OnLeftClick(int toolIndex, bool toggled)
     }
     case TOOLBAR_HELP:
     {
     }
     case TOOLBAR_HELP:
     {

+#ifndef __WXGTK__

       wxBeginBusyCursor();
       manager->GetHelpController()->LoadFile();
       manager->GetHelpController()->DisplayContents();
       wxEndBusyCursor();
       wxBeginBusyCursor();
       manager->GetHelpController()->LoadFile();
       manager->GetHelpController()->DisplayContents();
       wxEndBusyCursor();

+#endif

       break;
     }
     case TOOLBAR_FORMAT_HORIZ:
       break;
     }
     case TOOLBAR_FORMAT_HORIZ:


@@ -2316,6 +2337,7 @@ void EditorToolBar::OnMouseEnter(int toolIndex)
 
 void EditorToolBar::OnPaint(wxPaintEvent& event)
 {
 
 void EditorToolBar::OnPaint(wxPaintEvent& event)
 {

+#ifndef __WXGTK__

   wxToolBar::OnPaint(event);
 
   wxPaintDC dc(this);
   wxToolBar::OnPaint(event);
 
   wxPaintDC dc(this);


@@ -2324,6 +2346,7 @@ void EditorToolBar::OnPaint(wxPaintEvent& event)
   dc.SetPen(wxBLACK_PEN);
   dc.SetBrush(wxTRANSPARENT_BRUSH);
   dc.DrawLine(0, h-1, w, h-1);
   dc.SetPen(wxBLACK_PEN);
   dc.SetBrush(wxTRANSPARENT_BRUSH);
   dc.DrawLine(0, h-1, w, h-1);

+#endif

 }
 
 
 }
 
 

diff --git a/utils/dialoged/src/reseditr.h b/utils/dialoged/src/reseditr.h
index 4af3085bb79a9c5f9c7dc0264876859bd48742f6..116bb3b0d84a10301285ab67119ae244dae1ea66 100644 (file)
--- a/utils/dialoged/src/reseditr.h
+++ b/utils/dialoged/src/reseditr.h
@@ -76,7 +76,7 @@ class wxResourceEditorControlList;
 #ifdef __WXMSW__
 #define wxHelpController wxWinHelpController
 #else
 #ifdef __WXMSW__
 #define wxHelpController wxWinHelpController
 #else

-#define wxHelpController wxXLPHelpController;
+#define wxHelpController wxHTMLHelpController;

 #endif
 
 class wxHelpController;
 #endif
 
 class wxHelpController;


@@ -286,7 +286,7 @@ public:
    inline wxResourceEditorControlList *GetEditorControlList() const { return m_editorControlList; }
    inline wxList& GetSelections() { return m_selections; }
    inline wxMenu *GetPopupMenu() const { return m_popupMenu; }
    inline wxResourceEditorControlList *GetEditorControlList() const { return m_editorControlList; }
    inline wxList& GetSelections() { return m_selections; }
    inline wxMenu *GetPopupMenu() const { return m_popupMenu; }

-   inline wxHelpController *GetHelpController() const { return m_helpController; }
+//   inline wxHelpController *GetHelpController() const { return m_helpController; }

 
    inline void Modify(bool mod = TRUE) { m_modified = mod; }
    inline bool Modified() const { return m_modified; }
 
    inline void Modify(bool mod = TRUE) { m_modified = mod; }
    inline bool Modified() const { return m_modified; }


@@ -310,7 +310,7 @@ public:
 
 // Member variables
  protected:
 
 // Member variables
  protected:

-   wxHelpController*                m_helpController;
+//   wxHelpController*                m_helpController;

    wxResourceTableWithSaving        m_resourceTable;
    wxFrame*                         m_editorFrame;
    wxResourceEditorScrolledWindow*  m_editorPanel;
    wxResourceTableWithSaving        m_resourceTable;
    wxFrame*                         m_editorFrame;
    wxResourceEditorScrolledWindow*  m_editorPanel;