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 \
wx/statbox.h \
wx/stattext.h \
wx/statusbr.h \
- wx/stockitem.h \
wx/textctrl.h \
wx/textdlg.h \
wx/toolbar.h \
monodll_artprov.o \
monodll_artstd.o \
monodll_bmpbase.o \
- monodll_buttoncmn.o \
monodll_bookctrl.o \
monodll_choiccmn.o \
monodll_clipcmn.o \
monodll_artprov.o \
monodll_artstd.o \
monodll_bmpbase.o \
- monodll_buttoncmn.o \
monodll_bookctrl.o \
monodll_choiccmn.o \
monodll_clipcmn.o \
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 \
monolib_artprov.o \
monolib_artstd.o \
monolib_bmpbase.o \
- monolib_buttoncmn.o \
monolib_bookctrl.o \
monolib_choiccmn.o \
monolib_clipcmn.o \
monolib_artprov.o \
monolib_artstd.o \
monolib_bmpbase.o \
- monolib_buttoncmn.o \
monolib_bookctrl.o \
monolib_choiccmn.o \
monolib_clipcmn.o \
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 \
coredll_artprov.o \
coredll_artstd.o \
coredll_bmpbase.o \
- coredll_buttoncmn.o \
coredll_bookctrl.o \
coredll_choiccmn.o \
coredll_clipcmn.o \
coredll_artprov.o \
coredll_artstd.o \
coredll_bmpbase.o \
- coredll_buttoncmn.o \
coredll_bookctrl.o \
coredll_choiccmn.o \
coredll_clipcmn.o \
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)
corelib_artprov.o \
corelib_artstd.o \
corelib_bmpbase.o \
- corelib_buttoncmn.o \
corelib_bookctrl.o \
corelib_choiccmn.o \
corelib_clipcmn.o \
corelib_artprov.o \
corelib_artstd.o \
corelib_bmpbase.o \
- corelib_buttoncmn.o \
corelib_bookctrl.o \
corelib_choiccmn.o \
corelib_clipcmn.o \
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)
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) $<
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)
@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) $<
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) $<
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)
@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) $<
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) $<
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)
@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) $<
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) $<
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)
@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) $<
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
wx/statbox.h
wx/stattext.h
wx/statusbr.h
- wx/stockitem.h
wx/textctrl.h
wx/textdlg.h
wx/toolbar.h
$(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 \
$(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 \
$(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 \
$(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 \
$(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 \
$(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 \
$(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 \
$(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 \
$(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) $**
$(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) $**
$(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) $**
$(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) $**
$(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 \
$(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 \
$(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 \
$(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 \
$(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 \
$(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 \
$(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 \
$(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 \
$(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) $<
$(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) $<
$(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) $<
$(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) $<
$(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 \
$(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 \
$(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 \
$(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 \
$(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 \
$(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 \
$(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 \
$(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 \
$(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) $**
$(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) $**
$(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) $**
$(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) $**
$(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 &
$(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 &
$(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 &
$(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 &
$(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 &
$(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 &
$(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 &
$(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 &
$(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) $<
$(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) $<
$(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) $<
$(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) $<
# 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
# 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
# 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
# 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
# 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
# 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
# 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
# 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
# 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
# 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
# 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
# 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
# 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
# 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
# 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
# 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
# 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
# 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
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}
\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}
\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}.
\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
#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"
// ----------------------------------------------------------------------------
#define wxBU_EXACTFIT 0x0001
#include "wx/control.h"
-#include "wx/stockitem.h"
class WXDLLEXPORT wxBitmap;
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)
};
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,
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();
// ------------------------------------------------------------------------
wxID_FILE8,
wxID_FILE9,
- /* Standard button IDs */
+ /* Standard button and menu IDs */
wxID_OK = 5100,
wxID_CANCEL,
wxID_APPLY,
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,
{
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,
{
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 );
{
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,
{
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 );
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,
{
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();
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,
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();
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,
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);
wxButton() { }
wxButton(wxWindow *parent,
wxWindowID id,
- const wxString& label,
+ const wxString& label = wxEmptyString,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
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,
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
,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
,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);
/////////////////////////////////////////////////////////////////////////////
// Name: wx/stockitem.h
-// Purpose: wxStockItemID enum
+// Purpose: stock items helpers (privateh header)
// Author: Vaclav Slavik
// Modified by:
// Created: 2004-08-15
#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_
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,
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,
bool Create(wxWindow *parent,
wxWindowID id,
- const wxString& label,
+ const wxString& label = wxEmptyString,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
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,
+++ /dev/null
-///////////////////////////////////////////////////////////////////////////////
-// 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
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);
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 );
}
#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;
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 <gtk/gtk.h>
-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;
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 );
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 )
{
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
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 );
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 );
}
// this "Ok" button has wxID_CANCEL id - not very logical, but this allows
// to close the log dialog with <Esc> 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);
{
// 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
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__)
// 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"));
#if wxUSE_BUTTON
#include "wx/button.h"
+#include "wx/stockitem.h"
#include "wx/gtk/private.h"
*/
#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
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 );
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()
{
#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
}
#if wxUSE_BUTTON
#include "wx/button.h"
+#include "wx/stockitem.h"
#include "wx/gtk/private.h"
*/
#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
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 );
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()
{
#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
}
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);
#include "wx/button.h"
#include "wx/panel.h"
+#include "wx/stockitem.h"
#if !USE_SHARED_LIBRARY
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) )
#include "wx/button.h"
#include "wx/panel.h"
+#include "wx/stockitem.h"
#if !USE_SHARED_LIBRARY
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;
#pragma message enable nosimpint
#endif
+#include "wx/stockitem.h"
#include "wx/motif/private.h"
#include "wx/sysopt.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);
+
if( !CreateControl( parent, id, pos, size, style, validator, name ) )
return false;
#include "wx/dcscreen.h"
#endif
+#include "wx/stockitem.h"
#include "wx/msw/private.h"
// ----------------------------------------------------------------------------
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;
#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)
bool wxButton::Create(
wxWindow* pParent
, wxWindowID vId
-, const wxString& rsLabel
+, const wxString& rsLbl
, const wxPoint& rPos
, const wxSize& rSize
, long lStyle
, const wxString& rsName
)
{
+ wxString rsLabel(rsLbl);
+ if (rsLabel.empty() && wxIsStockID(vId))
+ rsLabel = wxGetStockLabel(vId);
wxString sLabel = ::wxPMTextToLabel(rsLabel);
#include "wx/univ/inphand.h"
#include "wx/univ/theme.h"
#include "wx/univ/colschem.h"
+#include "wx/stockitem.h"
// ----------------------------------------------------------------------------
// constants
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) )
{
projects / wxWidgets.git / commitdiff
