From 5f7bcb48fd9a642036a3bf5c70e2b0c9576df1b1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Mon, 30 Aug 2004 14:42:51 +0000 Subject: [PATCH] new stock buttons API git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 70 ++++---- build/bakefiles/files.bkl | 2 - build/msw/makefile.bcc | 28 --- build/msw/makefile.gcc | 28 --- build/msw/makefile.vc | 28 --- build/msw/makefile.wat | 28 --- build/msw/wx_core.dsp | 8 - build/msw/wx_wxregex.dsp | 64 +++---- docs/latex/wx/button.tex | 34 +--- docs/latex/wx/stockitems.tex | 103 +++++------ include/wx/button.h | 15 -- include/wx/cocoa/button.h | 24 +-- include/wx/defs.h | 27 ++- include/wx/gtk/button.h | 23 +-- include/wx/gtk1/button.h | 23 +-- include/wx/mac/carbon/button.h | 27 +-- include/wx/mac/classic/button.h | 27 +-- include/wx/motif/button.h | 26 +-- include/wx/msw/button.h | 25 +-- include/wx/os2/button.h | 25 +-- include/wx/stockitem.h | 72 +------- include/wx/univ/button.h | 31 +--- src/common/buttoncmn.cpp | 65 ------- src/common/dlgcmn.cpp | 28 +-- src/common/stockitem.cpp | 307 ++++++++++++++++++++------------ src/generic/dirdlgg.cpp | 4 +- src/generic/fdrepdlg.cpp | 4 +- src/generic/filedlgg.cpp | 8 +- src/generic/logg.cpp | 6 +- src/generic/progdlgg.cpp | 2 +- src/generic/tipdlg.cpp | 3 +- src/gtk/button.cpp | 60 +++---- src/gtk1/button.cpp | 60 +++---- src/html/helpfrm.cpp | 4 +- src/mac/carbon/button.cpp | 7 +- src/mac/classic/button.cpp | 7 +- src/motif/button.cpp | 7 +- src/msw/button.cpp | 7 +- src/os2/button.cpp | 6 +- src/univ/button.cpp | 7 +- 40 files changed, 499 insertions(+), 831 deletions(-) delete mode 100644 src/common/buttoncmn.cpp diff --git a/Makefile.in b/Makefile.in index 76515f9a6c..b5bd35f5bd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1886,6 +1886,7 @@ COND_TOOLKIT_WINCE_GUI_HDR = \ wx/msw/warning.ico \ wx/generic/fdrepdlg.h \ wx/generic/fontdlgg.h \ + wx/msw/wince/choicece.h \ wx/msw/wince/helpwce.h \ wx/msw/wince/libraries.h \ wx/msw/wince/missing.h \ @@ -2030,7 +2031,6 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/statbox.h \ wx/stattext.h \ wx/statusbr.h \ - wx/stockitem.h \ wx/textctrl.h \ wx/textdlg.h \ wx/toolbar.h \ @@ -2340,7 +2340,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_artprov.o \ monodll_artstd.o \ monodll_bmpbase.o \ - monodll_buttoncmn.o \ monodll_bookctrl.o \ monodll_choiccmn.o \ monodll_clipcmn.o \ @@ -2488,7 +2487,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_artprov.o \ monodll_artstd.o \ monodll_bmpbase.o \ - monodll_buttoncmn.o \ monodll_bookctrl.o \ monodll_choiccmn.o \ monodll_clipcmn.o \ @@ -3042,11 +3040,12 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS = \ monodll_dirdlgg.o \ monodll_fdrepdlg.o \ monodll_fontdlgg.o \ + monodll_choicece.o \ monodll_crt.o \ monodll_filedlgwce.o \ monodll_helpwce.o \ - monodll_tbarwce.o \ - monodll_menuce.o + monodll_menuce.o \ + monodll_tbarwce.o @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS) COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS = \ monodll_taskbarcmn.o \ @@ -3219,7 +3218,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_artprov.o \ monolib_artstd.o \ monolib_bmpbase.o \ - monolib_buttoncmn.o \ monolib_bookctrl.o \ monolib_choiccmn.o \ monolib_clipcmn.o \ @@ -3367,7 +3365,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_artprov.o \ monolib_artstd.o \ monolib_bmpbase.o \ - monolib_buttoncmn.o \ monolib_bookctrl.o \ monolib_choiccmn.o \ monolib_clipcmn.o \ @@ -3921,11 +3918,12 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1 = \ monolib_dirdlgg.o \ monolib_fdrepdlg.o \ monolib_fontdlgg.o \ + monolib_choicece.o \ monolib_crt.o \ monolib_filedlgwce.o \ monolib_helpwce.o \ - monolib_tbarwce.o \ - monolib_menuce.o + monolib_menuce.o \ + monolib_tbarwce.o @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_1) COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ monolib_taskbarcmn.o \ @@ -4284,7 +4282,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_artprov.o \ coredll_artstd.o \ coredll_bmpbase.o \ - coredll_buttoncmn.o \ coredll_bookctrl.o \ coredll_choiccmn.o \ coredll_clipcmn.o \ @@ -4432,7 +4429,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_artprov.o \ coredll_artstd.o \ coredll_bmpbase.o \ - coredll_buttoncmn.o \ coredll_bookctrl.o \ coredll_choiccmn.o \ coredll_clipcmn.o \ @@ -4986,11 +4982,12 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2 = \ coredll_dirdlgg.o \ coredll_fdrepdlg.o \ coredll_fontdlgg.o \ + coredll_choicece.o \ coredll_crt.o \ coredll_filedlgwce.o \ coredll_helpwce.o \ - coredll_tbarwce.o \ - coredll_menuce.o + coredll_menuce.o \ + coredll_tbarwce.o @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_2) COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___corelib___depname = \ $(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)$(LIBEXT) @@ -5016,7 +5013,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_artprov.o \ corelib_artstd.o \ corelib_bmpbase.o \ - corelib_buttoncmn.o \ corelib_bookctrl.o \ corelib_choiccmn.o \ corelib_clipcmn.o \ @@ -5164,7 +5160,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_artprov.o \ corelib_artstd.o \ corelib_bmpbase.o \ - corelib_buttoncmn.o \ corelib_bookctrl.o \ corelib_choiccmn.o \ corelib_clipcmn.o \ @@ -5718,11 +5713,12 @@ COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3 = \ corelib_dirdlgg.o \ corelib_fdrepdlg.o \ corelib_fontdlgg.o \ + corelib_choicece.o \ corelib_crt.o \ corelib_filedlgwce.o \ corelib_helpwce.o \ - corelib_tbarwce.o \ - corelib_menuce.o + corelib_menuce.o \ + corelib_tbarwce.o @COND_TOOLKIT_WINCE@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_WINCE___GUI_SRC_OBJECTS_3) COND_MONOLITHIC_0_SHARED_1_USE_GUI_1___advdll___depname = \ $(LIBDIRNAME)/$(DLLPREFIX)$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG)$(dll___targetsuf3) @@ -8181,6 +8177,9 @@ monodll_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c $(MONODLL_ODEP) monodll_helpchm.o: $(srcdir)/src/msw/helpchm.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +monodll_choicece.o: $(srcdir)/src/msw/wince/choicece.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + monodll_crt.o: $(srcdir)/src/msw/wince/crt.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -8190,10 +8189,10 @@ monodll_filedlgwce.o: $(srcdir)/src/msw/wince/filedlgwce.cpp $(MONODLL_ODEP) monodll_helpwce.o: $(srcdir)/src/msw/wince/helpwce.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -monodll_tbarwce.o: $(srcdir)/src/msw/wince/tbarwce.cpp $(MONODLL_ODEP) +monodll_menuce.o: $(srcdir)/src/msw/wince/menuce.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -monodll_menuce.o: $(srcdir)/src/msw/wince/menuce.cpp $(MONODLL_ODEP) +monodll_tbarwce.o: $(srcdir)/src/msw/wince/tbarwce.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< monodll_aga.o: $(srcdir)/src/mac/carbon/aga.cpp $(MONODLL_ODEP) @@ -10548,9 +10547,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_USE_GUI_1@monodll_buttoncmn.o: $(srcdir)/src/common/buttoncmn.cpp $(MONODLL_ODEP) -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_USE_GUI_1@monodll_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -11169,6 +11165,9 @@ monolib_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c $(MONOLIB_ODEP) monolib_helpchm.o: $(srcdir)/src/msw/helpchm.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +monolib_choicece.o: $(srcdir)/src/msw/wince/choicece.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + monolib_crt.o: $(srcdir)/src/msw/wince/crt.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -11178,10 +11177,10 @@ monolib_filedlgwce.o: $(srcdir)/src/msw/wince/filedlgwce.cpp $(MONOLIB_ODEP) monolib_helpwce.o: $(srcdir)/src/msw/wince/helpwce.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -monolib_tbarwce.o: $(srcdir)/src/msw/wince/tbarwce.cpp $(MONOLIB_ODEP) +monolib_menuce.o: $(srcdir)/src/msw/wince/menuce.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -monolib_menuce.o: $(srcdir)/src/msw/wince/menuce.cpp $(MONOLIB_ODEP) +monolib_tbarwce.o: $(srcdir)/src/msw/wince/tbarwce.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< monolib_aga.o: $(srcdir)/src/mac/carbon/aga.cpp $(MONOLIB_ODEP) @@ -13536,9 +13535,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_USE_GUI_1@monolib_buttoncmn.o: $(srcdir)/src/common/buttoncmn.cpp $(MONOLIB_ODEP) -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_USE_GUI_1@monolib_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -14703,6 +14699,9 @@ coredll_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c $(COREDLL_ODEP) coredll_helpchm.o: $(srcdir)/src/msw/helpchm.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< +coredll_choicece.o: $(srcdir)/src/msw/wince/choicece.cpp $(COREDLL_ODEP) + $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< + coredll_crt.o: $(srcdir)/src/msw/wince/crt.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -14712,10 +14711,10 @@ coredll_filedlgwce.o: $(srcdir)/src/msw/wince/filedlgwce.cpp $(COREDLL_ODEP) coredll_helpwce.o: $(srcdir)/src/msw/wince/helpwce.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -coredll_tbarwce.o: $(srcdir)/src/msw/wince/tbarwce.cpp $(COREDLL_ODEP) +coredll_menuce.o: $(srcdir)/src/msw/wince/menuce.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -coredll_menuce.o: $(srcdir)/src/msw/wince/menuce.cpp $(COREDLL_ODEP) +coredll_tbarwce.o: $(srcdir)/src/msw/wince/tbarwce.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< coredll_aga.o: $(srcdir)/src/mac/carbon/aga.cpp $(COREDLL_ODEP) @@ -16824,9 +16823,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< -@COND_USE_GUI_1@coredll_buttoncmn.o: $(srcdir)/src/common/buttoncmn.cpp $(COREDLL_ODEP) -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< - @COND_USE_GUI_1@coredll_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -17145,6 +17141,9 @@ corelib_xmcombo.o: $(srcdir)/src/motif/xmcombo/xmcombo.c $(CORELIB_ODEP) corelib_helpchm.o: $(srcdir)/src/msw/helpchm.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< +corelib_choicece.o: $(srcdir)/src/msw/wince/choicece.cpp $(CORELIB_ODEP) + $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< + corelib_crt.o: $(srcdir)/src/msw/wince/crt.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< @@ -17154,10 +17153,10 @@ corelib_filedlgwce.o: $(srcdir)/src/msw/wince/filedlgwce.cpp $(CORELIB_ODEP) corelib_helpwce.o: $(srcdir)/src/msw/wince/helpwce.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -corelib_tbarwce.o: $(srcdir)/src/msw/wince/tbarwce.cpp $(CORELIB_ODEP) +corelib_menuce.o: $(srcdir)/src/msw/wince/menuce.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -corelib_menuce.o: $(srcdir)/src/msw/wince/menuce.cpp $(CORELIB_ODEP) +corelib_tbarwce.o: $(srcdir)/src/msw/wince/tbarwce.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< corelib_aga.o: $(srcdir)/src/mac/carbon/aga.cpp $(CORELIB_ODEP) @@ -19266,9 +19265,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_bmpbase.o: $(srcdir)/src/common/bmpbase.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< -@COND_USE_GUI_1@corelib_buttoncmn.o: $(srcdir)/src/common/buttoncmn.cpp $(CORELIB_ODEP) -@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< - @COND_USE_GUI_1@corelib_bookctrl.o: $(srcdir)/src/common/bookctrl.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $< diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 1c00e590f4..e2f01a78cf 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -380,7 +380,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/common/artprov.cpp src/common/artstd.cpp src/common/bmpbase.cpp - src/common/buttoncmn.cpp src/common/bookctrl.cpp src/common/choiccmn.cpp src/common/clipcmn.cpp @@ -547,7 +546,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/statbox.h wx/stattext.h wx/statusbr.h - wx/stockitem.h wx/textctrl.h wx/textdlg.h wx/toolbar.h diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 95dbbd1283..9db4fc352c 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -985,7 +985,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_artprov.obj \ $(OBJS)\monodll_artstd.obj \ $(OBJS)\monodll_bmpbase.obj \ - $(OBJS)\monodll_buttoncmn.obj \ $(OBJS)\monodll_bookctrl.obj \ $(OBJS)\monodll_choiccmn.obj \ $(OBJS)\monodll_clipcmn.obj \ @@ -1180,7 +1179,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_artprov.obj \ $(OBJS)\monodll_artstd.obj \ $(OBJS)\monodll_bmpbase.obj \ - $(OBJS)\monodll_buttoncmn.obj \ $(OBJS)\monodll_bookctrl.obj \ $(OBJS)\monodll_choiccmn.obj \ $(OBJS)\monodll_clipcmn.obj \ @@ -1422,7 +1420,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_artprov.obj \ $(OBJS)\monolib_artstd.obj \ $(OBJS)\monolib_bmpbase.obj \ - $(OBJS)\monolib_buttoncmn.obj \ $(OBJS)\monolib_bookctrl.obj \ $(OBJS)\monolib_choiccmn.obj \ $(OBJS)\monolib_clipcmn.obj \ @@ -1617,7 +1614,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_artprov.obj \ $(OBJS)\monolib_artstd.obj \ $(OBJS)\monolib_bmpbase.obj \ - $(OBJS)\monolib_buttoncmn.obj \ $(OBJS)\monolib_bookctrl.obj \ $(OBJS)\monolib_choiccmn.obj \ $(OBJS)\monolib_clipcmn.obj \ @@ -1832,7 +1828,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_artprov.obj \ $(OBJS)\coredll_artstd.obj \ $(OBJS)\coredll_bmpbase.obj \ - $(OBJS)\coredll_buttoncmn.obj \ $(OBJS)\coredll_bookctrl.obj \ $(OBJS)\coredll_choiccmn.obj \ $(OBJS)\coredll_clipcmn.obj \ @@ -2027,7 +2022,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_artprov.obj \ $(OBJS)\coredll_artstd.obj \ $(OBJS)\coredll_bmpbase.obj \ - $(OBJS)\coredll_buttoncmn.obj \ $(OBJS)\coredll_bookctrl.obj \ $(OBJS)\coredll_choiccmn.obj \ $(OBJS)\coredll_clipcmn.obj \ @@ -2226,7 +2220,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_artprov.obj \ $(OBJS)\corelib_artstd.obj \ $(OBJS)\corelib_bmpbase.obj \ - $(OBJS)\corelib_buttoncmn.obj \ $(OBJS)\corelib_bookctrl.obj \ $(OBJS)\corelib_choiccmn.obj \ $(OBJS)\corelib_clipcmn.obj \ @@ -2421,7 +2414,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_artprov.obj \ $(OBJS)\corelib_artstd.obj \ $(OBJS)\corelib_bmpbase.obj \ - $(OBJS)\corelib_buttoncmn.obj \ $(OBJS)\corelib_bookctrl.obj \ $(OBJS)\corelib_choiccmn.obj \ $(OBJS)\corelib_clipcmn.obj \ @@ -4366,11 +4358,6 @@ $(OBJS)\monodll_bmpbase.obj: ..\..\src\common\bmpbase.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_buttoncmn.obj: ..\..\src\common\buttoncmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_bookctrl.obj: ..\..\src\common\bookctrl.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5846,11 +5833,6 @@ $(OBJS)\monolib_bmpbase.obj: ..\..\src\common\bmpbase.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_buttoncmn.obj: ..\..\src\common\buttoncmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_bookctrl.obj: ..\..\src\common\bookctrl.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -7482,11 +7464,6 @@ $(OBJS)\coredll_bmpbase.obj: ..\..\src\common\bmpbase.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_buttoncmn.obj: ..\..\src\common\buttoncmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_bookctrl.obj: ..\..\src\common\bookctrl.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -8614,11 +8591,6 @@ $(OBJS)\corelib_bmpbase.obj: ..\..\src\common\bmpbase.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_buttoncmn.obj: ..\..\src\common\buttoncmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_bookctrl.obj: ..\..\src\common\bookctrl.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index ecc2470a7a..e4ea0528f5 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -975,7 +975,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_artprov.o \ $(OBJS)\monodll_artstd.o \ $(OBJS)\monodll_bmpbase.o \ - $(OBJS)\monodll_buttoncmn.o \ $(OBJS)\monodll_bookctrl.o \ $(OBJS)\monodll_choiccmn.o \ $(OBJS)\monodll_clipcmn.o \ @@ -1172,7 +1171,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_artprov.o \ $(OBJS)\monodll_artstd.o \ $(OBJS)\monodll_bmpbase.o \ - $(OBJS)\monodll_buttoncmn.o \ $(OBJS)\monodll_bookctrl.o \ $(OBJS)\monodll_choiccmn.o \ $(OBJS)\monodll_clipcmn.o \ @@ -1418,7 +1416,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_artprov.o \ $(OBJS)\monolib_artstd.o \ $(OBJS)\monolib_bmpbase.o \ - $(OBJS)\monolib_buttoncmn.o \ $(OBJS)\monolib_bookctrl.o \ $(OBJS)\monolib_choiccmn.o \ $(OBJS)\monolib_clipcmn.o \ @@ -1615,7 +1612,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_artprov.o \ $(OBJS)\monolib_artstd.o \ $(OBJS)\monolib_bmpbase.o \ - $(OBJS)\monolib_buttoncmn.o \ $(OBJS)\monolib_bookctrl.o \ $(OBJS)\monolib_choiccmn.o \ $(OBJS)\monolib_clipcmn.o \ @@ -1844,7 +1840,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_artprov.o \ $(OBJS)\coredll_artstd.o \ $(OBJS)\coredll_bmpbase.o \ - $(OBJS)\coredll_buttoncmn.o \ $(OBJS)\coredll_bookctrl.o \ $(OBJS)\coredll_choiccmn.o \ $(OBJS)\coredll_clipcmn.o \ @@ -2041,7 +2036,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_artprov.o \ $(OBJS)\coredll_artstd.o \ $(OBJS)\coredll_bmpbase.o \ - $(OBJS)\coredll_buttoncmn.o \ $(OBJS)\coredll_bookctrl.o \ $(OBJS)\coredll_choiccmn.o \ $(OBJS)\coredll_clipcmn.o \ @@ -2246,7 +2240,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_artprov.o \ $(OBJS)\corelib_artstd.o \ $(OBJS)\corelib_bmpbase.o \ - $(OBJS)\corelib_buttoncmn.o \ $(OBJS)\corelib_bookctrl.o \ $(OBJS)\corelib_choiccmn.o \ $(OBJS)\corelib_clipcmn.o \ @@ -2443,7 +2436,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_artprov.o \ $(OBJS)\corelib_artstd.o \ $(OBJS)\corelib_bmpbase.o \ - $(OBJS)\corelib_buttoncmn.o \ $(OBJS)\corelib_bookctrl.o \ $(OBJS)\corelib_choiccmn.o \ $(OBJS)\corelib_clipcmn.o \ @@ -4508,11 +4500,6 @@ $(OBJS)\monodll_bmpbase.o: ../../src/common/bmpbase.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_buttoncmn.o: ../../src/common/buttoncmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\monodll_bookctrl.o: ../../src/common/bookctrl.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -6088,11 +6075,6 @@ $(OBJS)\monolib_bmpbase.o: ../../src/common/bmpbase.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_buttoncmn.o: ../../src/common/buttoncmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\monolib_bookctrl.o: ../../src/common/bookctrl.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -7824,11 +7806,6 @@ $(OBJS)\coredll_bmpbase.o: ../../src/common/bmpbase.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_buttoncmn.o: ../../src/common/buttoncmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\coredll_bookctrl.o: ../../src/common/bookctrl.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $< @@ -9056,11 +9033,6 @@ $(OBJS)\corelib_bmpbase.o: ../../src/common/bmpbase.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_buttoncmn.o: ../../src/common/buttoncmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\corelib_bookctrl.o: ../../src/common/bookctrl.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $< diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 0dfef1ce58..e1809c1661 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -1182,7 +1182,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_artprov.obj \ $(OBJS)\monodll_artstd.obj \ $(OBJS)\monodll_bmpbase.obj \ - $(OBJS)\monodll_buttoncmn.obj \ $(OBJS)\monodll_bookctrl.obj \ $(OBJS)\monodll_choiccmn.obj \ $(OBJS)\monodll_clipcmn.obj \ @@ -1377,7 +1376,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_artprov.obj \ $(OBJS)\monodll_artstd.obj \ $(OBJS)\monodll_bmpbase.obj \ - $(OBJS)\monodll_buttoncmn.obj \ $(OBJS)\monodll_bookctrl.obj \ $(OBJS)\monodll_choiccmn.obj \ $(OBJS)\monodll_clipcmn.obj \ @@ -1637,7 +1635,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_artprov.obj \ $(OBJS)\monolib_artstd.obj \ $(OBJS)\monolib_bmpbase.obj \ - $(OBJS)\monolib_buttoncmn.obj \ $(OBJS)\monolib_bookctrl.obj \ $(OBJS)\monolib_choiccmn.obj \ $(OBJS)\monolib_clipcmn.obj \ @@ -1832,7 +1829,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_artprov.obj \ $(OBJS)\monolib_artstd.obj \ $(OBJS)\monolib_bmpbase.obj \ - $(OBJS)\monolib_buttoncmn.obj \ $(OBJS)\monolib_bookctrl.obj \ $(OBJS)\monolib_choiccmn.obj \ $(OBJS)\monolib_clipcmn.obj \ @@ -2137,7 +2133,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_artprov.obj \ $(OBJS)\coredll_artstd.obj \ $(OBJS)\coredll_bmpbase.obj \ - $(OBJS)\coredll_buttoncmn.obj \ $(OBJS)\coredll_bookctrl.obj \ $(OBJS)\coredll_choiccmn.obj \ $(OBJS)\coredll_clipcmn.obj \ @@ -2332,7 +2327,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_artprov.obj \ $(OBJS)\coredll_artstd.obj \ $(OBJS)\coredll_bmpbase.obj \ - $(OBJS)\coredll_buttoncmn.obj \ $(OBJS)\coredll_bookctrl.obj \ $(OBJS)\coredll_choiccmn.obj \ $(OBJS)\coredll_clipcmn.obj \ @@ -2549,7 +2543,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_artprov.obj \ $(OBJS)\corelib_artstd.obj \ $(OBJS)\corelib_bmpbase.obj \ - $(OBJS)\corelib_buttoncmn.obj \ $(OBJS)\corelib_bookctrl.obj \ $(OBJS)\corelib_choiccmn.obj \ $(OBJS)\corelib_clipcmn.obj \ @@ -2744,7 +2737,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_artprov.obj \ $(OBJS)\corelib_artstd.obj \ $(OBJS)\corelib_bmpbase.obj \ - $(OBJS)\corelib_buttoncmn.obj \ $(OBJS)\corelib_bookctrl.obj \ $(OBJS)\corelib_choiccmn.obj \ $(OBJS)\corelib_clipcmn.obj \ @@ -4911,11 +4903,6 @@ $(OBJS)\monodll_bmpbase.obj: ..\..\src\common\bmpbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_buttoncmn.obj: ..\..\src\common\buttoncmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_bookctrl.obj: ..\..\src\common\bookctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -6391,11 +6378,6 @@ $(OBJS)\monolib_bmpbase.obj: ..\..\src\common\bmpbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_buttoncmn.obj: ..\..\src\common\buttoncmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_bookctrl.obj: ..\..\src\common\bookctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -8027,11 +8009,6 @@ $(OBJS)\coredll_bmpbase.obj: ..\..\src\common\bmpbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_buttoncmn.obj: ..\..\src\common\buttoncmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_bookctrl.obj: ..\..\src\common\bookctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -9159,11 +9136,6 @@ $(OBJS)\corelib_bmpbase.obj: ..\..\src\common\bmpbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_buttoncmn.obj: ..\..\src\common\buttoncmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_bookctrl.obj: ..\..\src\common\bookctrl.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index 73e24f88a0..f97032608e 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -237,7 +237,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_artprov.obj & $(OBJS)\monodll_artstd.obj & $(OBJS)\monodll_bmpbase.obj & - $(OBJS)\monodll_buttoncmn.obj & $(OBJS)\monodll_bookctrl.obj & $(OBJS)\monodll_choiccmn.obj & $(OBJS)\monodll_clipcmn.obj & @@ -434,7 +433,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_artprov.obj & $(OBJS)\monodll_artstd.obj & $(OBJS)\monodll_bmpbase.obj & - $(OBJS)\monodll_buttoncmn.obj & $(OBJS)\monodll_bookctrl.obj & $(OBJS)\monodll_choiccmn.obj & $(OBJS)\monodll_clipcmn.obj & @@ -683,7 +681,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_artprov.obj & $(OBJS)\monolib_artstd.obj & $(OBJS)\monolib_bmpbase.obj & - $(OBJS)\monolib_buttoncmn.obj & $(OBJS)\monolib_bookctrl.obj & $(OBJS)\monolib_choiccmn.obj & $(OBJS)\monolib_clipcmn.obj & @@ -880,7 +877,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_artprov.obj & $(OBJS)\monolib_artstd.obj & $(OBJS)\monolib_bmpbase.obj & - $(OBJS)\monolib_buttoncmn.obj & $(OBJS)\monolib_bookctrl.obj & $(OBJS)\monolib_choiccmn.obj & $(OBJS)\monolib_clipcmn.obj & @@ -1115,7 +1111,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_artprov.obj & $(OBJS)\coredll_artstd.obj & $(OBJS)\coredll_bmpbase.obj & - $(OBJS)\coredll_buttoncmn.obj & $(OBJS)\coredll_bookctrl.obj & $(OBJS)\coredll_choiccmn.obj & $(OBJS)\coredll_clipcmn.obj & @@ -1312,7 +1307,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_artprov.obj & $(OBJS)\coredll_artstd.obj & $(OBJS)\coredll_bmpbase.obj & - $(OBJS)\coredll_buttoncmn.obj & $(OBJS)\coredll_bookctrl.obj & $(OBJS)\coredll_choiccmn.obj & $(OBJS)\coredll_clipcmn.obj & @@ -1519,7 +1513,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_artprov.obj & $(OBJS)\corelib_artstd.obj & $(OBJS)\corelib_bmpbase.obj & - $(OBJS)\corelib_buttoncmn.obj & $(OBJS)\corelib_bookctrl.obj & $(OBJS)\corelib_choiccmn.obj & $(OBJS)\corelib_clipcmn.obj & @@ -1716,7 +1709,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_artprov.obj & $(OBJS)\corelib_artstd.obj & $(OBJS)\corelib_bmpbase.obj & - $(OBJS)\corelib_buttoncmn.obj & $(OBJS)\corelib_bookctrl.obj & $(OBJS)\corelib_choiccmn.obj & $(OBJS)\corelib_clipcmn.obj & @@ -4696,11 +4688,6 @@ $(OBJS)\monodll_bmpbase.obj : .AUTODEPEND ..\..\src\common\bmpbase.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\monodll_buttoncmn.obj : .AUTODEPEND ..\..\src\common\buttoncmn.cpp - $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\monodll_bookctrl.obj : .AUTODEPEND ..\..\src\common\bookctrl.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6276,11 +6263,6 @@ $(OBJS)\monolib_bmpbase.obj : .AUTODEPEND ..\..\src\common\bmpbase.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\monolib_buttoncmn.obj : .AUTODEPEND ..\..\src\common\buttoncmn.cpp - $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\monolib_bookctrl.obj : .AUTODEPEND ..\..\src\common\bookctrl.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -8012,11 +7994,6 @@ $(OBJS)\coredll_bmpbase.obj : .AUTODEPEND ..\..\src\common\bmpbase.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\coredll_buttoncmn.obj : .AUTODEPEND ..\..\src\common\buttoncmn.cpp - $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\coredll_bookctrl.obj : .AUTODEPEND ..\..\src\common\bookctrl.cpp $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -9244,11 +9221,6 @@ $(OBJS)\corelib_bmpbase.obj : .AUTODEPEND ..\..\src\common\bmpbase.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif -!ifeq USE_GUI 1 -$(OBJS)\corelib_buttoncmn.obj : .AUTODEPEND ..\..\src\common\buttoncmn.cpp - $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - !ifeq USE_GUI 1 $(OBJS)\corelib_bookctrl.obj : .AUTODEPEND ..\..\src\common\bookctrl.cpp $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index 09507d91ad..99849138c9 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -476,10 +476,6 @@ SOURCE=..\..\src\common\bookctrl.cpp # End Source File # Begin Source File -SOURCE=..\..\src\common\buttoncmn.cpp -# End Source File -# Begin Source File - SOURCE=..\..\src\common\choiccmn.cpp # End Source File # Begin Source File @@ -8586,10 +8582,6 @@ SOURCE=..\..\include\wx\statusbr.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\stockitem.h -# End Source File -# Begin Source File - SOURCE=..\..\include\wx\tab.h # End Source File # Begin Source File diff --git a/build/msw/wx_wxregex.dsp b/build/msw/wx_wxregex.dsp index 40178663d5..e2a9869b43 100644 --- a/build/msw/wx_wxregex.dsp +++ b/build/msw/wx_wxregex.dsp @@ -54,8 +54,8 @@ RSC=rc.exe # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivudll\wxregex" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /c -# ADD CPP /nologo /FD /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /c +# ADD BASE CPP /nologo /FD /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c +# ADD CPP /nologo /FD /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivu" /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -77,8 +77,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivuddll\wxregex" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "_UNICODE" /c -# ADD CPP /nologo /FD /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "_UNICODE" /c +# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c +# ADD CPP /nologo /FD /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -100,8 +100,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivdll\wxregex" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /c -# ADD CPP /nologo /FD /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /c +# ADD BASE CPP /nologo /FD /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c +# ADD CPP /nologo /FD /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswuniv" /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -123,8 +123,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswunivddll\wxregex" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /c +# ADD CPP /nologo /FD /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -146,8 +146,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswudll\wxregex" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /c -# ADD CPP /nologo /FD /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /c +# ADD BASE CPP /nologo /FD /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c +# ADD CPP /nologo /FD /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswu" /Fd..\..\lib\vc_dll\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -169,8 +169,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswuddll\wxregex" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "_UNICODE" /c -# ADD CPP /nologo /FD /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "_UNICODE" /c +# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c +# ADD CPP /nologo /FD /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -192,8 +192,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswdll\wxregex" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\msw" /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /c -# ADD CPP /nologo /FD /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\msw" /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /c +# ADD BASE CPP /nologo /FD /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\msw" /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c +# ADD CPP /nologo /FD /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\msw" /Fd..\..\lib\vc_dll\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -215,8 +215,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_dll" # PROP Intermediate_Dir "vc_mswddll\wxregex" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /c +# ADD CPP /nologo /FD /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_dll\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_dll\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -238,8 +238,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_lib" # PROP Intermediate_Dir "vc_mswunivu\wxregex" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /c -# ADD CPP /nologo /FD /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /c +# ADD BASE CPP /nologo /FD /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c +# ADD CPP /nologo /FD /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivu" /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -261,8 +261,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_lib" # PROP Intermediate_Dir "vc_mswunivud\wxregex" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "_UNICODE" /c -# ADD CPP /nologo /FD /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "_UNICODE" /c +# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c +# ADD CPP /nologo /FD /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -284,8 +284,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_lib" # PROP Intermediate_Dir "vc_mswuniv\wxregex" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /c -# ADD CPP /nologo /FD /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /c +# ADD BASE CPP /nologo /FD /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c +# ADD CPP /nologo /FD /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswuniv" /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -307,8 +307,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_lib" # PROP Intermediate_Dir "vc_mswunivd\wxregex" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /c +# ADD CPP /nologo /FD /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -330,8 +330,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_lib" # PROP Intermediate_Dir "vc_mswu\wxregex" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /c -# ADD CPP /nologo /FD /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "_UNICODE" /c +# ADD BASE CPP /nologo /FD /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c +# ADD CPP /nologo /FD /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswu" /Fd..\..\lib\vc_lib\wxregexu.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "_UNICODE" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -353,8 +353,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_lib" # PROP Intermediate_Dir "vc_mswud\wxregex" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "_UNICODE" /c -# ADD CPP /nologo /FD /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "_UNICODE" /c +# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c +# ADD CPP /nologo /FD /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexud.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -376,8 +376,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_lib" # PROP Intermediate_Dir "vc_msw\wxregex" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\msw" /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /c -# ADD CPP /nologo /FD /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\msw" /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /c +# ADD BASE CPP /nologo /FD /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\msw" /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c +# ADD CPP /nologo /FD /MD /W1 /O1 /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\msw" /Fd..\..\lib\vc_lib\wxregex.pdb /D "WIN32" /D "_LIB" /D "__WXMSW__" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe @@ -399,8 +399,8 @@ LIB32=link.exe -lib # PROP Output_Dir "..\..\lib\vc_lib" # PROP Intermediate_Dir "vc_mswd\wxregex" # PROP Target_Dir "" -# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c -# ADD CPP /nologo /FD /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /c +# ADD BASE CPP /nologo /FD /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /c +# ADD CPP /nologo /FD /MDd /W1 /Od /GR /GX /I "..\..\include" /I "..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\lib\vc_lib\wxregexd.pdb /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /c # ADD BASE RSC /l 0x405 # ADD RSC /l 0x405 BSC32=bscmake.exe diff --git a/docs/latex/wx/button.tex b/docs/latex/wx/button.tex index ac32dad9e1..0adf54ec43 100644 --- a/docs/latex/wx/button.tex +++ b/docs/latex/wx/button.tex @@ -50,23 +50,16 @@ when the button is clicked.} Default constructor. -\func{}{wxButton}{\param{wxWindow* }{parent}, \param{wxWindowID}{ id}, \param{const wxString\& }{label},\rtfsp +\func{}{wxButton}{\param{wxWindow* }{parent}, \param{wxWindowID}{ id}, \param{const wxString\& }{label = wxEmptyString},\rtfsp \param{const wxPoint\& }{pos}, \param{const wxSize\& }{size = wxDefaultSize},\rtfsp \param{long}{ style = 0}, \param{const wxValidator\& }{validator}, \param{const wxString\& }{name = ``button"}} -\func{}{wxButton}{\param{wxWindow* }{parent}, \param{wxWindowID}{ id}, -\param{wxStockItemID}{ stock},\rtfsp -\param{const wxString\& }{descriptiveLabel = wxEmptyString},\rtfsp -\param{const wxPoint\& }{pos},\rtfsp -\param{long}{ style = 0}, \param{const wxValidator\& }{validator}, \param{const wxString\& }{name = ``button"}} - Constructor, creating and showing a button. -The second form is used to create {\em stock} button. Stock buttons are -commonly used buttons such as OK or Cancel. They have standard label and -dimensions and may have different appearance on some platforms (e.g. GTK+ 2 -decorates them with icons). Using this from is preferred way of creating -standard buttons. +The preferred way to create standard buttons is to use default value of +\arg{label}. If no label is supplied and \arg{id} is one of standard IDs from +\helpref{this list}{stockitems}, standard label will be used. In additon to +that, the button will be decorated with stock icons under GTK+ 2. \wxheading{Parameters} @@ -87,15 +80,6 @@ appropriately for the text.} \docparam{name}{Window name.} -\docparam{stock}{Stock ID of the stock button to create. See the -\helpref{list of possible values}{stockitems}.} - -\docparam{descriptiveLabel}{Optional label to be used on platforms where -standard buttons have descriptive rather than generic labels. Mac is one such -platforms, well-behaved Mac apps should use descriptive labels (e.g. "Save" -and "Don't Save" instead of "OK" and "Cancel"). This argument is ignored on -other platforms.} - \wxheading{See also} \helpref{wxButton::Create}{wxbuttoncreate}, \helpref{wxValidator}{wxvalidator} @@ -108,16 +92,10 @@ Destructor, destroying the button. \membersection{wxButton::Create}\label{wxbuttoncreate} -\func{bool}{Create}{\param{wxWindow* }{parent}, \param{wxWindowID}{ id}, \param{const wxString\& }{label},\rtfsp +\func{bool}{Create}{\param{wxWindow* }{parent}, \param{wxWindowID}{ id}, \param{const wxString\& }{label = wxEmptyString},\rtfsp \param{const wxPoint\& }{pos}, \param{const wxSize\& }{size = wxDefaultSize},\rtfsp \param{long}{ style = 0}, \param{const wxValidator\& }{validator}, \param{const wxString\& }{name = ``button"}} -\func{bool}{Create}{\param{wxWindow* }{parent}, \param{wxWindowID}{ id}, -\param{wxStockItemID}{ stock},\rtfsp -\param{const wxString\& }{descriptiveLabel = wxEmptyString},\rtfsp -\param{const wxPoint\& }{pos},\rtfsp -\param{long}{ style = 0}, \param{const wxValidator\& }{validator}, \param{const wxString\& }{name = ``button"}} - Button creation function for two-step creation. For more details, see \helpref{wxButton::wxButton}{wxbuttonconstr}. diff --git a/docs/latex/wx/stockitems.tex b/docs/latex/wx/stockitems.tex index e912beaa42..cba41bc03c 100644 --- a/docs/latex/wx/stockitems.tex +++ b/docs/latex/wx/stockitems.tex @@ -1,56 +1,57 @@ \section{Stock items}\label{stockitems} -Stock item IDs for use in \helpref{wxButton constructor}{wxbuttonconstr}: +Window IDs for which stock buttons are created +(see \helpref{wxButton constructor}{wxbuttonconstr}): \begin{twocollist}\itemsep=0pt -\twocolitem{wxSTOCK\_ADD}{"Add"} -\twocolitem{wxSTOCK\_APPLY}{"\&Apply"} -\twocolitem{wxSTOCK\_BOLD}{"\&Bold"} -\twocolitem{wxSTOCK\_CANCEL}{"\&Cancel"} -\twocolitem{wxSTOCK\_CLEAR}{"\&Clear"} -\twocolitem{wxSTOCK\_CLOSE}{"\&Close"} -\twocolitem{wxSTOCK\_COPY}{"\&Copy"} -\twocolitem{wxSTOCK\_CUT}{"Cu\&t"} -\twocolitem{wxSTOCK\_DELETE}{"\&Delete"} -\twocolitem{wxSTOCK\_FIND}{"\&Find"} -\twocolitem{wxSTOCK\_FIND\_AND\_REPLACE}{"Find and rep\&lace"} -\twocolitem{wxSTOCK\_GO\_BACK}{"\&Back"} -\twocolitem{wxSTOCK\_GO\_DOWN}{"\&Down"} -\twocolitem{wxSTOCK\_GO\_FORWARD}{"\&Forward"} -\twocolitem{wxSTOCK\_GO\_UP}{"\&Up"} -\twocolitem{wxSTOCK\_HELP}{"\&Help"} -\twocolitem{wxSTOCK\_HOME}{"\&Home"} -\twocolitem{wxSTOCK\_INDENT}{"Indent"} -\twocolitem{wxSTOCK\_INDEX}{"\&Index"} -\twocolitem{wxSTOCK\_ITALIC}{"\&Italic"} -\twocolitem{wxSTOCK\_JUSTIFY\_CENTER}{"Centered"} -\twocolitem{wxSTOCK\_JUSTIFY\_FILL}{"Justified"} -\twocolitem{wxSTOCK\_JUSTIFY\_LEFT}{"Align Left"} -\twocolitem{wxSTOCK\_JUSTIFY\_RIGHT}{"Align Right"} -\twocolitem{wxSTOCK\_NEW}{"\&New"} -\twocolitem{wxSTOCK\_NO}{"\&No"} -\twocolitem{wxSTOCK\_OK}{"\&OK"} -\twocolitem{wxSTOCK\_OPEN}{"\&Open"} -\twocolitem{wxSTOCK\_PASTE}{"\&Paste"} -\twocolitem{wxSTOCK\_PREFERENCES}{"\&Preferences"} -\twocolitem{wxSTOCK\_PRINT}{"\&Print"} -\twocolitem{wxSTOCK\_PRINT\_PREVIEW}{"Print previe\&w"} -\twocolitem{wxSTOCK\_PROPERTIES}{"\&Properties"} -\twocolitem{wxSTOCK\_QUIT}{"\&Quit"} -\twocolitem{wxSTOCK\_REDO}{"\&Redo"} -\twocolitem{wxSTOCK\_REFRESH}{"Refresh"} -\twocolitem{wxSTOCK\_REMOVE}{"Remove"} -\twocolitem{wxSTOCK\_REVERT\_TO\_SAVED}{"Revert to Saved"} -\twocolitem{wxSTOCK\_SAVE}{"\&Save"} -\twocolitem{wxSTOCK\_SAVE\_AS}{"Save \&As..."} -\twocolitem{wxSTOCK\_STOP}{"\&Stop"} -\twocolitem{wxSTOCK\_UNDELETE}{"Undelete"} -\twocolitem{wxSTOCK\_UNDERLINE}{"\&Underline"} -\twocolitem{wxSTOCK\_UNDO}{"\&Undo"} -\twocolitem{wxSTOCK\_UNINDENT}{"\&Unindent"} -\twocolitem{wxSTOCK\_YES}{"\&Yes"} -\twocolitem{wxSTOCK\_ZOOM\_100}{"\&Actual Size"} -\twocolitem{wxSTOCK\_ZOOM\_FIT}{"Zoom to \&Fit"} -\twocolitem{wxSTOCK\_ZOOM\_IN}{"Zoom \&In"} -\twocolitem{wxSTOCK\_ZOOM\_OUT}{"Zoom \&Out"} +\twocolitem{wxID\_ADD}{"Add"} +\twocolitem{wxID\_APPLY}{"\&Apply"} +\twocolitem{wxID\_BOLD}{"\&Bold"} +\twocolitem{wxID\_CANCEL}{"\&Cancel"} +\twocolitem{wxID\_CLEAR}{"\&Clear"} +\twocolitem{wxID\_CLOSE}{"\&Close"} +\twocolitem{wxID\_COPY}{"\&Copy"} +\twocolitem{wxID\_CUT}{"Cu\&t"} +\twocolitem{wxID\_DELETE}{"\&Delete"} +\twocolitem{wxID\_FIND}{"\&Find"} +\twocolitem{wxID\_REPLACE}{"Find and rep\&lace"} +\twocolitem{wxID\_BACKWARD}{"\&Back"} +\twocolitem{wxID\_DOWN}{"\&Down"} +\twocolitem{wxID\_FORWARD}{"\&Forward"} +\twocolitem{wxID\_UP}{"\&Up"} +\twocolitem{wxID\_HELP}{"\&Help"} +\twocolitem{wxID\_HOME}{"\&Home"} +\twocolitem{wxID\_INDENT}{"Indent"} +\twocolitem{wxID\_INDEX}{"\&Index"} +\twocolitem{wxID\_ITALIC}{"\&Italic"} +\twocolitem{wxID\_JUSTIFY\_CENTER}{"Centered"} +\twocolitem{wxID\_JUSTIFY\_FILL}{"Justified"} +\twocolitem{wxID\_JUSTIFY\_LEFT}{"Align Left"} +\twocolitem{wxID\_JUSTIFY\_RIGHT}{"Align Right"} +\twocolitem{wxID\_NEW}{"\&New"} +\twocolitem{wxID\_NO}{"\&No"} +\twocolitem{wxID\_OK}{"\&OK"} +\twocolitem{wxID\_OPEN}{"\&Open"} +\twocolitem{wxID\_PASTE}{"\&Paste"} +\twocolitem{wxID\_PREFERENCES}{"\&Preferences"} +\twocolitem{wxID\_PRINT}{"\&Print"} +\twocolitem{wxID\_PREVIEW}{"Print previe\&w"} +\twocolitem{wxID\_PROPERTIES}{"\&Properties"} +\twocolitem{wxID\_EXIT}{"\&Quit"} +\twocolitem{wxID\_REDO}{"\&Redo"} +\twocolitem{wxID\_REFRESH}{"Refresh"} +\twocolitem{wxID\_REMOVE}{"Remove"} +\twocolitem{wxID\_REVERT\_TO\_SAVED}{"Revert to Saved"} +\twocolitem{wxID\_SAVE}{"\&Save"} +\twocolitem{wxID\_SAVEAS}{"Save \&As..."} +\twocolitem{wxID\_STOP}{"\&Stop"} +\twocolitem{wxID\_UNDELETE}{"Undelete"} +\twocolitem{wxID\_UNDERLINE}{"\&Underline"} +\twocolitem{wxID\_UNDO}{"\&Undo"} +\twocolitem{wxID\_UNINDENT}{"\&Unindent"} +\twocolitem{wxID\_YES}{"\&Yes"} +\twocolitem{wxID\_ZOOM\_100}{"\&Actual Size"} +\twocolitem{wxID\_ZOOM\_FIT}{"Zoom to \&Fit"} +\twocolitem{wxID\_ZOOM\_IN}{"Zoom \&In"} +\twocolitem{wxID\_ZOOM\_OUT}{"Zoom \&Out"} \end{twocollist}\itemsep=0pt diff --git a/include/wx/button.h b/include/wx/button.h index 3ddac2830e..a419b7df39 100644 --- a/include/wx/button.h +++ b/include/wx/button.h @@ -12,10 +12,6 @@ #ifndef _WX_BUTTON_H_BASE_ #define _WX_BUTTON_H_BASE_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "buttonbase.h" -#endif - #include "wx/defs.h" // ---------------------------------------------------------------------------- @@ -48,7 +44,6 @@ #define wxBU_EXACTFIT 0x0001 #include "wx/control.h" -#include "wx/stockitem.h" class WXDLLEXPORT wxBitmap; @@ -82,16 +77,6 @@ public: static wxSize GetDefaultSize(); protected: -#if !defined(__WXGTK20__) || defined(__WXUNIVERSAL__) - // create stock button (generic implementation) - bool CreateStock(wxWindow *parent, wxWindowID id, wxStockItemID stock, - const wxString& descriptiveLabel = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr); -#endif - DECLARE_NO_COPY_CLASS(wxButtonBase) }; diff --git a/include/wx/cocoa/button.h b/include/wx/cocoa/button.h index b0ecb12f7a..2624033e4a 100644 --- a/include/wx/cocoa/button.h +++ b/include/wx/cocoa/button.h @@ -28,7 +28,7 @@ class WXDLLEXPORT wxButton : public wxButtonBase, protected wxCocoaNSButton public: wxButton() { } wxButton(wxWindow *parent, wxWindowID winid, - const wxString& label, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, @@ -37,34 +37,14 @@ public: Create(parent, winid, label, pos, size, style, validator, name); } - wxButton(wxWindow *parent, wxWindowID winid, wxStockItemID stock, - const wxString& descriptiveLabel = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - { - Create(parent, winid, stock, descriptiveLabel, pos, style, validator, name); - } bool Create(wxWindow *parent, wxWindowID winid, - const wxString& label, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr); - bool Create(wxWindow *parent, wxWindowID winid, wxStockItemID stock, - const wxString& descriptiveLabel = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - { - return CreateStock(parent, winid, stock, descriptiveLabel, - pos, style, validator, name); - } - virtual ~wxButton(); // ------------------------------------------------------------------------ diff --git a/include/wx/defs.h b/include/wx/defs.h index 1fde195268..f385649ec3 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -1490,7 +1490,7 @@ enum wxID_FILE8, wxID_FILE9, - /* Standard button IDs */ + /* Standard button and menu IDs */ wxID_OK = 5100, wxID_CANCEL, wxID_APPLY, @@ -1509,6 +1509,31 @@ enum wxID_ABORT, wxID_RETRY, wxID_IGNORE, + wxID_ADD, + wxID_REMOVE, + + wxID_UP, + wxID_DOWN, + wxID_HOME, + wxID_REFRESH, + wxID_STOP, + wxID_INDEX, + + wxID_BOLD, + wxID_ITALIC, + wxID_JUSTIFY_CENTER, + wxID_JUSTIFY_FILL, + wxID_JUSTIFY_RIGHT, + wxID_JUSTIFY_LEFT, + wxID_UNDERLINE, + wxID_INDENT, + wxID_UNINDENT, + wxID_ZOOM_100, + wxID_ZOOM_FIT, + wxID_ZOOM_IN, + wxID_ZOOM_OUT, + wxID_UNDELETE, + wxID_REVERT_TO_SAVED, /* System menu IDs (used by wxUniv): */ wxID_SYSTEM_MENU = 5200, diff --git a/include/wx/gtk/button.h b/include/wx/gtk/button.h index fd2f1ef02b..0d1c3110c7 100644 --- a/include/wx/gtk/button.h +++ b/include/wx/gtk/button.h @@ -39,7 +39,8 @@ class wxButton: public wxButtonBase { public: wxButton(); - wxButton(wxWindow *parent, wxWindowID id, const wxString& label, + wxButton(wxWindow *parent, wxWindowID id, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, @@ -47,31 +48,15 @@ public: { Create(parent, id, label, pos, size, style, validator, name); } - - wxButton(wxWindow *parent, wxWindowID id, wxStockItemID stock, - const wxString& descriptiveLabel = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - { - Create(parent, id, stock, descriptiveLabel, pos, style, validator, name); - } virtual ~wxButton(); - bool Create(wxWindow *parent, wxWindowID id, const wxString& label, + bool Create(wxWindow *parent, wxWindowID id, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr); - - bool Create(wxWindow *parent, wxWindowID id, wxStockItemID stock, - const wxString& descriptiveLabel = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr); virtual void SetDefault(); virtual void SetLabel( const wxString &label ); diff --git a/include/wx/gtk1/button.h b/include/wx/gtk1/button.h index fd2f1ef02b..0d1c3110c7 100644 --- a/include/wx/gtk1/button.h +++ b/include/wx/gtk1/button.h @@ -39,7 +39,8 @@ class wxButton: public wxButtonBase { public: wxButton(); - wxButton(wxWindow *parent, wxWindowID id, const wxString& label, + wxButton(wxWindow *parent, wxWindowID id, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, @@ -47,31 +48,15 @@ public: { Create(parent, id, label, pos, size, style, validator, name); } - - wxButton(wxWindow *parent, wxWindowID id, wxStockItemID stock, - const wxString& descriptiveLabel = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - { - Create(parent, id, stock, descriptiveLabel, pos, style, validator, name); - } virtual ~wxButton(); - bool Create(wxWindow *parent, wxWindowID id, const wxString& label, + bool Create(wxWindow *parent, wxWindowID id, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr); - - bool Create(wxWindow *parent, wxWindowID id, wxStockItemID stock, - const wxString& descriptiveLabel = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr); virtual void SetDefault(); virtual void SetLabel( const wxString &label ); diff --git a/include/wx/mac/carbon/button.h b/include/wx/mac/carbon/button.h index 198096673f..e06a8e205c 100644 --- a/include/wx/mac/carbon/button.h +++ b/include/wx/mac/carbon/button.h @@ -27,7 +27,8 @@ class WXDLLEXPORT wxButton: public wxButtonBase DECLARE_DYNAMIC_CLASS(wxButton) public: inline wxButton() {} - inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label, + inline wxButton(wxWindow *parent, wxWindowID id, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, @@ -35,34 +36,14 @@ class WXDLLEXPORT wxButton: public wxButtonBase { Create(parent, id, label, pos, size, style, validator, name); } - - inline wxButton(wxWindow *parent, wxWindowID id, wxStockItemID stock, - const wxString& descriptiveLabel = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - { - Create(parent, id, stock, descriptiveLabel, pos, style, validator, name); - } - bool Create(wxWindow *parent, wxWindowID id, const wxString& label, + bool Create(wxWindow *parent, wxWindowID id, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr); - bool Create(wxWindow *parent, wxWindowID id, wxStockItemID stock, - const wxString& descriptiveLabel = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - { - return CreateStock(parent, id, stock, descriptiveLabel, - pos, style, validator, name); - } - virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ; static wxSize GetDefaultSize(); diff --git a/include/wx/mac/classic/button.h b/include/wx/mac/classic/button.h index 9c2bf37e93..b2afedf171 100644 --- a/include/wx/mac/classic/button.h +++ b/include/wx/mac/classic/button.h @@ -27,7 +27,8 @@ class WXDLLEXPORT wxButton: public wxButtonBase DECLARE_DYNAMIC_CLASS(wxButton) public: inline wxButton() {} - inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label, + inline wxButton(wxWindow *parent, wxWindowID id, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, @@ -36,32 +37,12 @@ class WXDLLEXPORT wxButton: public wxButtonBase Create(parent, id, label, pos, size, style, validator, name); } - inline wxButton(wxWindow *parent, wxWindowID id, wxStockItemID stock, - const wxString& descriptiveLabel = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - { - Create(parent, id, stock, descriptiveLabel, pos, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID id, const wxString& label, + bool Create(wxWindow *parent, wxWindowID id, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr); - - bool Create(wxWindow *parent, wxWindowID id, wxStockItemID stock, - const wxString& descriptiveLabel = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - { - return CreateStock(parent, id, stock, descriptiveLabel, - pos, style, validator, name); - } virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ; static wxSize GetDefaultSize(); diff --git a/include/wx/motif/button.h b/include/wx/motif/button.h index 7b08b21e6a..dc2feeb89d 100644 --- a/include/wx/motif/button.h +++ b/include/wx/motif/button.h @@ -25,7 +25,7 @@ public: wxButton() { } wxButton(wxWindow *parent, wxWindowID id, - const wxString& label, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, @@ -34,33 +34,13 @@ public: Create(parent, id, label, pos, size, style, validator, name); } - wxButton(wxWindow *parent, wxWindowID id, wxStockItemID stock, - const wxString& descriptiveLabel = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - { - Create(parent, id, stock, descriptiveLabel, pos, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID id, const wxString& label, + bool Create(wxWindow *parent, wxWindowID id, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr); - bool Create(wxWindow *parent, wxWindowID id, wxStockItemID stock, - const wxString& descriptiveLabel = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - { - return CreateStock(parent, id, stock, descriptiveLabel, - pos, style, validator, name); - } - virtual void SetDefault(); virtual void Command(wxCommandEvent& event); diff --git a/include/wx/msw/button.h b/include/wx/msw/button.h index 3ee9145ae9..2728b70739 100644 --- a/include/wx/msw/button.h +++ b/include/wx/msw/button.h @@ -26,7 +26,7 @@ public: wxButton() { } wxButton(wxWindow *parent, wxWindowID id, - const wxString& label, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, @@ -36,30 +36,9 @@ public: Create(parent, id, label, pos, size, style, validator, name); } - wxButton(wxWindow *parent, wxWindowID id, wxStockItemID stock, - const wxString& descriptiveLabel = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - { - Create(parent, id, stock, descriptiveLabel, pos, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID id, wxStockItemID stock, - const wxString& descriptiveLabel = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - { - return CreateStock(parent, id, stock, descriptiveLabel, - pos, style, validator, name); - } - bool Create(wxWindow *parent, wxWindowID id, - const wxString& label, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h index 1617192173..272bb08899 100644 --- a/include/wx/os2/button.h +++ b/include/wx/os2/button.h @@ -21,7 +21,7 @@ class WXDLLEXPORT wxButton: public wxButtonBase inline wxButton() {} inline wxButton( wxWindow* pParent ,wxWindowID vId - ,const wxString& rsLabel + ,const wxString& rsLabel = wxEmptyString ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize ,long lStyle = 0 @@ -39,20 +39,10 @@ class WXDLLEXPORT wxButton: public wxButtonBase ,rsName ); } - - wxButton(wxWindow *parent, wxWindowID id, wxStockItemID stock, - const wxString& descriptiveLabel = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - { - Create(parent, id, stock, descriptiveLabel, pos, style, validator, name); - } bool Create( wxWindow* pParent ,wxWindowID vId - ,const wxString& rsLabel + ,const wxString& rsLabel = wxEmptyString ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize ,long lStyle = 0 @@ -60,17 +50,6 @@ class WXDLLEXPORT wxButton: public wxButtonBase ,const wxString& rsName = wxButtonNameStr ); - bool Create(wxWindow *parent, wxWindowID id, wxStockItemID stock, - const wxString& descriptiveLabel = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - { - return CreateStock(parent, id, stock, descriptiveLabel, - pos, style, validator, name); - } - virtual ~wxButton(); virtual void SetDefault(void); diff --git a/include/wx/stockitem.h b/include/wx/stockitem.h index 0b157887dc..56847d3fce 100644 --- a/include/wx/stockitem.h +++ b/include/wx/stockitem.h @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: wx/stockitem.h -// Purpose: wxStockItemID enum +// Purpose: stock items helpers (privateh header) // Author: Vaclav Slavik // Modified by: // Created: 2004-08-15 @@ -20,77 +20,23 @@ #include "wx/string.h" // ---------------------------------------------------------------------------- -// Stock item IDs for use with wxButton, wxMenu and wxToolBar: +// Helper functions for stock items handling: // ---------------------------------------------------------------------------- -enum wxStockItemID -{ - wxSTOCK_NONE = 0, - wxSTOCK_ADD, - wxSTOCK_APPLY, - wxSTOCK_BOLD, - wxSTOCK_CANCEL, - wxSTOCK_CLEAR, - wxSTOCK_CLOSE, - wxSTOCK_COPY, - wxSTOCK_CUT, - wxSTOCK_DELETE, - wxSTOCK_FIND, - wxSTOCK_FIND_AND_REPLACE, - wxSTOCK_GO_BACK, - wxSTOCK_GO_DOWN, - wxSTOCK_GO_FORWARD, - wxSTOCK_GO_UP, - wxSTOCK_HELP, - wxSTOCK_HOME, - wxSTOCK_INDENT, - wxSTOCK_INDEX, - wxSTOCK_ITALIC, - wxSTOCK_JUSTIFY_CENTER, - wxSTOCK_JUSTIFY_FILL, - wxSTOCK_JUSTIFY_LEFT, - wxSTOCK_JUSTIFY_RIGHT, - wxSTOCK_NEW, - wxSTOCK_NO, - wxSTOCK_OK, - wxSTOCK_OPEN, - wxSTOCK_PASTE, - wxSTOCK_PREFERENCES, - wxSTOCK_PRINT, - wxSTOCK_PRINT_PREVIEW, - wxSTOCK_PROPERTIES, - wxSTOCK_QUIT, - wxSTOCK_REDO, - wxSTOCK_REFRESH, - wxSTOCK_REMOVE, - wxSTOCK_REVERT_TO_SAVED, - wxSTOCK_SAVE, - wxSTOCK_SAVE_AS, - wxSTOCK_STOP, - wxSTOCK_UNDELETE, - wxSTOCK_UNDERLINE, - wxSTOCK_UNDO, - wxSTOCK_UNINDENT, - wxSTOCK_YES, - wxSTOCK_ZOOM_100, - wxSTOCK_ZOOM_FIT, - wxSTOCK_ZOOM_IN, - wxSTOCK_ZOOM_OUT - // NB: when you add new item here, add it to stockitem.cpp and - // documentation as well -}; +// Returns true if the ID is in the list of recognized stock actions +bool wxIsStockID(wxWindowID id); -// ---------------------------------------------------------------------------- -// Helper functions: -// ---------------------------------------------------------------------------- +// Returns true of the label is empty or label of a stock button with +// given ID +bool wxIsStockLabel(wxWindowID id, const wxString& label); // Returns label that should be used for given stock UI element (e.g. "&OK" // for wxSTOCK_OK): -wxString wxGetStockItemLabel(wxStockItemID item); +wxString wxGetStockLabel(wxWindowID id); #ifdef __WXGTK20__ // Translates stock ID to GTK+'s stock item string indentifier: -const char *wxStockItemToGTK(wxStockItemID item); +const char *wxGetStockGtkID(wxWindowID id); #endif #endif // _WX_STOCKITEM_H_ diff --git a/include/wx/univ/button.h b/include/wx/univ/button.h index a3732858e8..68a56beb8e 100644 --- a/include/wx/univ/button.h +++ b/include/wx/univ/button.h @@ -40,7 +40,7 @@ public: wxButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, - const wxString& label, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, @@ -52,21 +52,9 @@ public: Create(parent, id, bitmap, label, pos, size, style, validator, name); } - wxButton(wxWindow *parent, wxWindowID id, wxStockItemID stock, - const wxString& descriptiveLabel = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - { - Init(); - - Create(parent, id, stock, descriptiveLabel, pos, style, validator, name); - } - wxButton(wxWindow *parent, wxWindowID id, - const wxString& label, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, @@ -80,7 +68,7 @@ public: bool Create(wxWindow *parent, wxWindowID id, - const wxString& label, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, @@ -91,21 +79,10 @@ public: pos, size, style, validator, name); } - bool Create(wxWindow *parent, wxWindowID id, wxStockItemID stock, - const wxString& descriptiveLabel = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - { - return CreateStock(parent, id, stock, descriptiveLabel, - pos, style, validator, name); - } - bool Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, - const wxString& label, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, diff --git a/src/common/buttoncmn.cpp b/src/common/buttoncmn.cpp deleted file mode 100644 index 7c270e56af..0000000000 --- a/src/common/buttoncmn.cpp +++ /dev/null @@ -1,65 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: common/buttoncmn.cpp -// Purpose: wxMenu and wxMenuBar methods common to all ports -// Author: Vaclav Slavik -// Modified by: -// Created: 2004-08-15 -// RCS-ID: $Id$ -// Copyright: (c) Vaclav Slavik, 2004 -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "buttonbase.h" -#endif - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#if wxUSE_BUTTON - -#include "wx/button.h" - -#if !defined(__WXGTK20__) || defined(__WXUNIVERSAL__) -bool wxButtonBase::CreateStock(wxWindow *parent, - wxWindowID id, - wxStockItemID stock, - const wxString& descriptiveLabel, - const wxPoint& pos, - long style, - const wxValidator& validator, - const wxString& name) -{ - wxString label; -#if !defined(__WXMAC__) && !defined(__WXCOCOA__) - wxUnusedVar(descriptiveLabel); -#else // defined(__WXMAC__) || defined(__WXCOCOA__) - if (!descriptiveLabel.empty()) - { - label = descriptiveLabel; - } - else -#endif - { - label = wxGetStockItemLabel(stock); - } - - return wxStaticCast(this, wxButton)->Create(parent, id, label, - pos, wxDefaultSize, - style, validator, name); -} -#endif - -#endif // wxUSE_BUTTON diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp index 4894b08cbb..374efff5f1 100644 --- a/src/common/dlgcmn.cpp +++ b/src/common/dlgcmn.cpp @@ -205,33 +205,33 @@ wxSizer *wxDialogBase::CreateButtonSizer( long flags ) if (flags & wxYES) { - yes = new wxButton(this, wxID_YES, wxSTOCK_YES, - wxEmptyString, wxDefaultPosition, wxCLIP_SIBLINGS); + yes = new wxButton(this, wxID_YES, wxEmptyString, + wxDefaultPosition, wxDefaultSize, wxCLIP_SIBLINGS); inner_yes_no->Add( yes, 0, wxLEFT|wxRIGHT, margin ); } if (flags & wxNO) { - no = new wxButton(this, wxID_NO, wxSTOCK_NO, - wxEmptyString, wxDefaultPosition, wxCLIP_SIBLINGS); + no = new wxButton(this, wxID_NO, wxEmptyString, + wxDefaultPosition, wxDefaultSize, wxCLIP_SIBLINGS); inner_yes_no->Add( no, 0, wxLEFT|wxRIGHT, margin ); } if (flags & wxOK) { - ok = new wxButton(this, wxID_OK, wxSTOCK_OK, - wxEmptyString, wxDefaultPosition, wxCLIP_SIBLINGS); + ok = new wxButton(this, wxID_OK, wxEmptyString, + wxDefaultPosition, wxDefaultSize, wxCLIP_SIBLINGS); inner_rest->Add( ok, 0, wxLEFT|wxRIGHT, margin ); } if (flags & wxFORWARD) - inner_rest->Add(new wxButton(this, wxID_FORWARD, wxSTOCK_GO_FORWARD, - wxEmptyString, wxDefaultPosition, + inner_rest->Add(new wxButton(this, wxID_FORWARD, wxEmptyString, + wxDefaultPosition, wxDefaultSize, wxCLIP_SIBLINGS), 0, wxLEFT|wxRIGHT, margin); if (flags & wxBACKWARD) - inner_rest->Add(new wxButton(this, wxID_BACKWARD, wxSTOCK_GO_BACK, - wxEmptyString, wxDefaultPosition, + inner_rest->Add(new wxButton(this, wxID_BACKWARD, wxEmptyString, + wxDefaultPosition, wxDefaultSize, wxCLIP_SIBLINGS), 0, wxLEFT|wxRIGHT, margin); @@ -242,15 +242,15 @@ wxSizer *wxDialogBase::CreateButtonSizer( long flags ) inner_rest->Add( new wxButton( this, wxID_MORE, _("More..."),wxDefaultPosition,wxDefaultSize,wxCLIP_SIBLINGS ), 0, wxLEFT|wxRIGHT, margin ); if (flags & wxHELP) - inner_rest->Add(new wxButton(this, wxID_HELP, wxSTOCK_HELP, - wxEmptyString, wxDefaultPosition, + inner_rest->Add(new wxButton(this, wxID_HELP, wxEmptyString, + wxDefaultPosition, wxDefaultSize, wxCLIP_SIBLINGS), 0, wxLEFT|wxRIGHT, margin); if (flags & wxCANCEL) { - wxButton *cancel = new wxButton(this, wxID_CANCEL, wxSTOCK_CANCEL, - wxEmptyString, wxDefaultPosition, + wxButton *cancel = new wxButton(this, wxID_CANCEL, wxEmptyString, + wxDefaultPosition, wxDefaultSize, wxCLIP_SIBLINGS); inner_rest->Add( cancel, 0, wxLEFT|wxRIGHT, margin ); } diff --git a/src/common/stockitem.cpp b/src/common/stockitem.cpp index c6325d7a2e..80fd5e25f5 100644 --- a/src/common/stockitem.cpp +++ b/src/common/stockitem.cpp @@ -31,66 +31,127 @@ #include "wx/stockitem.h" #include "wx/intl.h" -wxString wxGetStockItemLabel(wxStockItemID item) + +bool wxIsStockID(wxWindowID id) +{ + switch (id) + { + case wxID_ADD: + case wxID_APPLY: + case wxID_BOLD: + case wxID_CANCEL: + case wxID_CLEAR: + case wxID_CLOSE: + case wxID_COPY: + case wxID_CUT: + case wxID_DELETE: + case wxID_FIND: + case wxID_REPLACE: + case wxID_BACKWARD: + case wxID_DOWN: + case wxID_FORWARD: + case wxID_UP: + case wxID_HELP: + case wxID_HOME: + case wxID_INDENT: + case wxID_INDEX: + case wxID_ITALIC: + case wxID_JUSTIFY_CENTER: + case wxID_JUSTIFY_FILL: + case wxID_JUSTIFY_LEFT: + case wxID_JUSTIFY_RIGHT: + case wxID_NEW: + case wxID_NO: + case wxID_OK: + case wxID_OPEN: + case wxID_PASTE: + case wxID_PREFERENCES: + case wxID_PRINT: + case wxID_PREVIEW: + case wxID_PROPERTIES: + case wxID_EXIT: + case wxID_REDO: + case wxID_REFRESH: + case wxID_REMOVE: + case wxID_REVERT_TO_SAVED: + case wxID_SAVE: + case wxID_SAVEAS: + case wxID_STOP: + case wxID_UNDELETE: + case wxID_UNDERLINE: + case wxID_UNDO: + case wxID_UNINDENT: + case wxID_YES: + case wxID_ZOOM_100: + case wxID_ZOOM_FIT: + case wxID_ZOOM_IN: + case wxID_ZOOM_OUT: + return true; + + default: + return false; + }; +} + +wxString wxGetStockLabel(wxWindowID id) { #define STOCKITEM(stockid, label) \ case stockid: \ return label; - switch (item) + switch (id) { - STOCKITEM(wxSTOCK_ADD, _("Add")) - STOCKITEM(wxSTOCK_APPLY, _("&Apply")) - STOCKITEM(wxSTOCK_BOLD, _("&Bold")) - STOCKITEM(wxSTOCK_CANCEL, _("&Cancel")) - STOCKITEM(wxSTOCK_CLEAR, _("&Clear")) - STOCKITEM(wxSTOCK_CLOSE, _("&Close")) - STOCKITEM(wxSTOCK_COPY, _("&Copy")) - STOCKITEM(wxSTOCK_CUT, _("Cu&t")) - STOCKITEM(wxSTOCK_DELETE, _("&Delete")) - STOCKITEM(wxSTOCK_FIND, _("&Find")) - STOCKITEM(wxSTOCK_FIND_AND_REPLACE, _("Find and rep&lace")) - STOCKITEM(wxSTOCK_GO_BACK, _("&Back")) - STOCKITEM(wxSTOCK_GO_DOWN, _("&Down")) - STOCKITEM(wxSTOCK_GO_FORWARD, _("&Forward")) - STOCKITEM(wxSTOCK_GO_UP, _("&Up")) - STOCKITEM(wxSTOCK_HELP, _("&Help")) - STOCKITEM(wxSTOCK_HOME, _("&Home")) - STOCKITEM(wxSTOCK_INDENT, _("Indent")) - STOCKITEM(wxSTOCK_INDEX, _("&Index")) - STOCKITEM(wxSTOCK_ITALIC, _("&Italic")) - STOCKITEM(wxSTOCK_JUSTIFY_CENTER, _("Centered")) - STOCKITEM(wxSTOCK_JUSTIFY_FILL, _("Justified")) - STOCKITEM(wxSTOCK_JUSTIFY_LEFT, _("Align Left")) - STOCKITEM(wxSTOCK_JUSTIFY_RIGHT, _("Align Right")) - STOCKITEM(wxSTOCK_NEW, _("&New")) - STOCKITEM(wxSTOCK_NO, _("&No")) - STOCKITEM(wxSTOCK_OK, _("&OK")) - STOCKITEM(wxSTOCK_OPEN, _("&Open")) - STOCKITEM(wxSTOCK_PASTE, _("&Paste")) - STOCKITEM(wxSTOCK_PREFERENCES, _("&Preferences")) - STOCKITEM(wxSTOCK_PRINT, _("&Print")) - STOCKITEM(wxSTOCK_PRINT_PREVIEW, _("Print previe&w")) - STOCKITEM(wxSTOCK_PROPERTIES, _("&Properties")) - STOCKITEM(wxSTOCK_QUIT, _("&Quit")) - STOCKITEM(wxSTOCK_REDO, _("&Redo")) - STOCKITEM(wxSTOCK_REFRESH, _("Refresh")) - STOCKITEM(wxSTOCK_REMOVE, _("Remove")) - STOCKITEM(wxSTOCK_REVERT_TO_SAVED, _("Revert to Saved")) - STOCKITEM(wxSTOCK_SAVE, _("&Save")) - STOCKITEM(wxSTOCK_SAVE_AS, _("Save &As...")) - STOCKITEM(wxSTOCK_STOP, _("&Stop")) - STOCKITEM(wxSTOCK_UNDELETE, _("Undelete")) - STOCKITEM(wxSTOCK_UNDERLINE, _("&Underline")) - STOCKITEM(wxSTOCK_UNDO, _("&Undo")) - STOCKITEM(wxSTOCK_UNINDENT, _("&Unindent")) - STOCKITEM(wxSTOCK_YES, _("&Yes")) - STOCKITEM(wxSTOCK_ZOOM_100, _("&Actual Size")) - STOCKITEM(wxSTOCK_ZOOM_FIT, _("Zoom to &Fit")) - STOCKITEM(wxSTOCK_ZOOM_IN, _("Zoom &In")) - STOCKITEM(wxSTOCK_ZOOM_OUT, _("Zoom &Out")) - - case wxSTOCK_NONE: + STOCKITEM(wxID_ADD, _("Add")) + STOCKITEM(wxID_APPLY, _("&Apply")) + STOCKITEM(wxID_BOLD, _("&Bold")) + STOCKITEM(wxID_CANCEL, _("&Cancel")) + STOCKITEM(wxID_CLEAR, _("&Clear")) + STOCKITEM(wxID_CLOSE, _("&Close")) + STOCKITEM(wxID_COPY, _("&Copy")) + STOCKITEM(wxID_CUT, _("Cu&t")) + STOCKITEM(wxID_DELETE, _("&Delete")) + STOCKITEM(wxID_FIND, _("&Find")) + STOCKITEM(wxID_REPLACE, _("Rep&lace")) + STOCKITEM(wxID_BACKWARD, _("&Back")) + STOCKITEM(wxID_DOWN, _("&Down")) + STOCKITEM(wxID_FORWARD, _("&Forward")) + STOCKITEM(wxID_UP, _("&Up")) + STOCKITEM(wxID_HELP, _("&Help")) + STOCKITEM(wxID_HOME, _("&Home")) + STOCKITEM(wxID_INDENT, _("Indent")) + STOCKITEM(wxID_INDEX, _("&Index")) + STOCKITEM(wxID_ITALIC, _("&Italic")) + STOCKITEM(wxID_JUSTIFY_CENTER, _("Centered")) + STOCKITEM(wxID_JUSTIFY_FILL, _("Justified")) + STOCKITEM(wxID_JUSTIFY_LEFT, _("Align Left")) + STOCKITEM(wxID_JUSTIFY_RIGHT, _("Align Right")) + STOCKITEM(wxID_NEW, _("&New")) + STOCKITEM(wxID_NO, _("&No")) + STOCKITEM(wxID_OK, _("&OK")) + STOCKITEM(wxID_OPEN, _("&Open")) + STOCKITEM(wxID_PASTE, _("&Paste")) + STOCKITEM(wxID_PREFERENCES, _("&Preferences")) + STOCKITEM(wxID_PRINT, _("&Print")) + STOCKITEM(wxID_PREVIEW, _("Print previe&w")) + STOCKITEM(wxID_PROPERTIES, _("&Properties")) + STOCKITEM(wxID_EXIT, _("&Quit")) + STOCKITEM(wxID_REDO, _("&Redo")) + STOCKITEM(wxID_REFRESH, _("Refresh")) + STOCKITEM(wxID_REMOVE, _("Remove")) + STOCKITEM(wxID_REVERT_TO_SAVED, _("Revert to Saved")) + STOCKITEM(wxID_SAVE, _("&Save")) + STOCKITEM(wxID_SAVEAS, _("Save &As...")) + STOCKITEM(wxID_STOP, _("&Stop")) + STOCKITEM(wxID_UNDELETE, _("Undelete")) + STOCKITEM(wxID_UNDERLINE, _("&Underline")) + STOCKITEM(wxID_UNDO, _("&Undo")) + STOCKITEM(wxID_UNINDENT, _("&Unindent")) + STOCKITEM(wxID_YES, _("&Yes")) + STOCKITEM(wxID_ZOOM_100, _("&Actual Size")) + STOCKITEM(wxID_ZOOM_FIT, _("Zoom to &Fit")) + STOCKITEM(wxID_ZOOM_IN, _("Zoom &In")) + STOCKITEM(wxID_ZOOM_OUT, _("Zoom &Out")) + default: wxFAIL_MSG( _T("invalid stock item ID") ); break; @@ -101,81 +162,97 @@ wxString wxGetStockItemLabel(wxStockItemID item) return wxEmptyString; } +bool wxIsStockLabel(wxWindowID id, const wxString& label) +{ + if (label.empty()) + return true; + + wxString stock = wxGetStockLabel(id); + + if (label == stock) + return true; + + stock.Replace(_T("&"), wxEmptyString); + if (label == stock) + return true; + + return false; +} + #ifdef __WXGTK20__ #include -const char *wxStockItemToGTK(wxStockItemID item) +const char *wxGetStockGtkID(wxWindowID id) { - #define STOCKITEM(stockid) \ - case wx##stockid: \ - return GTK_##stockid; + #define STOCKITEM(wx,gtk) \ + case wx: \ + return gtk; - #define STOCKITEM_MISSING(stockid) \ - case wx##stockid: \ + #define STOCKITEM_MISSING(wx) \ + case wxid: \ return NULL; #if GTK_CHECK_VERSION(2,4,0) - #define STOCKITEM_24(stockid) STOCKITEM(stockid) + #define STOCKITEM_24(wx,gtk) STOCKITEM(wx,gtk) #else - #define STOCKITEM_24(stockid) STOCKITEM_MISSING(stockid) + #define STOCKITEM_24(wx,gtk) STOCKITEM_MISSING(wx) #endif - switch (item) + switch (id) { - STOCKITEM(STOCK_ADD) - STOCKITEM(STOCK_APPLY) - STOCKITEM(STOCK_BOLD) - STOCKITEM(STOCK_CANCEL) - STOCKITEM(STOCK_CLEAR) - STOCKITEM(STOCK_CLOSE) - STOCKITEM(STOCK_COPY) - STOCKITEM(STOCK_CUT) - STOCKITEM(STOCK_DELETE) - STOCKITEM(STOCK_FIND) - STOCKITEM(STOCK_FIND_AND_REPLACE) - STOCKITEM(STOCK_GO_BACK) - STOCKITEM(STOCK_GO_DOWN) - STOCKITEM(STOCK_GO_FORWARD) - STOCKITEM(STOCK_GO_UP) - STOCKITEM(STOCK_HELP) - STOCKITEM(STOCK_HOME) - STOCKITEM_24(STOCK_INDENT) - STOCKITEM(STOCK_INDEX) - STOCKITEM(STOCK_ITALIC) - STOCKITEM(STOCK_JUSTIFY_CENTER) - STOCKITEM(STOCK_JUSTIFY_FILL) - STOCKITEM(STOCK_JUSTIFY_LEFT) - STOCKITEM(STOCK_JUSTIFY_RIGHT) - STOCKITEM(STOCK_NEW) - STOCKITEM(STOCK_NO) - STOCKITEM(STOCK_OK) - STOCKITEM(STOCK_OPEN) - STOCKITEM(STOCK_PASTE) - STOCKITEM(STOCK_PREFERENCES) - STOCKITEM(STOCK_PRINT) - STOCKITEM(STOCK_PRINT_PREVIEW) - STOCKITEM(STOCK_PROPERTIES) - STOCKITEM(STOCK_QUIT) - STOCKITEM(STOCK_REDO) - STOCKITEM(STOCK_REFRESH) - STOCKITEM(STOCK_REMOVE) - STOCKITEM(STOCK_REVERT_TO_SAVED) - STOCKITEM(STOCK_SAVE) - STOCKITEM(STOCK_SAVE_AS) - STOCKITEM(STOCK_STOP) - STOCKITEM(STOCK_UNDELETE) - STOCKITEM(STOCK_UNDERLINE) - STOCKITEM(STOCK_UNDO) - STOCKITEM_24(STOCK_UNINDENT) - STOCKITEM(STOCK_YES) - STOCKITEM(STOCK_ZOOM_100) - STOCKITEM(STOCK_ZOOM_FIT) - STOCKITEM(STOCK_ZOOM_IN) - STOCKITEM(STOCK_ZOOM_OUT) - - case wxSTOCK_NONE: + STOCKITEM(wxID_ADD, GTK_STOCK_ADD) + STOCKITEM(wxID_APPLY, GTK_STOCK_APPLY) + STOCKITEM(wxID_BOLD, GTK_STOCK_BOLD) + STOCKITEM(wxID_CANCEL, GTK_STOCK_CANCEL) + STOCKITEM(wxID_CLEAR, GTK_STOCK_CLEAR) + STOCKITEM(wxID_CLOSE, GTK_STOCK_CLOSE) + STOCKITEM(wxID_COPY, GTK_STOCK_COPY) + STOCKITEM(wxID_CUT, GTK_STOCK_CUT) + STOCKITEM(wxID_DELETE, GTK_STOCK_DELETE) + STOCKITEM(wxID_FIND, GTK_STOCK_FIND) + STOCKITEM(wxID_REPLACE, GTK_STOCK_FIND_AND_REPLACE) + STOCKITEM(wxID_BACKWARD, GTK_STOCK_GO_BACK) + STOCKITEM(wxID_DOWN, GTK_STOCK_GO_DOWN) + STOCKITEM(wxID_FORWARD, GTK_STOCK_GO_FORWARD) + STOCKITEM(wxID_UP, GTK_STOCK_GO_UP) + STOCKITEM(wxID_HELP, GTK_STOCK_HELP) + STOCKITEM(wxID_HOME, GTK_STOCK_HOME) + STOCKITEM_24(wxID_INDENT, GTK_STOCK_INDENT) + STOCKITEM(wxID_INDEX, GTK_STOCK_INDEX) + STOCKITEM(wxID_ITALIC, GTK_STOCK_ITALIC) + STOCKITEM(wxID_JUSTIFY_CENTER, GTK_STOCK_JUSTIFY_CENTER) + STOCKITEM(wxID_JUSTIFY_FILL, GTK_STOCK_JUSTIFY_FILL) + STOCKITEM(wxID_JUSTIFY_LEFT, GTK_STOCK_JUSTIFY_LEFT) + STOCKITEM(wxID_JUSTIFY_RIGHT, GTK_STOCK_JUSTIFY_RIGHT) + STOCKITEM(wxID_NEW, GTK_STOCK_NEW) + STOCKITEM(wxID_NO, GTK_STOCK_NO) + STOCKITEM(wxID_OK, GTK_STOCK_OK) + STOCKITEM(wxID_OPEN, GTK_STOCK_OPEN) + STOCKITEM(wxID_PASTE, GTK_STOCK_PASTE) + STOCKITEM(wxID_PREFERENCES, GTK_STOCK_PREFERENCES) + STOCKITEM(wxID_PRINT, GTK_STOCK_PRINT) + STOCKITEM(wxID_PREVIEW, GTK_STOCK_PRINT_PREVIEW) + STOCKITEM(wxID_PROPERTIES, GTK_STOCK_PROPERTIES) + STOCKITEM(wxID_EXIT, GTK_STOCK_QUIT) + STOCKITEM(wxID_REDO, GTK_STOCK_REDO) + STOCKITEM(wxID_REFRESH, GTK_STOCK_REFRESH) + STOCKITEM(wxID_REMOVE, GTK_STOCK_REMOVE) + STOCKITEM(wxID_REVERT_TO_SAVED, GTK_STOCK_REVERT_TO_SAVED) + STOCKITEM(wxID_SAVE, GTK_STOCK_SAVE) + STOCKITEM(wxID_SAVEAS, GTK_STOCK_SAVE_AS) + STOCKITEM(wxID_STOP, GTK_STOCK_STOP) + STOCKITEM(wxID_UNDELETE, GTK_STOCK_UNDELETE) + STOCKITEM(wxID_UNDERLINE, GTK_STOCK_UNDERLINE) + STOCKITEM(wxID_UNDO, GTK_STOCK_UNDO) + STOCKITEM_24(wxID_UNINDENT, GTK_STOCK_UNINDENT) + STOCKITEM(wxID_YES, GTK_STOCK_YES) + STOCKITEM(wxID_ZOOM_100, GTK_STOCK_ZOOM_100) + STOCKITEM(wxID_ZOOM_FIT, GTK_STOCK_ZOOM_FIT) + STOCKITEM(wxID_ZOOM_IN, GTK_STOCK_ZOOM_IN) + STOCKITEM(wxID_ZOOM_OUT, GTK_STOCK_ZOOM_OUT) + default: wxFAIL_MSG( _T("invalid stock item ID") ); break; diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp index 77b39ff58f..188c1c28cd 100644 --- a/src/generic/dirdlgg.cpp +++ b/src/generic/dirdlgg.cpp @@ -150,9 +150,9 @@ wxGenericDirDialog::wxGenericDirDialog(wxWindow* parent, const wxString& title, buttonsizer = new wxBoxSizer( wxHORIZONTAL ); // OK and Cancel button should be at the right bottom - wxButton* okButton = new wxButton(this, wxID_OK, wxSTOCK_OK); + wxButton* okButton = new wxButton(this, wxID_OK); buttonsizer->Add( okButton, 0, wxLEFT|wxRIGHT, 10 ); - wxButton* cancelButton = new wxButton(this, wxID_CANCEL, wxSTOCK_CANCEL); + wxButton* cancelButton = new wxButton(this, wxID_CANCEL); buttonsizer->Add( cancelButton, 0, wxLEFT|wxRIGHT, 10 ); topsizer->Add( buttonsizer, 0, wxLEFT|wxTOP|wxBOTTOM | wxALIGN_RIGHT, 10 ); diff --git a/src/generic/fdrepdlg.cpp b/src/generic/fdrepdlg.cpp index bb7c60a979..29e31d7b60 100644 --- a/src/generic/fdrepdlg.cpp +++ b/src/generic/fdrepdlg.cpp @@ -159,9 +159,9 @@ bool wxGenericFindReplaceDialog::Create(wxWindow *parent, wxBoxSizer *bttnsizer = new wxBoxSizer(wxVERTICAL); - bttnsizer->Add(new wxButton(this, wxID_FIND, wxSTOCK_FIND), 0, wxALL, 3); + bttnsizer->Add(new wxButton(this, wxID_FIND), 0, wxALL, 3); - bttnsizer->Add(new wxButton(this, wxID_CANCEL, wxSTOCK_CANCEL), 0, wxALL, 3); + bttnsizer->Add(new wxButton(this, wxID_CANCEL), 0, wxALL, 3); if ( style & wxFR_REPLACEDIALOG ) { diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp index 3bc760fb6b..47c1419984 100644 --- a/src/generic/filedlgg.cpp +++ b/src/generic/filedlgg.cpp @@ -993,8 +993,8 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, textsizer->Add( m_choice, 1, wxCENTER|wxALL, 5 ); buttonsizer = new wxBoxSizer( wxHORIZONTAL ); - buttonsizer->Add( new wxButton( this, wxID_OK, wxSTOCK_OK ), 0, wxCENTER | wxALL, 5 ); - buttonsizer->Add( new wxButton( this, wxID_CANCEL, wxSTOCK_CANCEL ), 0, wxCENTER | wxALL, 5 ); + buttonsizer->Add( new wxButton( this, wxID_OK ), 0, wxCENTER | wxALL, 5 ); + buttonsizer->Add( new wxButton( this, wxID_CANCEL ), 0, wxCENTER | wxALL, 5 ); mainsizer->Add( buttonsizer, 0, wxALIGN_RIGHT ); } else @@ -1004,7 +1004,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL ); m_text = new wxTextCtrl( this, ID_TEXT, m_fileName, wxDefaultPosition, wxDefaultSize, wxPROCESS_ENTER ); textsizer->Add( m_text, 1, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 ); - textsizer->Add( new wxButton( this, wxID_OK, wxSTOCK_OK ), 0, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 ); + textsizer->Add( new wxButton( this, wxID_OK ), 0, wxCENTER | wxLEFT|wxRIGHT|wxTOP, 10 ); mainsizer->Add( textsizer, 0, wxEXPAND ); wxBoxSizer *choicesizer = new wxBoxSizer( wxHORIZONTAL ); @@ -1013,7 +1013,7 @@ wxGenericFileDialog::wxGenericFileDialog(wxWindow *parent, m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") ); m_check->SetValue( ms_lastShowHidden ); choicesizer->Add( m_check, 0, wxCENTER|wxALL, 10 ); - choicesizer->Add( new wxButton( this, wxID_CANCEL, wxSTOCK_CANCEL ), 0, wxCENTER | wxALL, 10 ); + choicesizer->Add( new wxButton( this, wxID_CANCEL ), 0, wxCENTER | wxALL, 10 ); mainsizer->Add( choicesizer, 0, wxEXPAND ); } diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp index 06dd5b23cf..27e75a9097 100644 --- a/src/generic/logg.cpp +++ b/src/generic/logg.cpp @@ -744,7 +744,9 @@ wxLogDialog::wxLogDialog(wxWindow *parent, // this "Ok" button has wxID_CANCEL id - not very logical, but this allows // to close the log dialog with which wouldn't work otherwise (as it // translates into click on cancel button) - wxButton *btnOk = new wxButton(this, wxID_CANCEL, wxSTOCK_OK); + + // FIXME: use stock button here! + wxButton *btnOk = new wxButton(this, wxID_CANCEL, _("OK")); sizerButtons->Add(btnOk, 0, wxCENTRE | wxBOTTOM, MARGIN/2); m_btnDetails = new wxButton(this, wxID_MORE, ms_details + EXPAND_SUFFIX); sizerButtons->Add(m_btnDetails, 0, wxCENTRE | wxTOP, MARGIN/2 - 1); @@ -821,7 +823,7 @@ void wxLogDialog::CreateDetailsControls() { // create the save button and separator line if possible #if wxUSE_FILE - m_btnSave = new wxButton(this, wxID_SAVE, wxSTOCK_SAVE); + m_btnSave = new wxButton(this, wxID_SAVE); #endif // wxUSE_FILE #if wxUSE_STATLINE diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp index 9d4c252751..0103124fac 100644 --- a/src/generic/progdlgg.cpp +++ b/src/generic/progdlgg.cpp @@ -190,7 +190,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title, if ( hasAbortButton ) { - m_btnAbort = new wxButton(this, wxID_CANCEL, wxSTOCK_CANCEL); + m_btnAbort = new wxButton(this, wxID_CANCEL); // Windows dialogs usually have buttons in the lower right corner #if defined(__WXMSW__) || defined(__WXPM__) diff --git a/src/generic/tipdlg.cpp b/src/generic/tipdlg.cpp index 94370f2542..bd27ad9313 100644 --- a/src/generic/tipdlg.cpp +++ b/src/generic/tipdlg.cpp @@ -225,7 +225,8 @@ wxTipDialog::wxTipDialog(wxWindow *parent, // 1) create all controls in tab order #ifndef __SMARTPHONE__ - wxButton *btnClose = new wxButton(this, wxID_CANCEL, wxSTOCK_CLOSE); + // FIXME: use stock wxID_CLOSE button here! + wxButton *btnClose = new wxButton(this, wxID_CANCEL, _("Close")); #endif m_checkbox = new wxCheckBox(this, wxID_ANY, _("&Show tips at startup")); diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp index 629420edf7..d411a22eda 100644 --- a/src/gtk/button.cpp +++ b/src/gtk/button.cpp @@ -19,6 +19,7 @@ #if wxUSE_BUTTON #include "wx/button.h" +#include "wx/stockitem.h" #include "wx/gtk/private.h" @@ -109,8 +110,7 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, */ #ifdef __WXGTK20__ - if (m_widget == NULL) // may be !=NULL if stock form of Create was used - m_widget = gtk_button_new_with_mnemonic(""); + m_widget = gtk_button_new_with_mnemonic(""); #else m_widget = gtk_button_new_with_label(""); #endif @@ -135,8 +135,7 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, x_alignment, y_alignment); #endif - if (!label.empty()) - SetLabel(label); + SetLabel(label); if (style & wxNO_BORDER) gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE ); @@ -151,30 +150,6 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, return true; } -bool wxButton::Create(wxWindow *parent, wxWindowID id, wxStockItemID stock, - const wxString& descriptiveLabel, - const wxPoint& pos, long style, - const wxValidator& validator, const wxString& name) -{ -#ifdef __WXGTK20__ - const char *gtkstock = wxStockItemToGTK(stock); - if (gtkstock) - { - m_widget = gtk_button_new_from_stock(gtkstock); - return Create(parent, id, wxEmptyString, - pos, wxDefaultSize, style, validator, name); - } - else - { - // not supported by this GTK+ version - return Create(parent, id, wxGetStockItemLabel(stock), - pos, wxDefaultSize, style, validator, name); - } -#else - return CreateStock(parent, id, stock, descriptiveLabel, - pos, style, validator, name); -#endif -} void wxButton::SetDefault() { @@ -228,17 +203,36 @@ wxSize wxButtonBase::GetDefaultSize() #endif } -void wxButton::SetLabel( const wxString &label ) +void wxButton::SetLabel( const wxString &lbl ) { wxCHECK_RET( m_widget != NULL, wxT("invalid button") ); - wxControl::SetLabel( label ); + wxString label(lbl); + +#ifndef __WXGTK20__ + if (label.empty() && wxIsStockID(m_windowId)) + label = wxGetStockLabel(m_windowId); +#endif + + wxControl::SetLabel(label); #ifdef __WXGTK20__ - wxString label2 = PrepareLabelMnemonics( label ); - gtk_button_set_label( GTK_BUTTON(m_widget), wxGTK_CONV(label2) ); + if (wxIsStockID(m_windowId) && wxIsStockLabel(m_windowId, label)) + { + const char *stock = wxGetStockGtkID(m_windowId); + if (stock) + { + gtk_button_set_label(GTK_BUTTON(m_widget), stock); + gtk_button_set_use_stock(GTK_BUTTON(m_widget), TRUE); + } + return; + } + + wxString label2 = PrepareLabelMnemonics(label); + gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(label2)); + gtk_button_set_use_stock(GTK_BUTTON(m_widget), FALSE); #else - gtk_label_set( GTK_LABEL( BUTTON_CHILD(m_widget) ), wxGTK_CONV( GetLabel() ) ); + gtk_label_set(GTK_LABEL(BUTTON_CHILD(m_widget)), wxGTK_CONV(GetLabel())); #endif } diff --git a/src/gtk1/button.cpp b/src/gtk1/button.cpp index 629420edf7..d411a22eda 100644 --- a/src/gtk1/button.cpp +++ b/src/gtk1/button.cpp @@ -19,6 +19,7 @@ #if wxUSE_BUTTON #include "wx/button.h" +#include "wx/stockitem.h" #include "wx/gtk/private.h" @@ -109,8 +110,7 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, */ #ifdef __WXGTK20__ - if (m_widget == NULL) // may be !=NULL if stock form of Create was used - m_widget = gtk_button_new_with_mnemonic(""); + m_widget = gtk_button_new_with_mnemonic(""); #else m_widget = gtk_button_new_with_label(""); #endif @@ -135,8 +135,7 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, x_alignment, y_alignment); #endif - if (!label.empty()) - SetLabel(label); + SetLabel(label); if (style & wxNO_BORDER) gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE ); @@ -151,30 +150,6 @@ bool wxButton::Create( wxWindow *parent, wxWindowID id, const wxString &label, return true; } -bool wxButton::Create(wxWindow *parent, wxWindowID id, wxStockItemID stock, - const wxString& descriptiveLabel, - const wxPoint& pos, long style, - const wxValidator& validator, const wxString& name) -{ -#ifdef __WXGTK20__ - const char *gtkstock = wxStockItemToGTK(stock); - if (gtkstock) - { - m_widget = gtk_button_new_from_stock(gtkstock); - return Create(parent, id, wxEmptyString, - pos, wxDefaultSize, style, validator, name); - } - else - { - // not supported by this GTK+ version - return Create(parent, id, wxGetStockItemLabel(stock), - pos, wxDefaultSize, style, validator, name); - } -#else - return CreateStock(parent, id, stock, descriptiveLabel, - pos, style, validator, name); -#endif -} void wxButton::SetDefault() { @@ -228,17 +203,36 @@ wxSize wxButtonBase::GetDefaultSize() #endif } -void wxButton::SetLabel( const wxString &label ) +void wxButton::SetLabel( const wxString &lbl ) { wxCHECK_RET( m_widget != NULL, wxT("invalid button") ); - wxControl::SetLabel( label ); + wxString label(lbl); + +#ifndef __WXGTK20__ + if (label.empty() && wxIsStockID(m_windowId)) + label = wxGetStockLabel(m_windowId); +#endif + + wxControl::SetLabel(label); #ifdef __WXGTK20__ - wxString label2 = PrepareLabelMnemonics( label ); - gtk_button_set_label( GTK_BUTTON(m_widget), wxGTK_CONV(label2) ); + if (wxIsStockID(m_windowId) && wxIsStockLabel(m_windowId, label)) + { + const char *stock = wxGetStockGtkID(m_windowId); + if (stock) + { + gtk_button_set_label(GTK_BUTTON(m_widget), stock); + gtk_button_set_use_stock(GTK_BUTTON(m_widget), TRUE); + } + return; + } + + wxString label2 = PrepareLabelMnemonics(label); + gtk_button_set_label(GTK_BUTTON(m_widget), wxGTK_CONV(label2)); + gtk_button_set_use_stock(GTK_BUTTON(m_widget), FALSE); #else - gtk_label_set( GTK_LABEL( BUTTON_CHILD(m_widget) ), wxGTK_CONV( GetLabel() ) ); + gtk_label_set(GTK_LABEL(BUTTON_CHILD(m_widget)), wxGTK_CONV(GetLabel())); #endif } diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp index 6c994e58d1..a9ef022bd4 100644 --- a/src/html/helpfrm.cpp +++ b/src/html/helpfrm.cpp @@ -1212,9 +1212,9 @@ public: wxBoxSizer *sizer2 = new wxBoxSizer(wxHORIZONTAL); wxButton *ok; - sizer2->Add(ok = new wxButton(this, wxID_OK, wxSTOCK_OK), 0, wxALL, 10); + sizer2->Add(ok = new wxButton(this, wxID_OK), 0, wxALL, 10); ok->SetDefault(); - sizer2->Add(new wxButton(this, wxID_CANCEL, wxSTOCK_CANCEL), 0, wxALL, 10); + sizer2->Add(new wxButton(this, wxID_CANCEL), 0, wxALL, 10); topsizer->Add(sizer2, 0, wxALIGN_RIGHT); SetSizer(topsizer); diff --git a/src/mac/carbon/button.cpp b/src/mac/carbon/button.cpp index f280182a11..28b8697630 100644 --- a/src/mac/carbon/button.cpp +++ b/src/mac/carbon/button.cpp @@ -17,6 +17,7 @@ #include "wx/button.h" #include "wx/panel.h" +#include "wx/stockitem.h" #if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) @@ -25,12 +26,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) #include "wx/mac/uma.h" // Button -bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label, +bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& lbl, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator, const wxString& name) { + wxString label(lbl); + if (label.empty() && wxIsStockID(id)) + label = wxGetStockLabel(id); + m_macIsUserPane = FALSE ; if ( !wxButtonBase::Create(parent, id, pos, size, style, validator, name) ) diff --git a/src/mac/classic/button.cpp b/src/mac/classic/button.cpp index 3ce18b2e27..912de02fb6 100644 --- a/src/mac/classic/button.cpp +++ b/src/mac/classic/button.cpp @@ -17,6 +17,7 @@ #include "wx/button.h" #include "wx/panel.h" +#include "wx/stockitem.h" #if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) @@ -28,12 +29,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) static const int kMacOSXHorizontalBorder = 2 ; static const int kMacOSXVerticalBorder = 4 ; -bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label, +bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& lbl, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator, const wxString& name) { + wxString label(lbl); + if (label.empty() && wxIsStockID(id)) + label = wxGetStockLabel(id); + if ( !wxButtonBase::Create(parent, id, pos, size, style, validator, name) ) return false; diff --git a/src/motif/button.cpp b/src/motif/button.cpp index a1afbd74be..93189fd2a7 100644 --- a/src/motif/button.cpp +++ b/src/motif/button.cpp @@ -33,6 +33,7 @@ #pragma message enable nosimpint #endif +#include "wx/stockitem.h" #include "wx/motif/private.h" #include "wx/sysopt.h" @@ -45,12 +46,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) // Button -bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& label, +bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxString& lbl, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator, const wxString& name) { + wxString label(lbl); + if (label.empty() && wxIsStockID(id)) + label = wxGetStockLabel(id); + if( !CreateControl( parent, id, pos, size, style, validator, name ) ) return false; diff --git a/src/msw/button.cpp b/src/msw/button.cpp index 4223865169..84bcc4d748 100644 --- a/src/msw/button.cpp +++ b/src/msw/button.cpp @@ -40,6 +40,7 @@ #include "wx/dcscreen.h" #endif +#include "wx/stockitem.h" #include "wx/msw/private.h" // ---------------------------------------------------------------------------- @@ -121,13 +122,17 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) bool wxButton::Create(wxWindow *parent, wxWindowID id, - const wxString& label, + const wxString& lbl, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator, const wxString& name) { + wxString label(lbl); + if (label.empty() && wxIsStockID(id)) + label = wxGetStockLabel(id); + if ( !CreateControl(parent, id, pos, size, style, validator, name) ) return false; diff --git a/src/os2/button.cpp b/src/os2/button.cpp index 5c4e70d5a0..05a44eb6cc 100644 --- a/src/os2/button.cpp +++ b/src/os2/button.cpp @@ -23,6 +23,7 @@ #include "wx/scrolwin.h" #endif +#include "wx/stockitem.h" #include "wx/os2/private.h" #define BUTTON_HEIGHT_FROM_CHAR_HEIGHT(cy) (11*EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)/10) @@ -43,7 +44,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl) bool wxButton::Create( wxWindow* pParent , wxWindowID vId -, const wxString& rsLabel +, const wxString& rsLbl , const wxPoint& rPos , const wxSize& rSize , long lStyle @@ -51,6 +52,9 @@ bool wxButton::Create( , const wxString& rsName ) { + wxString rsLabel(rsLbl); + if (rsLabel.empty() && wxIsStockID(vId)) + rsLabel = wxGetStockLabel(vId); wxString sLabel = ::wxPMTextToLabel(rsLabel); diff --git a/src/univ/button.cpp b/src/univ/button.cpp index 821843ff1c..613ff0c3d7 100644 --- a/src/univ/button.cpp +++ b/src/univ/button.cpp @@ -41,6 +41,7 @@ #include "wx/univ/inphand.h" #include "wx/univ/theme.h" #include "wx/univ/colschem.h" +#include "wx/stockitem.h" // ---------------------------------------------------------------------------- // constants @@ -69,13 +70,17 @@ void wxButton::Init() bool wxButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, - const wxString &label, + const wxString &lbl, const wxPoint &pos, const wxSize &size, long style, const wxValidator& validator, const wxString &name) { + wxString label(lbl); + if (label.empty() && wxIsStockID(id)) + label = wxGetStockLabel(id); + // center label by default if ( !(style & wxALIGN_MASK) ) { -- 2.45.2