Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DialogEd now compiles, links and runs under wxGTK

Browse Source 
I didn't say it worked, eh.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-08-15 14:45:04 +00:00
parent 8b21b87fe3
commit b127f3011f
36 changed files with 878 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
utils/dialoged/Makefile Normal file
View File

@@ -0,0 +1 @@
include ../../install/unix/setup/general/makedirs

3
utils/dialoged/src/.cvsignore Normal file
View File

@@ -0,0 +1,3 @@
Linux
linux-gnu
linux

1
utils/dialoged/src/Makefile Normal file
View File

@@ -0,0 +1 @@
include ../../../install/unix/setup/general/makedirs

28
utils/dialoged/src/Makefile.in Normal file
View File

@@ -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

44
utils/dialoged/src/bitmaps/aiai.xpm Normal file
View File

@@ -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 */
"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
"$$$$$$$$$$$$$$$..$$$$$$$$$$$$$$$",
"$$$$$$$$$$$$$$$..$$$$$$$$$$$$$$$",
"$$$$$$$$$$$$$$....$$$$$...$$$$$$",
"$$$$$$$$$$$$$.....$$$$.....$$$$$",
"$$$$$$$$$$$$$......$$$$...$$$$$$",
"$$$$$$$$$$$$.......$$$$$$$$$$$$$",
"$$$$$$$$$$$@+.......$$.....$$$$$",
"$$$$$$$$$$$@@+..######.....$$$$$",
"$$$$$$#$##@$@@+.$$$$$$.....#####",
"#########$$$$@@#######.....#####",
"#########$$$$@$$$$$$$$.....#####",
"########$@@$@$########.....####$",
"$$$$$$$.@$$@$$$$@+.........#$#$$",
"$$$$$$$..@@$@$@@$@+........$$$$$",
"$$$$$$...+@$@$@@$@$+.......$$$$$",
"$$$$$......@$@$$$$@$+......$$$$$",
"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
"$$$$$$$$.$$$$$.$$$$$.$$$$$.$$$$$",
"$$$$$$$...$$$$.$$$$...$$$$.$$$$$",
"$$$$$$$.$.$$.$.$.$$.$.$$.$.$$$$$",
"$$$$$$.....$$$.$$$.....$$$.$$$$$",
"$$$$$$.$$$.$$$.$$$.$$$.$$$.$$$$$",
"$$$$$.$$$$$.$$.$$.$$$$$.$$.$$$$$",
"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$"};

24
utils/dialoged/src/bitmaps/arrow.xpm Normal file
View File

@@ -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 */
" ",
" . ",
" .. ",
" ... ",
" .... ",
" ..... ",
" ...... ",
" ....... ",
" ........ ",
" ..... ",
" .. .. ",
" . .. ",
" .. ",
" .. ",
" .. ",
" "};

30
utils/dialoged/src/bitmaps/bmpbuttn.xpm Normal file
View File

@@ -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 */
" ",
" ",
" ",
"+++++++++++++++.",
"+@@.&&&&&&&&&&&.",
"+@@.&&&&&&&&&&&.",
"+@@.&&&&&&&&&&&.",
"+...............",
"+&&.&&&&&&&.%%%.",
"+&&.&&&&&&&.%%%.",
"+&&.........%%%.",
"+&&.$$$$.##.%%%.",
"+&&.$$$$.##.%%%.",
"+...............",
" ",
" "};

26
utils/dialoged/src/bitmaps/button.xpm Normal file
View File

@@ -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 */
" ",
" ",
" ",
"+++++++++++++++.",
"+@@@@@@@@@@@@@@.",
"+@@@@@@@@@@@@@@.",
"+@@@@@@@@@@@@@@.",
"+@@@@@@@@@@@@@@.",
"+@@@@@@@@@@@@@@.",
"+@@@@@@@@@@@@@@.",
"+@@@@@@@@@@@@@@.",
"+@@@@@@@@@@@@@@.",
"+@@@@@@@@@@@@@@.",
"+...............",
" ",
" "};

26
utils/dialoged/src/bitmaps/buttonsm.xpm Normal file
View File

@@ -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 */
" ",
" ",
" ",
" ",
" ",
" ++++++++++++ ",
" +@@@@@@@@@@. ",
" +@@@@@@@@@@. ",
" +@@@@@@@@@@. ",
" +........... ",
" ",
" ",
" ",
" ",
" ",
" "};

27
utils/dialoged/src/bitmaps/checkbox.xpm Normal file
View File

@@ -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 */
" ",
" @@@@@@@@@@@@@@ ",
" @............@ ",
" @.##########+@ ",
" @.#..####..#+@ ",
" @.#...##...#+@ ",
" @.##......##+@ ",
" @.###....###+@ ",
" @.###....###+@ ",
" @.##......##+@ ",
" @.#...##...#+@ ",
" @.#..####..#+@ ",
" @.##########+@ ",
" @.+++++++++++@ ",
" @@@@@@@@@@@@@@ ",
" "};

27
utils/dialoged/src/bitmaps/choice.xpm Normal file
View File

@@ -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 */
"@@@@@@@@@@@@@@@@",
"@..............@",
"@.########+++++@",
"@.########.....@",
"@.########+...+@",
"@.########++.++@",
"@.+++++++++++++@",
"@@@@@@@@@@@@@@@@",
" ##############",
" ..............",
" .#########+.+.",
" .#########....",
" .#########+++.",
" .#########....",
" .#########+.+.",
" .............."};

27
utils/dialoged/src/bitmaps/combobox.xpm Normal file
View File

@@ -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 */
"@@@@@@@@@@@@@@@@",
"@..............@",
"@....#####+++++@",
"@.#.######.....@",
"@.#.######+...+@",
"@....#####++.++@",
"@.+++++++++++++@",
"@@@@@@@@@@@@@@@@",
" ##############",
" ..............",
" .#########+.+.",
" .#########....",
" .#########+++.",
" .#########....",
" .#########+.+.",
" .............."};

28
utils/dialoged/src/bitmaps/dialog.xpm Normal file
View File

@@ -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 */
" ",
" $$$$$$$$$$$$$. ",
" $############. ",
" $############. ",
" $############. ",
" $++++++++++++. ",
" $+$$$$$+@@@@+. ",
" $+$$$$$+@@@@+. ",
" $+$$$$$++++++. ",
" $+$$$$$+@@@@+. ",
" $+++++++@@@@+. ",
" $++++++++++++. ",
" $++++++++++++. ",
" $++++++++++++. ",
" .............. ",
" "};

44
utils/dialoged/src/bitmaps/dialoged.xpm Normal file
View File

@@ -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 */
" .. ",
" .. ",
" @@@@@@@@@@@@@@@@@@@@@@@@@@@. ",
" @++++++++++++++++++++++++++. ",
" @++++++++++++++++++++++++++. ",
" @++++++++++++++++++++++++++. ",
" @##########################. ",
" @##########################. ",
" @#.............##@@@@@@@@.#. ",
" @#.$$$$$$$$$$$.##@@@@@@@@.#. ",
" @#.$$$$$$$$$$$.##@@@@@@@@.#. ",
" @#.............##.........#. ",
" @##########################. ",
" @##########################. ",
" @#.............##@@@@@@@@.#. ",
" @#.$$$$$$$$$$$.##@@@@@@@@.#. ",
" @#.............##@@@@@@@@.#. ",
" @#.$$$$$$$$$$$.##.........#. ",
" @#.............############. ",
" @#.$$$$$$$$$$$.############. ",
" @#.............############. ",
" @#.$$$$$$$$$$$.############. ",
" @#.............############. ",
" @##########################. ",
" @##########################. ",
" ............................ ",
" .. .. ",
" .. .. ",
" .. .. ",
" .. .. ",
" .. .. ",
" .. .. "};

28
utils/dialoged/src/bitmaps/folder1.xpm Normal file
View File

@@ -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 */
" ",
" @@@@@ ",
" @#+#+#@ ",
" @#+#+#+#@@@@@@ ",
" @$$$$$$$$$$$$@.",
" @$#+#+#+#+#+#@.",
" @$+#+#+#+#+#+@.",
" @$#+#+#+#+#+#@.",
" @$+#+#+#+#+#+@.",
" @$#+#+#+#+#+#@.",
" @$+#+#+#+#+#+@.",
" @$#+#+#+#+#+#@.",
" @@@@@@@@@@@@@@.",
" ..............",
" ",
" "};

28
utils/dialoged/src/bitmaps/folder2.xpm Normal file
View File

@@ -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 */
" ",
" @@@@@ ",
" @$$$$$@ ",
" @$#+#+#$@@@@@@ ",
" @$+#+#+$$$$$$@.",
" @$#+#+#+#+#+#@.",
"@@@@@@@@@@@@@#@.",
"@$$$$$$$$$$@@+@.",
"@$#+#+#+#+##.@@.",
" @$#+#+#+#+#+.@.",
" @$+#+#+#+#+#.@.",
" @$+#+#+#+##@..",
" @@@@@@@@@@@@@.",
" .............",
" ",
" "};

27
utils/dialoged/src/bitmaps/gauge.xpm Normal file
View File

@@ -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 */
" ",
" ",
" ",
"################",
"#..............#",
"#.++++++++@@@@@#",
"#.++++++++@@@@@#",
"#.++++++++@@@@@#",
"#.++++++++@@@@@#",
"#.++++++++@@@@@#",
"#.++++++++@@@@@#",
"#.++++++++@@@@@#",
"################",
" ",
" ",
" "};

27
utils/dialoged/src/bitmaps/listbox.xpm Normal file
View File

@@ -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 */
"@@@@@@@@@@@@@@@@",
"@..............@",
"@.##########+++@",
"@.##########+.+@",
"@.++++++++++...@",
"@.##########+++@",
"@.##########+++@",
"@.+++++++++++++@",
"@.##########+++@",
"@.##########+++@",
"@.+++++++++++++@",
"@.##########+++@",
"@.##########...@",
"@.##########+.+@",
"@.+++++++++++++@",
"@@@@@@@@@@@@@@@@"};

26
utils/dialoged/src/bitmaps/load.xpm Normal file
View File

@@ -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. ",
" ........... ",
" "
};

24
utils/dialoged/src/bitmaps/new.xpm Normal file
View File

@@ -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. ",
" ........... ",
" "
};

27
utils/dialoged/src/bitmaps/radiobox.xpm Normal file
View File

@@ -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 */
" . ",
" .. .. ",
"+++.+.++...++++.",
"+@.@...@@..@@@@.",
"+@.+++.+....++@.",
"+@++++++++++++@.",
"+@++++++++++++@.",
"+@++++...+++++@.",
"+@+++.###@++++@.",
"+@+++.#.#@++++@.",
"+@+++.###@++++@.",
"+@++++@@@+++++@.",
"+@++++++++++++@.",
"+@++++++++++++@.",
"+@@@@@@@@@@@@@@.",
"................"};

26
utils/dialoged/src/bitmaps/radiobtn.xpm Normal file
View File

@@ -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 */
" ",
" ",
" ",
" ",
" .... ",
" .@@@@+ ",
" .@@@@@@+ ",
" .@@@..@@@+ ",
" .@@....@@+ ",
" .@@@..@@@+ ",
" .@@@@@@+ ",
" .@@@@+ ",
" ++++ ",
" ",
" ",
" "};

25
utils/dialoged/src/bitmaps/save.xpm Normal file
View File

@@ -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. ",
" ............. "
};

26
utils/dialoged/src/bitmaps/scrolbar.xpm Normal file
View File

@@ -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 */
" ",
" ",
" ",
" ",
" ",
" ",
"++++.@@@@@@++++.",
"+@@@.@@@@@@+@@@.",
"+@@@.@@@@@@+@@@.",
"+....@@@@@@+....",
" ",
" ",
" ",
" ",
" ",
" "};

26
utils/dialoged/src/bitmaps/slider.xpm Normal file
View File

@@ -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 */
" ",
" ",
" ",
"++++. ",
"+@@@. ",
"+@@@.@@@@@@@@@@@",
"+@@@............",
"+@@@.+++++++++++",
"+@@@. ",
"+@@@. ",
" +@. ",
" + ",
" ",
" ",
" ",
" "};

30
utils/dialoged/src/bitmaps/statbmp.xpm Normal file
View File

@@ -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 */
" ",
" ",
" ",
"+++++++++++++++.",
"+@@.&&&&&&&&&&&.",
"+@@.&&&&&&&&&&&.",
"+@@.&&&&&&&&&&&.",
"+...............",
"+&&.&&&&&&&.%%%.",
"+&&.&&&&&&&.%%%.",
"+&&.........%%%.",
"+&&.$$$$.##.%%%.",
"+&&.$$$$.##.%%%.",
"+...............",
" ",
" "};

26
utils/dialoged/src/bitmaps/statbox.xpm Normal file
View File

@@ -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 */
" . ",
" .. .. ",
"+++.+.++...++++.",
"+@.@...@@..@@@@.",
"+@. . .... @.",
"+@ @.",
"+@ @.",
"+@ @.",
"+@ @.",
"+@ @.",
"+@ @.",
"+@ @.",
"+@ @.",
"+@ @.",
"+@@@@@@@@@@@@@@.",
"................"};

24
utils/dialoged/src/bitmaps/stattext.xpm Normal file
View File

@@ -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 */
" ",
" ",
" ",
" .. ",
" .. ",
" .... ",
" .... .... ",
" . . .. .. ",
" .. .. .... ",
" .. .. .. .. ",
" ...... .. .. ",
".. .. .. .. ",
".. .. ..... ",
" ",
" ",
" "};

27
utils/dialoged/src/bitmaps/textmult.xpm Normal file
View File

@@ -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 */
"@@@@@@@@@@@@@@@@",
"@..............@",
"@.##########+++@",
"@.#.#####.##+.+@",
"@.#.###.#.##...@",
"@.#.#.#.#.##+++@",
"@.##########+++@",
"@.##########+++@",
"@.#.#.######+++@",
"@.###.#.####+++@",
"@.#.#.#.####+++@",
"@.##########+++@",
"@.##########...@",
"@.##########+.+@",
"@.+++++++++++++@",
"@@@@@@@@@@@@@@@@"};

27
utils/dialoged/src/bitmaps/textsing.xpm Normal file
View File

@@ -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 */
" ",
" ",
" ",
"@@@@@@@@@@@@@@@@",
"@..............@",
"@.############+@",
"@.#...########+@",
"@.##.#########+@",
"@.##.#########+@",
"@.#...########+@",
"@.############+@",
"@.+++++++++++++@",
"@@@@@@@@@@@@@@@@",
" ",
" ",
" "};

1
utils/dialoged/src/dialoged.cpp
View File

@@ -1,4 +1,3 @@
/////////////////////////////////////////////////////////////////////////////
// Name: dialoged.cpp // Name: dialoged.cpp
// Purpose: Main Dialog Editor implementation file // Purpose: Main Dialog Editor implementation file
// Author: Julian Smart // Author: Julian Smart

6
utils/dialoged/src/dlghndlr.cpp
View File

@@ -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(); wxMenu *menu = resourceManager->GetPopupMenu();
menu->SetClientData((char *)handlerDialog); 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)

6
utils/dialoged/src/dlghndlr.h
View File

@@ -57,8 +57,10 @@ DECLARE_CLASS(wxResourceEditorDialogHandler)
virtual void OnItemLeftClick(wxControl *item, int x, int y, int keys); virtual void OnItemLeftClick(wxControl *item, int x, int y, int keys);
virtual void OnItemRightClick(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 OnItemSelect(wxControl *item, bool select);
virtual void OnItemMove(wxControl *item, int x, int y) {}; virtual void OnItemMove(
virtual void OnItemSize(wxControl *item, int w, int h) {}; 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 AddChildHandlers(void);
void PaintSelectionHandles(wxDC& dc); void PaintSelectionHandles(wxDC& dc);

89
utils/dialoged/src/edlist.cpp
View File

@@ -55,57 +55,80 @@ wxResourceEditorControlList::~wxResourceEditorControlList()
// Load icons and add to the list // Load icons and add to the list
void wxResourceEditorControlList::Initialize() 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); SetImageList(& m_imageList, wxIMAGE_LIST_SMALL);
long id = InsertItem(0, "Pointer", 0); long id = InsertItem(0, "Pointer", 0);

81
utils/dialoged/src/reseditr.cpp
View File

@@ -32,6 +32,8 @@
#include "wx/gauge.h" #include "wx/gauge.h"
#include "wx/slider.h" #include "wx/slider.h"
#include "wx/textctrl.h" #include "wx/textctrl.h"
#include "wx/menu.h"
#include "wx/toolbar.h"
#endif #endif
#include "wx/scrolbar.h" #include "wx/scrolbar.h"
@@ -51,7 +53,9 @@
#include <windows.h> #include <windows.h>
#endif #endif
#ifndef __WXGTK__
#include "wx/help.h" #include "wx/help.h"
#endif
#include "reseditr.h" #include "reseditr.h"
#include "winprop.h" #include "winprop.h"
@@ -62,10 +66,10 @@
static void ObjectMenuProc(wxMenu& menu, wxCommandEvent& event); static void ObjectMenuProc(wxMenu& menu, wxCommandEvent& event);
wxResourceManager *wxResourceManager::sm_currentResourceManager = NULL; wxResourceManager *wxResourceManager::sm_currentResourceManager = NULL;
#ifdef __X__ #ifdef __WXGTK__
#include "bitmaps/load.xbm" #include "bitmaps/load.xpm"
#include "bitmaps/save.xbm" #include "bitmaps/save.xpm"
#include "bitmaps/new.xbm" #include "bitmaps/new.xpm"
#include "bitmaps/vert.xbm" #include "bitmaps/vert.xbm"
#include "bitmaps/alignt.xbm" #include "bitmaps/alignt.xbm"
#include "bitmaps/alignb.xbm" #include "bitmaps/alignb.xbm"
@@ -109,7 +113,9 @@ wxResourceManager::wxResourceManager():
m_propertyWindowSize.width = 300; m_propertyWindowSize.width = 300;
m_propertyWindowSize.height = 300; m_propertyWindowSize.height = 300;
#ifndef __WXGTK__
m_helpController = NULL; m_helpController = NULL;
#endif
m_bitmapImage = NULL; m_bitmapImage = NULL;
m_rootDialogItem = 0; m_rootDialogItem = 0;
@@ -120,12 +126,15 @@ wxResourceManager::~wxResourceManager()
sm_currentResourceManager = NULL; sm_currentResourceManager = NULL;
SaveOptions(); SaveOptions();
#ifndef __WXGTK__
if (m_helpController) if (m_helpController)
{ {
m_helpController->Quit(); m_helpController->Quit();
delete m_helpController; delete m_helpController;
m_helpController = NULL; m_helpController = NULL;
} }
#endif
delete m_bitmapImage; delete m_bitmapImage;
delete m_popupMenu; delete m_popupMenu;
} }
@@ -139,7 +148,7 @@ bool wxResourceManager::Initialize()
GetWindowsDirectory(buf, 256); GetWindowsDirectory(buf, 256);
strcat(buf, "\\dialoged.ini"); strcat(buf, "\\dialoged.ini");
m_optionsResourceFilename = buf; m_optionsResourceFilename = buf;
#elif defined(__X__) #elif defined(__WXGTK__)
char buf[500]; char buf[500];
wxGetHomeDir(buf); wxGetHomeDir(buf);
strcat(buf, "/.dialogedrc"); strcat(buf, "/.dialogedrc");
@@ -150,8 +159,10 @@ bool wxResourceManager::Initialize()
LoadOptions(); LoadOptions();
#ifndef __WXGTK__
m_helpController = new wxHelpController; m_helpController = new wxHelpController;
m_helpController->Initialize("dialoged"); m_helpController->Initialize("dialoged");
#endif
m_popupMenu = new wxMenu("", (wxFunction)ObjectMenuProc); m_popupMenu = new wxMenu("", (wxFunction)ObjectMenuProc);
m_popupMenu->Append(OBJECT_MENU_EDIT, "Edit properties"); m_popupMenu->Append(OBJECT_MENU_EDIT, "Edit properties");
@@ -162,7 +173,7 @@ bool wxResourceManager::Initialize()
#ifdef __WXMSW__ #ifdef __WXMSW__
m_bitmapImage = new wxBitmap("WXWINBMP", wxBITMAP_TYPE_BMP_RESOURCE); m_bitmapImage = new wxBitmap("WXWINBMP", wxBITMAP_TYPE_BMP_RESOURCE);
#endif #endif
#ifdef __X__ #ifdef __WXGTK__
m_bitmapImage = new wxBitmap(wxwin_bits, wxwin_width, wxwin_height); m_bitmapImage = new wxBitmap(wxwin_bits, wxwin_width, wxwin_height);
#endif #endif
} }
@@ -214,7 +225,7 @@ bool wxResourceManager::SaveOptions()
// Show or hide the resource editor frame, which displays a list // Show or hide the resource editor frame, which displays a list
// of resources with ability to edit them. // 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->right.SameAs (m_editorFrame, wxRight, 0);
c->bottom.SameAs (m_editorFrame, wxBottom, 0); c->bottom.SameAs (m_editorFrame, wxBottom, 0);
c->width.Unconstrained(); c->width.Unconstrained();
#ifdef __WXGTK__
c->height.Absolute(70);
#else
c->height.Absolute(60); c->height.Absolute(60);
#endif
m_editorControlList->SetConstraints(c); m_editorControlList->SetConstraints(c);
m_editorFrame->SetAutoLayout(TRUE); m_editorFrame->SetAutoLayout(TRUE);
@@ -413,7 +429,7 @@ bool wxResourceManager::New(bool loadFromFile, const wxString& filename)
str += m_symbolFilename; str += m_symbolFilename;
str += ".\nDialog Editor maintains a header file containing id symbols to be used in the application.\n"; 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 += "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(); bool altered = RepairResourceIds();
if (altered) 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); Modify(TRUE);
} }
else 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 ToolbarToFrontBitmap("TOFRONTTOOL");
wxBitmap ToolbarHelpBitmap("HELPTOOL"); wxBitmap ToolbarHelpBitmap("HELPTOOL");
#endif #endif
#ifdef __X__ #ifdef __WXGTK__
wxBitmap ToolbarLoadBitmap(load_bits, load_width, load_height); wxBitmap ToolbarLoadBitmap( load_xpm );
wxBitmap ToolbarSaveBitmap(save_bits, save_width, save_height); wxBitmap ToolbarSaveBitmap( save_xpm);
wxBitmap ToolbarNewBitmap(new_bits, save_width, save_height); wxBitmap ToolbarNewBitmap( new_xpm );
wxBitmap ToolbarVertBitmap(vert_bits, vert_width, vert_height); wxBitmap ToolbarVertBitmap(vert_bits, vert_width, vert_height);
wxBitmap ToolbarAlignTBitmap(alignt_bits, alignt_width, alignt_height); wxBitmap ToolbarAlignTBitmap(alignt_bits, alignt_width, alignt_height);
wxBitmap ToolbarAlignBBitmap(alignb_bits, alignb_width, alignb_height); wxBitmap ToolbarAlignBBitmap(alignb_bits, alignb_width, alignb_height);
@@ -738,7 +755,7 @@ wxToolBar *wxResourceManager::OnCreateToolBar(wxFrame *parent)
int dx = 2; int dx = 2;
int gap = 6; int gap = 6;
#else #else
int width = ToolbarLoadBitmap->GetWidth(); int width = 24; // ToolbarLoadBitmap->GetWidth(); ???
int dx = 2; int dx = 2;
int gap = 6; int gap = 6;
#endif #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) ; manager->Clear(TRUE, FALSE) ;
this->Close(); this->Close();
} }
void wxResourceEditorFrame::OnAbout(wxCommandEvent& event) void wxResourceEditorFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{ {
char buf[300]; char buf[300];
sprintf(buf, "wxWindows Dialog Editor %.1f\nAuthor: Julian Smart J.Smart@ed.ac.uk\nJulian Smart (c) 1996", wxDIALOG_EDITOR_VERSION); 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); 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(); wxBeginBusyCursor();
manager->GetHelpController()->LoadFile(); manager->GetHelpController()->LoadFile();
manager->GetHelpController()->DisplayContents(); manager->GetHelpController()->DisplayContents();
wxEndBusyCursor(); 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(); wxBeginBusyCursor();
manager->GetHelpController()->LoadFile(); manager->GetHelpController()->LoadFile();
manager->GetHelpController()->DisplayContents(); manager->GetHelpController()->DisplayContents();
wxEndBusyCursor(); wxEndBusyCursor();
#endif
break; break;
} }
case TOOLBAR_FORMAT_HORIZ: 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); wxToolBar::OnPaint(event);
wxPaintDC dc(this); wxPaintDC dc(this);
@@ -2324,6 +2346,7 @@ void EditorToolBar::OnPaint(wxPaintEvent& event)
dc.SetPen(wxBLACK_PEN); dc.SetPen(wxBLACK_PEN);
dc.SetBrush(wxTRANSPARENT_BRUSH); dc.SetBrush(wxTRANSPARENT_BRUSH);
dc.DrawLine(0, h-1, w, h-1); dc.DrawLine(0, h-1, w, h-1);
#endif
} }

6
utils/dialoged/src/reseditr.h
View File

@@ -76,7 +76,7 @@ class wxResourceEditorControlList;
#ifdef __WXMSW__ #ifdef __WXMSW__
#define wxHelpController wxWinHelpController #define wxHelpController wxWinHelpController
#else #else
#define wxHelpController wxXLPHelpController; #define wxHelpController wxHTMLHelpController;
#endif #endif
class wxHelpController; class wxHelpController;
@@ -286,7 +286,7 @@ public:
inline wxResourceEditorControlList *GetEditorControlList() const { return m_editorControlList; } inline wxResourceEditorControlList *GetEditorControlList() const { return m_editorControlList; }
inline wxList& GetSelections() { return m_selections; } inline wxList& GetSelections() { return m_selections; }
inline wxMenu *GetPopupMenu() const { return m_popupMenu; } 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 void Modify(bool mod = TRUE) { m_modified = mod; }
inline bool Modified() const { return m_modified; } inline bool Modified() const { return m_modified; }
@@ -310,7 +310,7 @@ public:
// Member variables // Member variables
protected: protected:
wxHelpController* m_helpController; // wxHelpController* m_helpController;
wxResourceTableWithSaving m_resourceTable; wxResourceTableWithSaving m_resourceTable;
wxFrame* m_editorFrame; wxFrame* m_editorFrame;
wxResourceEditorScrolledWindow* m_editorPanel; wxResourceEditorScrolledWindow* m_editorPanel;