fix wxEVT_SPIN_XXX definitions in a nicer (compatible with new events) way
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
parent
06cd40a8b9
commit
dca9410337
43
Makefile.in
43
Makefile.in
@ -3529,6 +3529,9 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \
|
||||
wx/palette.h \
|
||||
wx/panel.h \
|
||||
wx/pen.h \
|
||||
wx/persist/bookctrl.h \
|
||||
wx/persist/common.h \
|
||||
wx/persist/toplevel.h \
|
||||
wx/position.h \
|
||||
wx/radiobox.h \
|
||||
wx/radiobut.h \
|
||||
@ -4100,6 +4103,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \
|
||||
monodll_nbkbase.o \
|
||||
monodll_overlaycmn.o \
|
||||
monodll_paper.o \
|
||||
monodll_persist.o \
|
||||
monodll_pickerbase.o \
|
||||
monodll_popupcmn.o \
|
||||
monodll_prntbase.o \
|
||||
@ -4110,7 +4114,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \
|
||||
monodll_rgncmn.o \
|
||||
monodll_settcmn.o \
|
||||
monodll_sizer.o \
|
||||
monodll_spinbuttcmn.o \
|
||||
monodll_spinctrlcmn.o \
|
||||
monodll_srchcmn.o \
|
||||
monodll_statbar.o \
|
||||
@ -4292,6 +4295,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \
|
||||
monodll_nbkbase.o \
|
||||
monodll_overlaycmn.o \
|
||||
monodll_paper.o \
|
||||
monodll_persist.o \
|
||||
monodll_pickerbase.o \
|
||||
monodll_popupcmn.o \
|
||||
monodll_prntbase.o \
|
||||
@ -4302,7 +4306,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \
|
||||
monodll_rgncmn.o \
|
||||
monodll_settcmn.o \
|
||||
monodll_sizer.o \
|
||||
monodll_spinbuttcmn.o \
|
||||
monodll_spinctrlcmn.o \
|
||||
monodll_srchcmn.o \
|
||||
monodll_statbar.o \
|
||||
@ -5914,6 +5917,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \
|
||||
monolib_nbkbase.o \
|
||||
monolib_overlaycmn.o \
|
||||
monolib_paper.o \
|
||||
monolib_persist.o \
|
||||
monolib_pickerbase.o \
|
||||
monolib_popupcmn.o \
|
||||
monolib_prntbase.o \
|
||||
@ -5924,7 +5928,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \
|
||||
monolib_rgncmn.o \
|
||||
monolib_settcmn.o \
|
||||
monolib_sizer.o \
|
||||
monolib_spinbuttcmn.o \
|
||||
monolib_spinctrlcmn.o \
|
||||
monolib_srchcmn.o \
|
||||
monolib_statbar.o \
|
||||
@ -6106,6 +6109,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \
|
||||
monolib_nbkbase.o \
|
||||
monolib_overlaycmn.o \
|
||||
monolib_paper.o \
|
||||
monolib_persist.o \
|
||||
monolib_pickerbase.o \
|
||||
monolib_popupcmn.o \
|
||||
monolib_prntbase.o \
|
||||
@ -6116,7 +6120,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \
|
||||
monolib_rgncmn.o \
|
||||
monolib_settcmn.o \
|
||||
monolib_sizer.o \
|
||||
monolib_spinbuttcmn.o \
|
||||
monolib_spinctrlcmn.o \
|
||||
monolib_srchcmn.o \
|
||||
monolib_statbar.o \
|
||||
@ -7875,6 +7878,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \
|
||||
coredll_nbkbase.o \
|
||||
coredll_overlaycmn.o \
|
||||
coredll_paper.o \
|
||||
coredll_persist.o \
|
||||
coredll_pickerbase.o \
|
||||
coredll_popupcmn.o \
|
||||
coredll_prntbase.o \
|
||||
@ -7885,7 +7889,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \
|
||||
coredll_rgncmn.o \
|
||||
coredll_settcmn.o \
|
||||
coredll_sizer.o \
|
||||
coredll_spinbuttcmn.o \
|
||||
coredll_spinctrlcmn.o \
|
||||
coredll_srchcmn.o \
|
||||
coredll_statbar.o \
|
||||
@ -8067,6 +8070,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \
|
||||
coredll_nbkbase.o \
|
||||
coredll_overlaycmn.o \
|
||||
coredll_paper.o \
|
||||
coredll_persist.o \
|
||||
coredll_pickerbase.o \
|
||||
coredll_popupcmn.o \
|
||||
coredll_prntbase.o \
|
||||
@ -8077,7 +8081,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \
|
||||
coredll_rgncmn.o \
|
||||
coredll_settcmn.o \
|
||||
coredll_sizer.o \
|
||||
coredll_spinbuttcmn.o \
|
||||
coredll_spinctrlcmn.o \
|
||||
coredll_srchcmn.o \
|
||||
coredll_statbar.o \
|
||||
@ -9388,6 +9391,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \
|
||||
corelib_nbkbase.o \
|
||||
corelib_overlaycmn.o \
|
||||
corelib_paper.o \
|
||||
corelib_persist.o \
|
||||
corelib_pickerbase.o \
|
||||
corelib_popupcmn.o \
|
||||
corelib_prntbase.o \
|
||||
@ -9398,7 +9402,6 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \
|
||||
corelib_rgncmn.o \
|
||||
corelib_settcmn.o \
|
||||
corelib_sizer.o \
|
||||
corelib_spinbuttcmn.o \
|
||||
corelib_spinctrlcmn.o \
|
||||
corelib_srchcmn.o \
|
||||
corelib_statbar.o \
|
||||
@ -9580,6 +9583,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \
|
||||
corelib_nbkbase.o \
|
||||
corelib_overlaycmn.o \
|
||||
corelib_paper.o \
|
||||
corelib_persist.o \
|
||||
corelib_pickerbase.o \
|
||||
corelib_popupcmn.o \
|
||||
corelib_prntbase.o \
|
||||
@ -9590,7 +9594,6 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \
|
||||
corelib_rgncmn.o \
|
||||
corelib_settcmn.o \
|
||||
corelib_sizer.o \
|
||||
corelib_spinbuttcmn.o \
|
||||
corelib_spinctrlcmn.o \
|
||||
corelib_srchcmn.o \
|
||||
corelib_statbar.o \
|
||||
@ -18150,6 +18153,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
|
||||
@COND_USE_GUI_1@monodll_paper.o: $(srcdir)/src/common/paper.cpp $(MONODLL_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/paper.cpp
|
||||
|
||||
@COND_USE_GUI_1@monodll_persist.o: $(srcdir)/src/common/persist.cpp $(MONODLL_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/persist.cpp
|
||||
|
||||
@COND_USE_GUI_1@monodll_pickerbase.o: $(srcdir)/src/common/pickerbase.cpp $(MONODLL_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/pickerbase.cpp
|
||||
|
||||
@ -18180,9 +18186,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
|
||||
@COND_USE_GUI_1@monodll_sizer.o: $(srcdir)/src/common/sizer.cpp $(MONODLL_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/sizer.cpp
|
||||
|
||||
@COND_USE_GUI_1@monodll_spinbuttcmn.o: $(srcdir)/src/common/spinbuttcmn.cpp $(MONODLL_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/spinbuttcmn.cpp
|
||||
|
||||
@COND_USE_GUI_1@monodll_spinctrlcmn.o: $(srcdir)/src/common/spinctrlcmn.cpp $(MONODLL_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/spinctrlcmn.cpp
|
||||
|
||||
@ -22821,6 +22824,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
|
||||
@COND_USE_GUI_1@monolib_paper.o: $(srcdir)/src/common/paper.cpp $(MONOLIB_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/paper.cpp
|
||||
|
||||
@COND_USE_GUI_1@monolib_persist.o: $(srcdir)/src/common/persist.cpp $(MONOLIB_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/persist.cpp
|
||||
|
||||
@COND_USE_GUI_1@monolib_pickerbase.o: $(srcdir)/src/common/pickerbase.cpp $(MONOLIB_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/pickerbase.cpp
|
||||
|
||||
@ -22851,9 +22857,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
|
||||
@COND_USE_GUI_1@monolib_sizer.o: $(srcdir)/src/common/sizer.cpp $(MONOLIB_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/sizer.cpp
|
||||
|
||||
@COND_USE_GUI_1@monolib_spinbuttcmn.o: $(srcdir)/src/common/spinbuttcmn.cpp $(MONOLIB_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/spinbuttcmn.cpp
|
||||
|
||||
@COND_USE_GUI_1@monolib_spinctrlcmn.o: $(srcdir)/src/common/spinctrlcmn.cpp $(MONOLIB_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/spinctrlcmn.cpp
|
||||
|
||||
@ -27678,6 +27681,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
|
||||
@COND_USE_GUI_1@coredll_paper.o: $(srcdir)/src/common/paper.cpp $(COREDLL_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/paper.cpp
|
||||
|
||||
@COND_USE_GUI_1@coredll_persist.o: $(srcdir)/src/common/persist.cpp $(COREDLL_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/persist.cpp
|
||||
|
||||
@COND_USE_GUI_1@coredll_pickerbase.o: $(srcdir)/src/common/pickerbase.cpp $(COREDLL_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/pickerbase.cpp
|
||||
|
||||
@ -27708,9 +27714,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
|
||||
@COND_USE_GUI_1@coredll_sizer.o: $(srcdir)/src/common/sizer.cpp $(COREDLL_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/sizer.cpp
|
||||
|
||||
@COND_USE_GUI_1@coredll_spinbuttcmn.o: $(srcdir)/src/common/spinbuttcmn.cpp $(COREDLL_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/spinbuttcmn.cpp
|
||||
|
||||
@COND_USE_GUI_1@coredll_spinctrlcmn.o: $(srcdir)/src/common/spinctrlcmn.cpp $(COREDLL_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/spinctrlcmn.cpp
|
||||
|
||||
@ -31182,6 +31185,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
|
||||
@COND_USE_GUI_1@corelib_paper.o: $(srcdir)/src/common/paper.cpp $(CORELIB_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/paper.cpp
|
||||
|
||||
@COND_USE_GUI_1@corelib_persist.o: $(srcdir)/src/common/persist.cpp $(CORELIB_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/persist.cpp
|
||||
|
||||
@COND_USE_GUI_1@corelib_pickerbase.o: $(srcdir)/src/common/pickerbase.cpp $(CORELIB_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/pickerbase.cpp
|
||||
|
||||
@ -31212,9 +31218,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
|
||||
@COND_USE_GUI_1@corelib_sizer.o: $(srcdir)/src/common/sizer.cpp $(CORELIB_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/sizer.cpp
|
||||
|
||||
@COND_USE_GUI_1@corelib_spinbuttcmn.o: $(srcdir)/src/common/spinbuttcmn.cpp $(CORELIB_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/spinbuttcmn.cpp
|
||||
|
||||
@COND_USE_GUI_1@corelib_spinctrlcmn.o: $(srcdir)/src/common/spinctrlcmn.cpp $(CORELIB_ODEP)
|
||||
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/spinctrlcmn.cpp
|
||||
|
||||
|
||||
@ -678,6 +678,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/common/nbkbase.cpp
|
||||
src/common/overlaycmn.cpp
|
||||
src/common/paper.cpp
|
||||
src/common/persist.cpp
|
||||
src/common/pickerbase.cpp
|
||||
src/common/popupcmn.cpp
|
||||
src/common/prntbase.cpp
|
||||
@ -688,7 +689,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
src/common/rgncmn.cpp
|
||||
src/common/settcmn.cpp
|
||||
src/common/sizer.cpp
|
||||
src/common/spinbuttcmn.cpp
|
||||
src/common/spinctrlcmn.cpp
|
||||
src/common/srchcmn.cpp
|
||||
src/common/statbar.cpp
|
||||
@ -812,6 +812,9 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
|
||||
wx/palette.h
|
||||
wx/panel.h
|
||||
wx/pen.h
|
||||
wx/persist/bookctrl.h
|
||||
wx/persist/common.h
|
||||
wx/persist/toplevel.h
|
||||
wx/position.h
|
||||
wx/radiobox.h
|
||||
wx/radiobut.h
|
||||
|
||||
@ -1701,6 +1701,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_nbkbase.obj \
|
||||
$(OBJS)\monodll_overlaycmn.obj \
|
||||
$(OBJS)\monodll_paper.obj \
|
||||
$(OBJS)\monodll_persist.obj \
|
||||
$(OBJS)\monodll_pickerbase.obj \
|
||||
$(OBJS)\monodll_popupcmn.obj \
|
||||
$(OBJS)\monodll_prntbase.obj \
|
||||
@ -1711,7 +1712,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_rgncmn.obj \
|
||||
$(OBJS)\monodll_settcmn.obj \
|
||||
$(OBJS)\monodll_sizer.obj \
|
||||
$(OBJS)\monodll_spinbuttcmn.obj \
|
||||
$(OBJS)\monodll_spinctrlcmn.obj \
|
||||
$(OBJS)\monodll_srchcmn.obj \
|
||||
$(OBJS)\monodll_statbar.obj \
|
||||
@ -1940,6 +1940,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_nbkbase.obj \
|
||||
$(OBJS)\monodll_overlaycmn.obj \
|
||||
$(OBJS)\monodll_paper.obj \
|
||||
$(OBJS)\monodll_persist.obj \
|
||||
$(OBJS)\monodll_pickerbase.obj \
|
||||
$(OBJS)\monodll_popupcmn.obj \
|
||||
$(OBJS)\monodll_prntbase.obj \
|
||||
@ -1950,7 +1951,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_rgncmn.obj \
|
||||
$(OBJS)\monodll_settcmn.obj \
|
||||
$(OBJS)\monodll_sizer.obj \
|
||||
$(OBJS)\monodll_spinbuttcmn.obj \
|
||||
$(OBJS)\monodll_spinctrlcmn.obj \
|
||||
$(OBJS)\monodll_srchcmn.obj \
|
||||
$(OBJS)\monodll_statbar.obj \
|
||||
@ -2382,6 +2382,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_nbkbase.obj \
|
||||
$(OBJS)\monolib_overlaycmn.obj \
|
||||
$(OBJS)\monolib_paper.obj \
|
||||
$(OBJS)\monolib_persist.obj \
|
||||
$(OBJS)\monolib_pickerbase.obj \
|
||||
$(OBJS)\monolib_popupcmn.obj \
|
||||
$(OBJS)\monolib_prntbase.obj \
|
||||
@ -2392,7 +2393,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_rgncmn.obj \
|
||||
$(OBJS)\monolib_settcmn.obj \
|
||||
$(OBJS)\monolib_sizer.obj \
|
||||
$(OBJS)\monolib_spinbuttcmn.obj \
|
||||
$(OBJS)\monolib_spinctrlcmn.obj \
|
||||
$(OBJS)\monolib_srchcmn.obj \
|
||||
$(OBJS)\monolib_statbar.obj \
|
||||
@ -2621,6 +2621,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_nbkbase.obj \
|
||||
$(OBJS)\monolib_overlaycmn.obj \
|
||||
$(OBJS)\monolib_paper.obj \
|
||||
$(OBJS)\monolib_persist.obj \
|
||||
$(OBJS)\monolib_pickerbase.obj \
|
||||
$(OBJS)\monolib_popupcmn.obj \
|
||||
$(OBJS)\monolib_prntbase.obj \
|
||||
@ -2631,7 +2632,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_rgncmn.obj \
|
||||
$(OBJS)\monolib_settcmn.obj \
|
||||
$(OBJS)\monolib_sizer.obj \
|
||||
$(OBJS)\monolib_spinbuttcmn.obj \
|
||||
$(OBJS)\monolib_spinctrlcmn.obj \
|
||||
$(OBJS)\monolib_srchcmn.obj \
|
||||
$(OBJS)\monolib_statbar.obj \
|
||||
@ -2969,6 +2969,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\coredll_nbkbase.obj \
|
||||
$(OBJS)\coredll_overlaycmn.obj \
|
||||
$(OBJS)\coredll_paper.obj \
|
||||
$(OBJS)\coredll_persist.obj \
|
||||
$(OBJS)\coredll_pickerbase.obj \
|
||||
$(OBJS)\coredll_popupcmn.obj \
|
||||
$(OBJS)\coredll_prntbase.obj \
|
||||
@ -2979,7 +2980,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\coredll_rgncmn.obj \
|
||||
$(OBJS)\coredll_settcmn.obj \
|
||||
$(OBJS)\coredll_sizer.obj \
|
||||
$(OBJS)\coredll_spinbuttcmn.obj \
|
||||
$(OBJS)\coredll_spinctrlcmn.obj \
|
||||
$(OBJS)\coredll_srchcmn.obj \
|
||||
$(OBJS)\coredll_statbar.obj \
|
||||
@ -3208,6 +3208,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\coredll_nbkbase.obj \
|
||||
$(OBJS)\coredll_overlaycmn.obj \
|
||||
$(OBJS)\coredll_paper.obj \
|
||||
$(OBJS)\coredll_persist.obj \
|
||||
$(OBJS)\coredll_pickerbase.obj \
|
||||
$(OBJS)\coredll_popupcmn.obj \
|
||||
$(OBJS)\coredll_prntbase.obj \
|
||||
@ -3218,7 +3219,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\coredll_rgncmn.obj \
|
||||
$(OBJS)\coredll_settcmn.obj \
|
||||
$(OBJS)\coredll_sizer.obj \
|
||||
$(OBJS)\coredll_spinbuttcmn.obj \
|
||||
$(OBJS)\coredll_spinctrlcmn.obj \
|
||||
$(OBJS)\coredll_srchcmn.obj \
|
||||
$(OBJS)\coredll_statbar.obj \
|
||||
@ -3453,6 +3453,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\corelib_nbkbase.obj \
|
||||
$(OBJS)\corelib_overlaycmn.obj \
|
||||
$(OBJS)\corelib_paper.obj \
|
||||
$(OBJS)\corelib_persist.obj \
|
||||
$(OBJS)\corelib_pickerbase.obj \
|
||||
$(OBJS)\corelib_popupcmn.obj \
|
||||
$(OBJS)\corelib_prntbase.obj \
|
||||
@ -3463,7 +3464,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\corelib_rgncmn.obj \
|
||||
$(OBJS)\corelib_settcmn.obj \
|
||||
$(OBJS)\corelib_sizer.obj \
|
||||
$(OBJS)\corelib_spinbuttcmn.obj \
|
||||
$(OBJS)\corelib_spinctrlcmn.obj \
|
||||
$(OBJS)\corelib_srchcmn.obj \
|
||||
$(OBJS)\corelib_statbar.obj \
|
||||
@ -3692,6 +3692,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\corelib_nbkbase.obj \
|
||||
$(OBJS)\corelib_overlaycmn.obj \
|
||||
$(OBJS)\corelib_paper.obj \
|
||||
$(OBJS)\corelib_persist.obj \
|
||||
$(OBJS)\corelib_pickerbase.obj \
|
||||
$(OBJS)\corelib_popupcmn.obj \
|
||||
$(OBJS)\corelib_prntbase.obj \
|
||||
@ -3702,7 +3703,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\corelib_rgncmn.obj \
|
||||
$(OBJS)\corelib_settcmn.obj \
|
||||
$(OBJS)\corelib_sizer.obj \
|
||||
$(OBJS)\corelib_spinbuttcmn.obj \
|
||||
$(OBJS)\corelib_spinctrlcmn.obj \
|
||||
$(OBJS)\corelib_srchcmn.obj \
|
||||
$(OBJS)\corelib_statbar.obj \
|
||||
@ -7147,6 +7147,11 @@ $(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\paper.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monodll_persist.obj: ..\..\src\common\persist.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\persist.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monodll_pickerbase.obj: ..\..\src\common\pickerbase.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\pickerbase.cpp
|
||||
@ -7197,11 +7202,6 @@ $(OBJS)\monodll_sizer.obj: ..\..\src\common\sizer.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sizer.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monodll_spinbuttcmn.obj: ..\..\src\common\spinbuttcmn.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\spinbuttcmn.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monodll_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp
|
||||
@ -9367,6 +9367,11 @@ $(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\paper.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monolib_persist.obj: ..\..\src\common\persist.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\persist.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monolib_pickerbase.obj: ..\..\src\common\pickerbase.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\pickerbase.cpp
|
||||
@ -9417,11 +9422,6 @@ $(OBJS)\monolib_sizer.obj: ..\..\src\common\sizer.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sizer.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monolib_spinbuttcmn.obj: ..\..\src\common\spinbuttcmn.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\spinbuttcmn.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monolib_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp
|
||||
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp
|
||||
@ -11611,6 +11611,11 @@ $(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp
|
||||
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\paper.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\coredll_persist.obj: ..\..\src\common\persist.cpp
|
||||
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\persist.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\coredll_pickerbase.obj: ..\..\src\common\pickerbase.cpp
|
||||
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\pickerbase.cpp
|
||||
@ -11661,11 +11666,6 @@ $(OBJS)\coredll_sizer.obj: ..\..\src\common\sizer.cpp
|
||||
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\sizer.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\coredll_spinbuttcmn.obj: ..\..\src\common\spinbuttcmn.cpp
|
||||
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\spinbuttcmn.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\coredll_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp
|
||||
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp
|
||||
@ -12985,6 +12985,11 @@ $(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp
|
||||
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\paper.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\corelib_persist.obj: ..\..\src\common\persist.cpp
|
||||
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\persist.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\corelib_pickerbase.obj: ..\..\src\common\pickerbase.cpp
|
||||
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\pickerbase.cpp
|
||||
@ -13035,11 +13040,6 @@ $(OBJS)\corelib_sizer.obj: ..\..\src\common\sizer.cpp
|
||||
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\sizer.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\corelib_spinbuttcmn.obj: ..\..\src\common\spinbuttcmn.cpp
|
||||
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\spinbuttcmn.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\corelib_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp
|
||||
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp
|
||||
|
||||
@ -1719,6 +1719,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_nbkbase.o \
|
||||
$(OBJS)\monodll_overlaycmn.o \
|
||||
$(OBJS)\monodll_paper.o \
|
||||
$(OBJS)\monodll_persist.o \
|
||||
$(OBJS)\monodll_pickerbase.o \
|
||||
$(OBJS)\monodll_popupcmn.o \
|
||||
$(OBJS)\monodll_prntbase.o \
|
||||
@ -1729,7 +1730,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_rgncmn.o \
|
||||
$(OBJS)\monodll_settcmn.o \
|
||||
$(OBJS)\monodll_sizer.o \
|
||||
$(OBJS)\monodll_spinbuttcmn.o \
|
||||
$(OBJS)\monodll_spinctrlcmn.o \
|
||||
$(OBJS)\monodll_srchcmn.o \
|
||||
$(OBJS)\monodll_statbar.o \
|
||||
@ -1960,6 +1960,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_nbkbase.o \
|
||||
$(OBJS)\monodll_overlaycmn.o \
|
||||
$(OBJS)\monodll_paper.o \
|
||||
$(OBJS)\monodll_persist.o \
|
||||
$(OBJS)\monodll_pickerbase.o \
|
||||
$(OBJS)\monodll_popupcmn.o \
|
||||
$(OBJS)\monodll_prntbase.o \
|
||||
@ -1970,7 +1971,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_rgncmn.o \
|
||||
$(OBJS)\monodll_settcmn.o \
|
||||
$(OBJS)\monodll_sizer.o \
|
||||
$(OBJS)\monodll_spinbuttcmn.o \
|
||||
$(OBJS)\monodll_spinctrlcmn.o \
|
||||
$(OBJS)\monodll_srchcmn.o \
|
||||
$(OBJS)\monodll_statbar.o \
|
||||
@ -2406,6 +2406,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_nbkbase.o \
|
||||
$(OBJS)\monolib_overlaycmn.o \
|
||||
$(OBJS)\monolib_paper.o \
|
||||
$(OBJS)\monolib_persist.o \
|
||||
$(OBJS)\monolib_pickerbase.o \
|
||||
$(OBJS)\monolib_popupcmn.o \
|
||||
$(OBJS)\monolib_prntbase.o \
|
||||
@ -2416,7 +2417,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_rgncmn.o \
|
||||
$(OBJS)\monolib_settcmn.o \
|
||||
$(OBJS)\monolib_sizer.o \
|
||||
$(OBJS)\monolib_spinbuttcmn.o \
|
||||
$(OBJS)\monolib_spinctrlcmn.o \
|
||||
$(OBJS)\monolib_srchcmn.o \
|
||||
$(OBJS)\monolib_statbar.o \
|
||||
@ -2647,6 +2647,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_nbkbase.o \
|
||||
$(OBJS)\monolib_overlaycmn.o \
|
||||
$(OBJS)\monolib_paper.o \
|
||||
$(OBJS)\monolib_persist.o \
|
||||
$(OBJS)\monolib_pickerbase.o \
|
||||
$(OBJS)\monolib_popupcmn.o \
|
||||
$(OBJS)\monolib_prntbase.o \
|
||||
@ -2657,7 +2658,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_rgncmn.o \
|
||||
$(OBJS)\monolib_settcmn.o \
|
||||
$(OBJS)\monolib_sizer.o \
|
||||
$(OBJS)\monolib_spinbuttcmn.o \
|
||||
$(OBJS)\monolib_spinctrlcmn.o \
|
||||
$(OBJS)\monolib_srchcmn.o \
|
||||
$(OBJS)\monolib_statbar.o \
|
||||
@ -3009,6 +3009,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\coredll_nbkbase.o \
|
||||
$(OBJS)\coredll_overlaycmn.o \
|
||||
$(OBJS)\coredll_paper.o \
|
||||
$(OBJS)\coredll_persist.o \
|
||||
$(OBJS)\coredll_pickerbase.o \
|
||||
$(OBJS)\coredll_popupcmn.o \
|
||||
$(OBJS)\coredll_prntbase.o \
|
||||
@ -3019,7 +3020,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\coredll_rgncmn.o \
|
||||
$(OBJS)\coredll_settcmn.o \
|
||||
$(OBJS)\coredll_sizer.o \
|
||||
$(OBJS)\coredll_spinbuttcmn.o \
|
||||
$(OBJS)\coredll_spinctrlcmn.o \
|
||||
$(OBJS)\coredll_srchcmn.o \
|
||||
$(OBJS)\coredll_statbar.o \
|
||||
@ -3250,6 +3250,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\coredll_nbkbase.o \
|
||||
$(OBJS)\coredll_overlaycmn.o \
|
||||
$(OBJS)\coredll_paper.o \
|
||||
$(OBJS)\coredll_persist.o \
|
||||
$(OBJS)\coredll_pickerbase.o \
|
||||
$(OBJS)\coredll_popupcmn.o \
|
||||
$(OBJS)\coredll_prntbase.o \
|
||||
@ -3260,7 +3261,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\coredll_rgncmn.o \
|
||||
$(OBJS)\coredll_settcmn.o \
|
||||
$(OBJS)\coredll_sizer.o \
|
||||
$(OBJS)\coredll_spinbuttcmn.o \
|
||||
$(OBJS)\coredll_spinctrlcmn.o \
|
||||
$(OBJS)\coredll_srchcmn.o \
|
||||
$(OBJS)\coredll_statbar.o \
|
||||
@ -3501,6 +3501,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\corelib_nbkbase.o \
|
||||
$(OBJS)\corelib_overlaycmn.o \
|
||||
$(OBJS)\corelib_paper.o \
|
||||
$(OBJS)\corelib_persist.o \
|
||||
$(OBJS)\corelib_pickerbase.o \
|
||||
$(OBJS)\corelib_popupcmn.o \
|
||||
$(OBJS)\corelib_prntbase.o \
|
||||
@ -3511,7 +3512,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\corelib_rgncmn.o \
|
||||
$(OBJS)\corelib_settcmn.o \
|
||||
$(OBJS)\corelib_sizer.o \
|
||||
$(OBJS)\corelib_spinbuttcmn.o \
|
||||
$(OBJS)\corelib_spinctrlcmn.o \
|
||||
$(OBJS)\corelib_srchcmn.o \
|
||||
$(OBJS)\corelib_statbar.o \
|
||||
@ -3742,6 +3742,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\corelib_nbkbase.o \
|
||||
$(OBJS)\corelib_overlaycmn.o \
|
||||
$(OBJS)\corelib_paper.o \
|
||||
$(OBJS)\corelib_persist.o \
|
||||
$(OBJS)\corelib_pickerbase.o \
|
||||
$(OBJS)\corelib_popupcmn.o \
|
||||
$(OBJS)\corelib_prntbase.o \
|
||||
@ -3752,7 +3753,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\corelib_rgncmn.o \
|
||||
$(OBJS)\corelib_settcmn.o \
|
||||
$(OBJS)\corelib_sizer.o \
|
||||
$(OBJS)\corelib_spinbuttcmn.o \
|
||||
$(OBJS)\corelib_spinctrlcmn.o \
|
||||
$(OBJS)\corelib_srchcmn.o \
|
||||
$(OBJS)\corelib_statbar.o \
|
||||
@ -7411,6 +7411,11 @@ $(OBJS)\monodll_paper.o: ../../src/common/paper.cpp
|
||||
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\monodll_persist.o: ../../src/common/persist.cpp
|
||||
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\monodll_pickerbase.o: ../../src/common/pickerbase.cpp
|
||||
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
@ -7461,11 +7466,6 @@ $(OBJS)\monodll_sizer.o: ../../src/common/sizer.cpp
|
||||
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\monodll_spinbuttcmn.o: ../../src/common/spinbuttcmn.cpp
|
||||
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\monodll_spinctrlcmn.o: ../../src/common/spinctrlcmn.cpp
|
||||
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
@ -9745,6 +9745,11 @@ $(OBJS)\monolib_paper.o: ../../src/common/paper.cpp
|
||||
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\monolib_persist.o: ../../src/common/persist.cpp
|
||||
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\monolib_pickerbase.o: ../../src/common/pickerbase.cpp
|
||||
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
@ -9795,11 +9800,6 @@ $(OBJS)\monolib_sizer.o: ../../src/common/sizer.cpp
|
||||
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\monolib_spinbuttcmn.o: ../../src/common/spinbuttcmn.cpp
|
||||
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\monolib_spinctrlcmn.o: ../../src/common/spinctrlcmn.cpp
|
||||
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
@ -12103,6 +12103,11 @@ $(OBJS)\coredll_paper.o: ../../src/common/paper.cpp
|
||||
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\coredll_persist.o: ../../src/common/persist.cpp
|
||||
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\coredll_pickerbase.o: ../../src/common/pickerbase.cpp
|
||||
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
@ -12153,11 +12158,6 @@ $(OBJS)\coredll_sizer.o: ../../src/common/sizer.cpp
|
||||
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\coredll_spinbuttcmn.o: ../../src/common/spinbuttcmn.cpp
|
||||
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\coredll_spinctrlcmn.o: ../../src/common/spinctrlcmn.cpp
|
||||
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
@ -13589,6 +13589,11 @@ $(OBJS)\corelib_paper.o: ../../src/common/paper.cpp
|
||||
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\corelib_persist.o: ../../src/common/persist.cpp
|
||||
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\corelib_pickerbase.o: ../../src/common/pickerbase.cpp
|
||||
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
@ -13639,11 +13644,6 @@ $(OBJS)\corelib_sizer.o: ../../src/common/sizer.cpp
|
||||
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\corelib_spinbuttcmn.o: ../../src/common/spinbuttcmn.cpp
|
||||
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\corelib_spinctrlcmn.o: ../../src/common/spinctrlcmn.cpp
|
||||
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
||||
@ -1881,6 +1881,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_nbkbase.obj \
|
||||
$(OBJS)\monodll_overlaycmn.obj \
|
||||
$(OBJS)\monodll_paper.obj \
|
||||
$(OBJS)\monodll_persist.obj \
|
||||
$(OBJS)\monodll_pickerbase.obj \
|
||||
$(OBJS)\monodll_popupcmn.obj \
|
||||
$(OBJS)\monodll_prntbase.obj \
|
||||
@ -1891,7 +1892,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_rgncmn.obj \
|
||||
$(OBJS)\monodll_settcmn.obj \
|
||||
$(OBJS)\monodll_sizer.obj \
|
||||
$(OBJS)\monodll_spinbuttcmn.obj \
|
||||
$(OBJS)\monodll_spinctrlcmn.obj \
|
||||
$(OBJS)\monodll_srchcmn.obj \
|
||||
$(OBJS)\monodll_statbar.obj \
|
||||
@ -2120,6 +2120,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_nbkbase.obj \
|
||||
$(OBJS)\monodll_overlaycmn.obj \
|
||||
$(OBJS)\monodll_paper.obj \
|
||||
$(OBJS)\monodll_persist.obj \
|
||||
$(OBJS)\monodll_pickerbase.obj \
|
||||
$(OBJS)\monodll_popupcmn.obj \
|
||||
$(OBJS)\monodll_prntbase.obj \
|
||||
@ -2130,7 +2131,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_rgncmn.obj \
|
||||
$(OBJS)\monodll_settcmn.obj \
|
||||
$(OBJS)\monodll_sizer.obj \
|
||||
$(OBJS)\monodll_spinbuttcmn.obj \
|
||||
$(OBJS)\monodll_spinctrlcmn.obj \
|
||||
$(OBJS)\monodll_srchcmn.obj \
|
||||
$(OBJS)\monodll_statbar.obj \
|
||||
@ -2568,6 +2568,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_nbkbase.obj \
|
||||
$(OBJS)\monolib_overlaycmn.obj \
|
||||
$(OBJS)\monolib_paper.obj \
|
||||
$(OBJS)\monolib_persist.obj \
|
||||
$(OBJS)\monolib_pickerbase.obj \
|
||||
$(OBJS)\monolib_popupcmn.obj \
|
||||
$(OBJS)\monolib_prntbase.obj \
|
||||
@ -2578,7 +2579,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_rgncmn.obj \
|
||||
$(OBJS)\monolib_settcmn.obj \
|
||||
$(OBJS)\monolib_sizer.obj \
|
||||
$(OBJS)\monolib_spinbuttcmn.obj \
|
||||
$(OBJS)\monolib_spinctrlcmn.obj \
|
||||
$(OBJS)\monolib_srchcmn.obj \
|
||||
$(OBJS)\monolib_statbar.obj \
|
||||
@ -2807,6 +2807,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_nbkbase.obj \
|
||||
$(OBJS)\monolib_overlaycmn.obj \
|
||||
$(OBJS)\monolib_paper.obj \
|
||||
$(OBJS)\monolib_persist.obj \
|
||||
$(OBJS)\monolib_pickerbase.obj \
|
||||
$(OBJS)\monolib_popupcmn.obj \
|
||||
$(OBJS)\monolib_prntbase.obj \
|
||||
@ -2817,7 +2818,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_rgncmn.obj \
|
||||
$(OBJS)\monolib_settcmn.obj \
|
||||
$(OBJS)\monolib_sizer.obj \
|
||||
$(OBJS)\monolib_spinbuttcmn.obj \
|
||||
$(OBJS)\monolib_spinctrlcmn.obj \
|
||||
$(OBJS)\monolib_srchcmn.obj \
|
||||
$(OBJS)\monolib_statbar.obj \
|
||||
@ -3185,6 +3185,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\coredll_nbkbase.obj \
|
||||
$(OBJS)\coredll_overlaycmn.obj \
|
||||
$(OBJS)\coredll_paper.obj \
|
||||
$(OBJS)\coredll_persist.obj \
|
||||
$(OBJS)\coredll_pickerbase.obj \
|
||||
$(OBJS)\coredll_popupcmn.obj \
|
||||
$(OBJS)\coredll_prntbase.obj \
|
||||
@ -3195,7 +3196,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\coredll_rgncmn.obj \
|
||||
$(OBJS)\coredll_settcmn.obj \
|
||||
$(OBJS)\coredll_sizer.obj \
|
||||
$(OBJS)\coredll_spinbuttcmn.obj \
|
||||
$(OBJS)\coredll_spinctrlcmn.obj \
|
||||
$(OBJS)\coredll_srchcmn.obj \
|
||||
$(OBJS)\coredll_statbar.obj \
|
||||
@ -3424,6 +3424,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\coredll_nbkbase.obj \
|
||||
$(OBJS)\coredll_overlaycmn.obj \
|
||||
$(OBJS)\coredll_paper.obj \
|
||||
$(OBJS)\coredll_persist.obj \
|
||||
$(OBJS)\coredll_pickerbase.obj \
|
||||
$(OBJS)\coredll_popupcmn.obj \
|
||||
$(OBJS)\coredll_prntbase.obj \
|
||||
@ -3434,7 +3435,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\coredll_rgncmn.obj \
|
||||
$(OBJS)\coredll_settcmn.obj \
|
||||
$(OBJS)\coredll_sizer.obj \
|
||||
$(OBJS)\coredll_spinbuttcmn.obj \
|
||||
$(OBJS)\coredll_spinctrlcmn.obj \
|
||||
$(OBJS)\coredll_srchcmn.obj \
|
||||
$(OBJS)\coredll_statbar.obj \
|
||||
@ -3675,6 +3675,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\corelib_nbkbase.obj \
|
||||
$(OBJS)\corelib_overlaycmn.obj \
|
||||
$(OBJS)\corelib_paper.obj \
|
||||
$(OBJS)\corelib_persist.obj \
|
||||
$(OBJS)\corelib_pickerbase.obj \
|
||||
$(OBJS)\corelib_popupcmn.obj \
|
||||
$(OBJS)\corelib_prntbase.obj \
|
||||
@ -3685,7 +3686,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\corelib_rgncmn.obj \
|
||||
$(OBJS)\corelib_settcmn.obj \
|
||||
$(OBJS)\corelib_sizer.obj \
|
||||
$(OBJS)\corelib_spinbuttcmn.obj \
|
||||
$(OBJS)\corelib_spinctrlcmn.obj \
|
||||
$(OBJS)\corelib_srchcmn.obj \
|
||||
$(OBJS)\corelib_statbar.obj \
|
||||
@ -3914,6 +3914,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\corelib_nbkbase.obj \
|
||||
$(OBJS)\corelib_overlaycmn.obj \
|
||||
$(OBJS)\corelib_paper.obj \
|
||||
$(OBJS)\corelib_persist.obj \
|
||||
$(OBJS)\corelib_pickerbase.obj \
|
||||
$(OBJS)\corelib_popupcmn.obj \
|
||||
$(OBJS)\corelib_prntbase.obj \
|
||||
@ -3924,7 +3925,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\corelib_rgncmn.obj \
|
||||
$(OBJS)\corelib_settcmn.obj \
|
||||
$(OBJS)\corelib_sizer.obj \
|
||||
$(OBJS)\corelib_spinbuttcmn.obj \
|
||||
$(OBJS)\corelib_spinctrlcmn.obj \
|
||||
$(OBJS)\corelib_srchcmn.obj \
|
||||
$(OBJS)\corelib_statbar.obj \
|
||||
@ -7493,6 +7493,11 @@ $(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\paper.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monodll_persist.obj: ..\..\src\common\persist.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\persist.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monodll_pickerbase.obj: ..\..\src\common\pickerbase.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\pickerbase.cpp
|
||||
@ -7543,11 +7548,6 @@ $(OBJS)\monodll_sizer.obj: ..\..\src\common\sizer.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sizer.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monodll_spinbuttcmn.obj: ..\..\src\common\spinbuttcmn.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\spinbuttcmn.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monodll_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp
|
||||
@ -9713,6 +9713,11 @@ $(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\paper.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monolib_persist.obj: ..\..\src\common\persist.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\persist.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monolib_pickerbase.obj: ..\..\src\common\pickerbase.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\pickerbase.cpp
|
||||
@ -9763,11 +9768,6 @@ $(OBJS)\monolib_sizer.obj: ..\..\src\common\sizer.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sizer.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monolib_spinbuttcmn.obj: ..\..\src\common\spinbuttcmn.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\spinbuttcmn.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\monolib_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp
|
||||
@ -11957,6 +11957,11 @@ $(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\paper.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\coredll_persist.obj: ..\..\src\common\persist.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\persist.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\coredll_pickerbase.obj: ..\..\src\common\pickerbase.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\pickerbase.cpp
|
||||
@ -12007,11 +12012,6 @@ $(OBJS)\coredll_sizer.obj: ..\..\src\common\sizer.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\sizer.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\coredll_spinbuttcmn.obj: ..\..\src\common\spinbuttcmn.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\spinbuttcmn.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\coredll_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp
|
||||
@ -13331,6 +13331,11 @@ $(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\paper.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\corelib_persist.obj: ..\..\src\common\persist.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\persist.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\corelib_pickerbase.obj: ..\..\src\common\pickerbase.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\pickerbase.cpp
|
||||
@ -13381,11 +13386,6 @@ $(OBJS)\corelib_sizer.obj: ..\..\src\common\sizer.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\sizer.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\corelib_spinbuttcmn.obj: ..\..\src\common\spinbuttcmn.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\spinbuttcmn.cpp
|
||||
!endif
|
||||
|
||||
!if "$(USE_GUI)" == "1"
|
||||
$(OBJS)\corelib_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp
|
||||
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp
|
||||
|
||||
@ -398,6 +398,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
|
||||
$(OBJS)\monodll_nbkbase.obj &
|
||||
$(OBJS)\monodll_overlaycmn.obj &
|
||||
$(OBJS)\monodll_paper.obj &
|
||||
$(OBJS)\monodll_persist.obj &
|
||||
$(OBJS)\monodll_pickerbase.obj &
|
||||
$(OBJS)\monodll_popupcmn.obj &
|
||||
$(OBJS)\monodll_prntbase.obj &
|
||||
@ -408,7 +409,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
|
||||
$(OBJS)\monodll_rgncmn.obj &
|
||||
$(OBJS)\monodll_settcmn.obj &
|
||||
$(OBJS)\monodll_sizer.obj &
|
||||
$(OBJS)\monodll_spinbuttcmn.obj &
|
||||
$(OBJS)\monodll_spinctrlcmn.obj &
|
||||
$(OBJS)\monodll_srchcmn.obj &
|
||||
$(OBJS)\monodll_statbar.obj &
|
||||
@ -639,6 +639,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
|
||||
$(OBJS)\monodll_nbkbase.obj &
|
||||
$(OBJS)\monodll_overlaycmn.obj &
|
||||
$(OBJS)\monodll_paper.obj &
|
||||
$(OBJS)\monodll_persist.obj &
|
||||
$(OBJS)\monodll_pickerbase.obj &
|
||||
$(OBJS)\monodll_popupcmn.obj &
|
||||
$(OBJS)\monodll_prntbase.obj &
|
||||
@ -649,7 +650,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
|
||||
$(OBJS)\monodll_rgncmn.obj &
|
||||
$(OBJS)\monodll_settcmn.obj &
|
||||
$(OBJS)\monodll_sizer.obj &
|
||||
$(OBJS)\monodll_spinbuttcmn.obj &
|
||||
$(OBJS)\monodll_spinctrlcmn.obj &
|
||||
$(OBJS)\monodll_srchcmn.obj &
|
||||
$(OBJS)\monodll_statbar.obj &
|
||||
@ -1090,6 +1090,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
|
||||
$(OBJS)\monolib_nbkbase.obj &
|
||||
$(OBJS)\monolib_overlaycmn.obj &
|
||||
$(OBJS)\monolib_paper.obj &
|
||||
$(OBJS)\monolib_persist.obj &
|
||||
$(OBJS)\monolib_pickerbase.obj &
|
||||
$(OBJS)\monolib_popupcmn.obj &
|
||||
$(OBJS)\monolib_prntbase.obj &
|
||||
@ -1100,7 +1101,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
|
||||
$(OBJS)\monolib_rgncmn.obj &
|
||||
$(OBJS)\monolib_settcmn.obj &
|
||||
$(OBJS)\monolib_sizer.obj &
|
||||
$(OBJS)\monolib_spinbuttcmn.obj &
|
||||
$(OBJS)\monolib_spinctrlcmn.obj &
|
||||
$(OBJS)\monolib_srchcmn.obj &
|
||||
$(OBJS)\monolib_statbar.obj &
|
||||
@ -1331,6 +1331,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
|
||||
$(OBJS)\monolib_nbkbase.obj &
|
||||
$(OBJS)\monolib_overlaycmn.obj &
|
||||
$(OBJS)\monolib_paper.obj &
|
||||
$(OBJS)\monolib_persist.obj &
|
||||
$(OBJS)\monolib_pickerbase.obj &
|
||||
$(OBJS)\monolib_popupcmn.obj &
|
||||
$(OBJS)\monolib_prntbase.obj &
|
||||
@ -1341,7 +1342,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
|
||||
$(OBJS)\monolib_rgncmn.obj &
|
||||
$(OBJS)\monolib_settcmn.obj &
|
||||
$(OBJS)\monolib_sizer.obj &
|
||||
$(OBJS)\monolib_spinbuttcmn.obj &
|
||||
$(OBJS)\monolib_spinctrlcmn.obj &
|
||||
$(OBJS)\monolib_srchcmn.obj &
|
||||
$(OBJS)\monolib_statbar.obj &
|
||||
@ -1704,6 +1704,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
|
||||
$(OBJS)\coredll_nbkbase.obj &
|
||||
$(OBJS)\coredll_overlaycmn.obj &
|
||||
$(OBJS)\coredll_paper.obj &
|
||||
$(OBJS)\coredll_persist.obj &
|
||||
$(OBJS)\coredll_pickerbase.obj &
|
||||
$(OBJS)\coredll_popupcmn.obj &
|
||||
$(OBJS)\coredll_prntbase.obj &
|
||||
@ -1714,7 +1715,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
|
||||
$(OBJS)\coredll_rgncmn.obj &
|
||||
$(OBJS)\coredll_settcmn.obj &
|
||||
$(OBJS)\coredll_sizer.obj &
|
||||
$(OBJS)\coredll_spinbuttcmn.obj &
|
||||
$(OBJS)\coredll_spinctrlcmn.obj &
|
||||
$(OBJS)\coredll_srchcmn.obj &
|
||||
$(OBJS)\coredll_statbar.obj &
|
||||
@ -1945,6 +1945,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
|
||||
$(OBJS)\coredll_nbkbase.obj &
|
||||
$(OBJS)\coredll_overlaycmn.obj &
|
||||
$(OBJS)\coredll_paper.obj &
|
||||
$(OBJS)\coredll_persist.obj &
|
||||
$(OBJS)\coredll_pickerbase.obj &
|
||||
$(OBJS)\coredll_popupcmn.obj &
|
||||
$(OBJS)\coredll_prntbase.obj &
|
||||
@ -1955,7 +1956,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
|
||||
$(OBJS)\coredll_rgncmn.obj &
|
||||
$(OBJS)\coredll_settcmn.obj &
|
||||
$(OBJS)\coredll_sizer.obj &
|
||||
$(OBJS)\coredll_spinbuttcmn.obj &
|
||||
$(OBJS)\coredll_spinctrlcmn.obj &
|
||||
$(OBJS)\coredll_srchcmn.obj &
|
||||
$(OBJS)\coredll_statbar.obj &
|
||||
@ -2198,6 +2198,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
|
||||
$(OBJS)\corelib_nbkbase.obj &
|
||||
$(OBJS)\corelib_overlaycmn.obj &
|
||||
$(OBJS)\corelib_paper.obj &
|
||||
$(OBJS)\corelib_persist.obj &
|
||||
$(OBJS)\corelib_pickerbase.obj &
|
||||
$(OBJS)\corelib_popupcmn.obj &
|
||||
$(OBJS)\corelib_prntbase.obj &
|
||||
@ -2208,7 +2209,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
|
||||
$(OBJS)\corelib_rgncmn.obj &
|
||||
$(OBJS)\corelib_settcmn.obj &
|
||||
$(OBJS)\corelib_sizer.obj &
|
||||
$(OBJS)\corelib_spinbuttcmn.obj &
|
||||
$(OBJS)\corelib_spinctrlcmn.obj &
|
||||
$(OBJS)\corelib_srchcmn.obj &
|
||||
$(OBJS)\corelib_statbar.obj &
|
||||
@ -2439,6 +2439,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
|
||||
$(OBJS)\corelib_nbkbase.obj &
|
||||
$(OBJS)\corelib_overlaycmn.obj &
|
||||
$(OBJS)\corelib_paper.obj &
|
||||
$(OBJS)\corelib_persist.obj &
|
||||
$(OBJS)\corelib_pickerbase.obj &
|
||||
$(OBJS)\corelib_popupcmn.obj &
|
||||
$(OBJS)\corelib_prntbase.obj &
|
||||
@ -2449,7 +2450,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
|
||||
$(OBJS)\corelib_rgncmn.obj &
|
||||
$(OBJS)\corelib_settcmn.obj &
|
||||
$(OBJS)\corelib_sizer.obj &
|
||||
$(OBJS)\corelib_spinbuttcmn.obj &
|
||||
$(OBJS)\corelib_spinctrlcmn.obj &
|
||||
$(OBJS)\corelib_srchcmn.obj &
|
||||
$(OBJS)\corelib_statbar.obj &
|
||||
@ -7656,6 +7656,11 @@ $(OBJS)\monodll_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\monodll_persist.obj : .AUTODEPEND ..\..\src\common\persist.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\monodll_pickerbase.obj : .AUTODEPEND ..\..\src\common\pickerbase.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
|
||||
@ -7706,11 +7711,6 @@ $(OBJS)\monodll_sizer.obj : .AUTODEPEND ..\..\src\common\sizer.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\monodll_spinbuttcmn.obj : .AUTODEPEND ..\..\src\common\spinbuttcmn.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\monodll_spinctrlcmn.obj : .AUTODEPEND ..\..\src\common\spinctrlcmn.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
|
||||
@ -9990,6 +9990,11 @@ $(OBJS)\monolib_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\monolib_persist.obj : .AUTODEPEND ..\..\src\common\persist.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\monolib_pickerbase.obj : .AUTODEPEND ..\..\src\common\pickerbase.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
|
||||
@ -10040,11 +10045,6 @@ $(OBJS)\monolib_sizer.obj : .AUTODEPEND ..\..\src\common\sizer.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\monolib_spinbuttcmn.obj : .AUTODEPEND ..\..\src\common\spinbuttcmn.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\monolib_spinctrlcmn.obj : .AUTODEPEND ..\..\src\common\spinctrlcmn.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
|
||||
@ -12348,6 +12348,11 @@ $(OBJS)\coredll_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\coredll_persist.obj : .AUTODEPEND ..\..\src\common\persist.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\coredll_pickerbase.obj : .AUTODEPEND ..\..\src\common\pickerbase.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
|
||||
@ -12398,11 +12403,6 @@ $(OBJS)\coredll_sizer.obj : .AUTODEPEND ..\..\src\common\sizer.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\coredll_spinbuttcmn.obj : .AUTODEPEND ..\..\src\common\spinbuttcmn.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\coredll_spinctrlcmn.obj : .AUTODEPEND ..\..\src\common\spinctrlcmn.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
|
||||
@ -13834,6 +13834,11 @@ $(OBJS)\corelib_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\corelib_persist.obj : .AUTODEPEND ..\..\src\common\persist.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\corelib_pickerbase.obj : .AUTODEPEND ..\..\src\common\pickerbase.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
|
||||
@ -13884,11 +13889,6 @@ $(OBJS)\corelib_sizer.obj : .AUTODEPEND ..\..\src\common\sizer.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\corelib_spinbuttcmn.obj : .AUTODEPEND ..\..\src\common\spinbuttcmn.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
|
||||
!endif
|
||||
|
||||
!ifeq USE_GUI 1
|
||||
$(OBJS)\corelib_spinctrlcmn.obj : .AUTODEPEND ..\..\src\common\spinctrlcmn.cpp
|
||||
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
|
||||
|
||||
@ -562,6 +562,10 @@ SOURCE=..\..\src\common\paper.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\src\common\persist.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\src\common\pickerbase.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
@ -602,10 +606,6 @@ SOURCE=..\..\src\common\sizer.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\src\common\spinbuttcmn.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\src\common\spinctrlcmn.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
@ -5746,6 +5746,10 @@ SOURCE=..\..\include\wx\bmpcbox.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\include\wx\persist\bookctrl.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\include\wx\bookctrl.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
@ -5830,6 +5834,10 @@ SOURCE=..\..\include\wx\combobox.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\include\wx\persist\common.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\include\wx\control.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
@ -6510,6 +6518,10 @@ SOURCE=..\..\include\wx\toplevel.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\include\wx\persist\toplevel.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\include\wx\treebase.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
@ -801,6 +801,9 @@
|
||||
<File
|
||||
RelativePath="..\..\src\common\paper.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\persist.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\pickerbase.cpp">
|
||||
</File>
|
||||
@ -831,9 +834,6 @@
|
||||
<File
|
||||
RelativePath="..\..\src\common\sizer.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\spinbuttcmn.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\spinctrlcmn.cpp">
|
||||
</File>
|
||||
@ -3559,6 +3559,9 @@
|
||||
<File
|
||||
RelativePath="..\..\include\wx\bmpcbox.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\persist\bookctrl.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\bookctrl.h">
|
||||
</File>
|
||||
@ -3622,6 +3625,9 @@
|
||||
<File
|
||||
RelativePath="..\..\include\wx\combobox.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\persist\common.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\control.h">
|
||||
</File>
|
||||
@ -4132,6 +4138,9 @@
|
||||
<File
|
||||
RelativePath="..\..\include\wx\toplevel.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\persist\toplevel.h">
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\treebase.h">
|
||||
</File>
|
||||
|
||||
@ -1106,6 +1106,10 @@
|
||||
RelativePath="..\..\src\common\paper.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\persist.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\pickerbase.cpp"
|
||||
>
|
||||
@ -1146,10 +1150,6 @@
|
||||
RelativePath="..\..\src\common\sizer.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\spinbuttcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\spinctrlcmn.cpp"
|
||||
>
|
||||
@ -4767,6 +4767,10 @@
|
||||
RelativePath="..\..\include\wx\bmpcbox.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\persist\bookctrl.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\bookctrl.h"
|
||||
>
|
||||
@ -4851,6 +4855,10 @@
|
||||
RelativePath="..\..\include\wx\combobox.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\persist\common.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\control.h"
|
||||
>
|
||||
@ -5531,6 +5539,10 @@
|
||||
RelativePath="..\..\include\wx\toplevel.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\persist\toplevel.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\treebase.h"
|
||||
>
|
||||
|
||||
@ -1102,6 +1102,10 @@
|
||||
RelativePath="..\..\src\common\paper.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\persist.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\pickerbase.cpp"
|
||||
>
|
||||
@ -1142,10 +1146,6 @@
|
||||
RelativePath="..\..\src\common\sizer.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\spinbuttcmn.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\src\common\spinctrlcmn.cpp"
|
||||
>
|
||||
@ -4763,6 +4763,10 @@
|
||||
RelativePath="..\..\include\wx\bmpcbox.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\persist\bookctrl.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\bookctrl.h"
|
||||
>
|
||||
@ -4847,6 +4851,10 @@
|
||||
RelativePath="..\..\include\wx\combobox.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\persist\common.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\control.h"
|
||||
>
|
||||
@ -5527,6 +5535,10 @@
|
||||
RelativePath="..\..\include\wx\toplevel.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\persist\toplevel.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\include\wx\treebase.h"
|
||||
>
|
||||
|
||||
@ -109,11 +109,11 @@ extern WXDLLIMPEXP_BASE wxEventType wxNewEventType();
|
||||
#define wxDECLARE_EXPORTED_EVENT( expdecl, name, type ) \
|
||||
extern const expdecl wxEventType name;
|
||||
|
||||
#define wxDEFINE_EVENT_REFERENCE( name, type, value ) \
|
||||
const wxEventType& name = value;
|
||||
#define wxDEFINE_EVENT_ALIAS( name, type, value ) \
|
||||
const wxEventType name = value;
|
||||
|
||||
#define wxDECLARE_EXPORTED_EVENT_REFERENCE( expdecl, name, type ) \
|
||||
extern const expdecl wxEventType& name;
|
||||
#define wxDECLARE_EXPORTED_EVENT_ALIAS( expdecl, name, type ) \
|
||||
extern const expdecl wxEventType name;
|
||||
|
||||
#define wxDECLARE_LOCAL_EVENT( name, type ) \
|
||||
wxDECLARE_EXPORTED_EVENT( wxEMPTY_PARAMETER_VALUE, name, type )
|
||||
@ -127,11 +127,11 @@ extern WXDLLIMPEXP_BASE wxEventType wxNewEventType();
|
||||
#define wxDECLARE_EXPORTED_EVENT( expdecl, name, type ) \
|
||||
extern const expdecl wxTypedEventType< type > name;
|
||||
|
||||
#define wxDEFINE_EVENT_REFERENCE( name, type, value ) \
|
||||
const wxTypedEventTypeReference< type > name( value );
|
||||
#define wxDEFINE_EVENT_ALIAS( name, type, value ) \
|
||||
const wxTypedEventType< type > name( value );
|
||||
|
||||
#define wxDECLARE_EXPORTED_EVENT_REFERENCE( expdecl, name, type ) \
|
||||
extern const expdecl wxTypedEventTypeReference< type > name;
|
||||
#define wxDECLARE_EXPORTED_EVENT_ALIAS( expdecl, name, type ) \
|
||||
extern const expdecl wxTypedEventType< type > name;
|
||||
|
||||
#define wxDECLARE_LOCAL_EVENT( name, type ) \
|
||||
wxDECLARE_EXPORTED_EVENT( wxEMPTY_PARAMETER_VALUE, name, type )
|
||||
@ -159,30 +159,6 @@ private:
|
||||
wxEventType m_type;
|
||||
};
|
||||
|
||||
// Due to a bug in older wx versions wxSpinEvents were being sent with type of
|
||||
// wxEVT_SCROLL_LINEUP, wxEVT_SCROLL_LINEDOWN and wxEVT_SCROLL_THUMBTRACK. But
|
||||
// with the type-safe events in place, these event types are associated with
|
||||
// wxScrollEvent. To allow handling of spin events, new event types have been
|
||||
// defined in spinbutt.h/spinnbuttcmn.cpp. To maintain backward compatibility
|
||||
// the spin event types are being initialized with the scroll event types. But
|
||||
// this presents as with the same static initialization order problem we also
|
||||
// have for the static event tables. So we use the same solution and the
|
||||
// template definition below holds a reference to a wxEventType.
|
||||
template <typename Event>
|
||||
class WXDLLIMPEXP_BASE wxTypedEventTypeReference
|
||||
{
|
||||
public:
|
||||
typedef Event CorrespondingEvent;
|
||||
|
||||
wxTypedEventTypeReference(const wxEventType& type) : m_type(type) { }
|
||||
|
||||
// used for static event tables
|
||||
operator const wxEventType&() const { return m_type; }
|
||||
|
||||
private:
|
||||
const wxEventType &m_type;
|
||||
};
|
||||
|
||||
#endif // !wxEVENTS_COMPATIBILITY_2_8
|
||||
|
||||
// These are needed for the functor definitions
|
||||
@ -495,6 +471,7 @@ class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
|
||||
class WXDLLIMPEXP_FWD_CORE wxNavigationKeyEvent;
|
||||
class WXDLLIMPEXP_FWD_CORE wxSetCursorEvent;
|
||||
class WXDLLIMPEXP_FWD_CORE wxScrollEvent;
|
||||
class WXDLLIMPEXP_FWD_CORE wxSpinEvent;
|
||||
class WXDLLIMPEXP_FWD_CORE wxScrollWinEvent;
|
||||
class WXDLLIMPEXP_FWD_CORE wxSizeEvent;
|
||||
class WXDLLIMPEXP_FWD_CORE wxMoveEvent;
|
||||
@ -592,6 +569,21 @@ wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_THUMBTRACK, wxScrollEven
|
||||
wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_THUMBRELEASE, wxScrollEvent)
|
||||
wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_CHANGED, wxScrollEvent)
|
||||
|
||||
// Due to a bug in older wx versions, wxSpinEvents were being sent with type of
|
||||
// wxEVT_SCROLL_LINEUP, wxEVT_SCROLL_LINEDOWN and wxEVT_SCROLL_THUMBTRACK. But
|
||||
// with the type-safe events in place, these event types are associated with
|
||||
// wxScrollEvent. To allow handling of spin events, new event types have been
|
||||
// defined in spinbutt.h/spinnbuttcmn.cpp. To maintain backward compatibility
|
||||
// the spin event types are being initialized with the scroll event types.
|
||||
|
||||
#if wxUSE_SPINBTN
|
||||
|
||||
wxDECLARE_EXPORTED_EVENT_ALIAS( WXDLLIMPEXP_CORE, wxEVT_SPIN_UP, wxSpinEvent )
|
||||
wxDECLARE_EXPORTED_EVENT_ALIAS( WXDLLIMPEXP_CORE, wxEVT_SPIN_DOWN, wxSpinEvent )
|
||||
wxDECLARE_EXPORTED_EVENT_ALIAS( WXDLLIMPEXP_CORE, wxEVT_SPIN, wxSpinEvent )
|
||||
|
||||
#endif
|
||||
|
||||
// Scroll events from wxWindow
|
||||
wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_TOP, wxScrollWinEvent)
|
||||
wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_BOTTOM, wxScrollWinEvent)
|
||||
|
||||
@ -25,11 +25,6 @@
|
||||
|
||||
#define wxSPIN_BUTTON_NAME _T("wxSpinButton")
|
||||
|
||||
class WXDLLIMPEXP_FWD_CORE wxSpinEvent;
|
||||
wxDECLARE_EXPORTED_EVENT_REFERENCE( WXDLLIMPEXP_CORE, wxEVT_SPIN_UP, wxSpinEvent )
|
||||
wxDECLARE_EXPORTED_EVENT_REFERENCE( WXDLLIMPEXP_CORE, wxEVT_SPIN_DOWN, wxSpinEvent )
|
||||
wxDECLARE_EXPORTED_EVENT_REFERENCE( WXDLLIMPEXP_CORE, wxEVT_SPIN, wxSpinEvent )
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// The wxSpinButton is like a small scrollbar than is often placed next
|
||||
// to a text control.
|
||||
@ -133,11 +128,11 @@ typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&);
|
||||
// (because of undefined initialization order of the globals defined in
|
||||
// different translation units) references in them
|
||||
#define EVT_SPIN_UP(winid, func) \
|
||||
wx__DECLARE_EVT1(wxEVT_SCROLL_LINEUP, winid, wxSpinEventHandler(func))
|
||||
wx__DECLARE_EVT1(wxEVT_SPIN_UP, winid, wxSpinEventHandler(func))
|
||||
#define EVT_SPIN_DOWN(winid, func) \
|
||||
wx__DECLARE_EVT1(wxEVT_SCROLL_LINEDOWN, winid, wxSpinEventHandler(func))
|
||||
wx__DECLARE_EVT1(wxEVT_SPIN_DOWN, winid, wxSpinEventHandler(func))
|
||||
#define EVT_SPIN(winid, func) \
|
||||
wx__DECLARE_EVT1(wxEVT_SCROLL_THUMBTRACK, winid, wxSpinEventHandler(func))
|
||||
wx__DECLARE_EVT1(wxEVT_SPIN, winid, wxSpinEventHandler(func))
|
||||
|
||||
#endif // wxUSE_SPINBTN
|
||||
|
||||
|
||||
@ -38,6 +38,7 @@
|
||||
#include "wx/window.h"
|
||||
#include "wx/control.h"
|
||||
#include "wx/dc.h"
|
||||
#include "wx/spinbutt.h"
|
||||
#include "wx/textctrl.h"
|
||||
#include "wx/validate.h"
|
||||
#endif // wxUSE_GUI
|
||||
@ -232,6 +233,21 @@ wxDEFINE_EVENT( wxEVT_SCROLL_THUMBTRACK, wxScrollEvent )
|
||||
wxDEFINE_EVENT( wxEVT_SCROLL_THUMBRELEASE, wxScrollEvent )
|
||||
wxDEFINE_EVENT( wxEVT_SCROLL_CHANGED, wxScrollEvent )
|
||||
|
||||
// Due to a bug in older wx versions, wxSpinEvents were being sent with type of
|
||||
// wxEVT_SCROLL_LINEUP, wxEVT_SCROLL_LINEDOWN and wxEVT_SCROLL_THUMBTRACK. But
|
||||
// with the type-safe events in place, these event types are associated with
|
||||
// wxScrollEvent. To allow handling of spin events, new event types have been
|
||||
// defined in spinbutt.h/spinnbuttcmn.cpp. To maintain backward compatibility
|
||||
// the spin event types are being initialized with the scroll event types.
|
||||
|
||||
#if wxUSE_SPINBTN
|
||||
|
||||
wxDEFINE_EVENT_ALIAS( wxEVT_SPIN_UP, wxSpinEvent, wxEVT_SCROLL_LINEUP )
|
||||
wxDEFINE_EVENT_ALIAS( wxEVT_SPIN_DOWN, wxSpinEvent, wxEVT_SCROLL_LINEDOWN )
|
||||
wxDEFINE_EVENT_ALIAS( wxEVT_SPIN, wxSpinEvent, wxEVT_SCROLL_THUMBTRACK )
|
||||
|
||||
#endif // wxUSE_SPINBTN
|
||||
|
||||
// Scroll events from wxWindow
|
||||
wxDEFINE_EVENT( wxEVT_SCROLLWIN_TOP, wxScrollWinEvent )
|
||||
wxDEFINE_EVENT( wxEVT_SCROLLWIN_BOTTOM, wxScrollWinEvent )
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: src/common/spinbuttcmn.cpp
|
||||
// Purpose: define wxSpinButton event types
|
||||
// Author: Peter Most
|
||||
// Created: 01.11.08
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) 2008-2009 wxWidgets team
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
// ============================================================================
|
||||
// declarations
|
||||
// ============================================================================
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// headers
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// For compilers that support precompilation, includes "wx.h".
|
||||
#include "wx/wxprec.h"
|
||||
|
||||
#ifdef __BORLANDC__
|
||||
#pragma hdrstop
|
||||
#endif
|
||||
|
||||
#include "wx/spinbutt.h"
|
||||
|
||||
#if wxUSE_SPINBTN
|
||||
|
||||
wxDEFINE_EVENT_REFERENCE( wxEVT_SPIN_UP, wxSpinEvent, wxEVT_SCROLL_LINEUP )
|
||||
wxDEFINE_EVENT_REFERENCE( wxEVT_SPIN_DOWN, wxSpinEvent, wxEVT_SCROLL_LINEDOWN )
|
||||
wxDEFINE_EVENT_REFERENCE( wxEVT_SPIN, wxSpinEvent, wxEVT_SCROLL_THUMBTRACK )
|
||||
|
||||
#endif // wxUSE_SPINBTN
|
||||
Loading…
Reference in New Issue
Block a user