advlib_wizard.o \
$(__ADVANCED_PLATFORM_SRC_OBJECTS_3)
ALL_BASE_HEADERS = \
+ wx/afterstd.h \
wx/app.h \
wx/apptrait.h \
wx/arrimpl.cpp \
wx/window.h \
wx/accel.h \
wx/access.h \
- wx/afterstd.h \
wx/artprov.h \
wx/bitmap.h \
wx/busyinfo.h \
wx/tab.h \
wx/tabctrl.h \
wx/tbarbase.h \
- wx/tbarsmpl.h \
wx/tglbtn.h \
wx/tipwin.h \
wx/tooltip.h \
monodll_selstore.o \
monodll_spinctlg.o \
monodll_splitter.o \
- monodll_tbarsmpl.o \
monodll_textdlgg.o \
monodll_tipwin.o \
monodll_treectlg.o \
monodll_selstore.o \
monodll_spinctlg.o \
monodll_splitter.o \
- monodll_tbarsmpl.o \
monodll_textdlgg.o \
monodll_tipwin.o \
monodll_treectlg.o \
monolib_selstore.o \
monolib_spinctlg.o \
monolib_splitter.o \
- monolib_tbarsmpl.o \
monolib_textdlgg.o \
monolib_tipwin.o \
monolib_treectlg.o \
monolib_selstore.o \
monolib_spinctlg.o \
monolib_splitter.o \
- monolib_tbarsmpl.o \
monolib_textdlgg.o \
monolib_tipwin.o \
monolib_treectlg.o \
coredll_selstore.o \
coredll_spinctlg.o \
coredll_splitter.o \
- coredll_tbarsmpl.o \
coredll_textdlgg.o \
coredll_tipwin.o \
coredll_treectlg.o \
coredll_selstore.o \
coredll_spinctlg.o \
coredll_splitter.o \
- coredll_tbarsmpl.o \
coredll_textdlgg.o \
coredll_tipwin.o \
coredll_treectlg.o \
corelib_selstore.o \
corelib_spinctlg.o \
corelib_splitter.o \
- corelib_tbarsmpl.o \
corelib_textdlgg.o \
corelib_tipwin.o \
corelib_treectlg.o \
corelib_selstore.o \
corelib_spinctlg.o \
corelib_splitter.o \
- corelib_tbarsmpl.o \
corelib_textdlgg.o \
corelib_tipwin.o \
corelib_treectlg.o \
coredll_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-@COND_USE_GUI_1@coredll_tbarsmpl.o: $(srcdir)/src/generic/tbarsmpl.cpp
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
-
@COND_USE_GUI_1@coredll_textcmn.o: $(srcdir)/src/common/textcmn.cpp
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $<
corelib_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-@COND_USE_GUI_1@corelib_tbarsmpl.o: $(srcdir)/src/generic/tbarsmpl.cpp
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
-
@COND_USE_GUI_1@corelib_textcmn.o: $(srcdir)/src/common/textcmn.cpp
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $<
monodll_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-@COND_USE_GUI_1@monodll_tbarsmpl.o: $(srcdir)/src/generic/tbarsmpl.cpp
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
-
monodll_textbuf.o: $(srcdir)/src/common/textbuf.cpp
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $<
monolib_tbargtk.o: $(srcdir)/src/gtk/tbargtk.cpp
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-@COND_USE_GUI_1@monolib_tbarsmpl.o: $(srcdir)/src/generic/tbarsmpl.cpp
-@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-
monolib_textbuf.o: $(srcdir)/src/common/textbuf.cpp
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $<
dnl Bakefile 0.1.1 (http://bakefile.sourceforge.net)
dnl Do not modify, all changes will be overwritten!
-
-dnl Conditions:
-
dnl ### begin block 0_AC_BAKEFILE_PRECOMP_HEADERS ###
AC_BAKEFILE_PRECOMP_HEADERS
IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
-->
-
-
+
+
<!-- ======================================================================
FILES
src/common/utilscmn.cpp
</set>
<set var="BASE_CMN_HDR" hints="files">
- wx/afterstd.h
wx/app.h
wx/apptrait.h
wx/arrimpl.cpp
src/generic/selstore.cpp
src/generic/spinctlg.cpp
src/generic/splitter.cpp
- src/generic/tbarsmpl.cpp
src/generic/textdlgg.cpp
src/generic/tipwin.cpp
src/generic/treectlg.cpp
wx/accel.h
wx/access.h
+ wx/afterstd.h
wx/artprov.h
wx/bitmap.h
wx/busyinfo.h
wx/tab.h
wx/tabctrl.h
wx/tbarbase.h
- wx/tbarsmpl.h
wx/tglbtn.h
wx/tipwin.h
wx/tooltip.h
src/generic/fontdlgg.cpp
src/generic/imaglist.cpp
src/generic/listctrl.cpp
- src/generic/prntdlgg.cpp
src/generic/statusbr.cpp
src/generic/tabg.cpp
<!-- Unix files used by wxMac: -->
$(BASE_AND_GUI_CMN_SRC)
$(BASE_AND_GUI_PLATFORM_SRC) $(BASE_AND_GUI_TOOLKIT_SRC)
</set>
-
-
+
+
<!-- wxNet files: -->
<set var="NET_MACOSX_SRC" hints="files">
<if cond="TOOLKIT=='MAC'">$(NET_MAC_SRC)</if>
<!-- GUI sources: -->
-
+
<set var="LOWLEVEL_SRC" hints="files">
<if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='X11'">$(X11_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_HDR)</if>
</set>
-
+
<set var="GUI_SRC" hints="files">
<if cond="TOOLKIT=='GTK'">$(GTK_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_SRC)</if>
$(LOWLEVEL_SRC) $(UNIV_SRC) $(UNIV_THEMES_SRC) $(GUI_CMN_SRC)
</if>
</set>
-
+
<!-- wxAdvanced files: -->
<set var="ADVANCED_PLATFORM_SRC" hints="files">
<if cond="TOOLKIT=='MSW'">$(ADVANCED_MSW_SRC)</if>
$(LOWLEVEL_HDR)
$(GUI_CORE_HEADERS)
$(ADVANCED_HDR) $(HTML_HDR)
- $(OPENGL_HDR) $(DBGRID_HDR)
+ $(OPENGL_HDR) $(ODBC_HDR) $(DBGRID_HDR)
</if>
</set>
-
+
<set var="ALL_BASE_HEADERS" make_var="1" hints="files">
$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)
$(NET_CMN_HDR) $(NET_PLATFORM_HDR)
- $(XML_HDR) $(ODBC_HDR)
+ $(XML_HDR)
</set>
<set var="ALL_HEADERS" make_var="1" hints="files">
$(BASE_AND_GUI_DARWIN_SRC)
$(BASE_AND_GUI_WIN32_SRC)
$(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC) $(NET_MAC_SRC)
- $(XML_SRC) $(ODBC_SRC)
+ $(XML_SRC)
</set>
</makefile>
$(OBJS)\htmllib_m_tables.obj \
$(OBJS)\htmllib_winpars.obj \
$(OBJS)\htmllib_htmllbox.obj
-MAKEARGS = -DCPPFLAGS="$(CPPFLAGS)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \
- -DLDFLAGS="$(LDFLAGS)" -DCC="$(CC)" -DUSE_GUI="$(USE_GUI)" \
- -DMONOLITHIC="$(MONOLITHIC)" -DCXXFLAGS="$(CXXFLAGS)" \
- -DUSE_HTML="$(USE_HTML)" -DBUILD="$(BUILD)" -DDEBUG_INFO="$(DEBUG_INFO)" \
- -DVENDOR="$(VENDOR)" -DUNICODE="$(UNICODE)" \
- -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DMSLU="$(MSLU)" -DWXUNIV="$(WXUNIV)" \
- -DRUNTIME_LIBS="$(RUNTIME_LIBS)" -DCXX="$(CXX)" -DCFG="$(CFG)" \
- -DCFLAGS="$(CFLAGS)" -DSHARED="$(SHARED)" -DUSE_ODBC="$(USE_ODBC)" \
- -DUSE_OPENGL="$(USE_OPENGL)"
+MAKEARGS = -DCPPFLAGS=$(CPPFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) \
+ -DLDFLAGS=$(LDFLAGS) -DCC=$(CC) -DUSE_GUI=$(USE_GUI) \
+ -DMONOLITHIC=$(MONOLITHIC) -DCXXFLAGS=$(CXXFLAGS) -DUSE_HTML=$(USE_HTML) \
+ -DBUILD=$(BUILD) -DDEBUG_INFO=$(DEBUG_INFO) -DVENDOR=$(VENDOR) \
+ -DUNICODE=$(UNICODE) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DMSLU=$(MSLU) \
+ -DWXUNIV=$(WXUNIV) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DCXX=$(CXX) -DCFG=$(CFG) \
+ -DCFLAGS=$(CFLAGS) -DSHARED=$(SHARED) -DUSE_ODBC=$(USE_ODBC) \
+ -DUSE_OPENGL=$(USE_OPENGL)
MONODLL_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
-tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \
$(OBJS)\monolib_selstore.obj \
$(OBJS)\monolib_spinctlg.obj \
$(OBJS)\monolib_splitter.obj \
- $(OBJS)\monolib_tbarsmpl.obj \
$(OBJS)\monolib_textdlgg.obj \
$(OBJS)\monolib_tipwin.obj \
$(OBJS)\monolib_treectlg.obj \
$(OBJS)\monolib_selstore.obj \
$(OBJS)\monolib_spinctlg.obj \
$(OBJS)\monolib_splitter.obj \
- $(OBJS)\monolib_tbarsmpl.obj \
$(OBJS)\monolib_textdlgg.obj \
$(OBJS)\monolib_tipwin.obj \
$(OBJS)\monolib_treectlg.obj \
$(OBJS)\coredll_selstore.obj \
$(OBJS)\coredll_spinctlg.obj \
$(OBJS)\coredll_splitter.obj \
- $(OBJS)\coredll_tbarsmpl.obj \
$(OBJS)\coredll_textdlgg.obj \
$(OBJS)\coredll_tipwin.obj \
$(OBJS)\coredll_treectlg.obj \
$(OBJS)\coredll_selstore.obj \
$(OBJS)\coredll_spinctlg.obj \
$(OBJS)\coredll_splitter.obj \
- $(OBJS)\coredll_tbarsmpl.obj \
$(OBJS)\coredll_textdlgg.obj \
$(OBJS)\coredll_tipwin.obj \
$(OBJS)\coredll_treectlg.obj \
$(OBJS)\corelib_selstore.obj \
$(OBJS)\corelib_spinctlg.obj \
$(OBJS)\corelib_splitter.obj \
- $(OBJS)\corelib_tbarsmpl.obj \
$(OBJS)\corelib_textdlgg.obj \
$(OBJS)\corelib_tipwin.obj \
$(OBJS)\corelib_treectlg.obj \
$(OBJS)\corelib_selstore.obj \
$(OBJS)\corelib_spinctlg.obj \
$(OBJS)\corelib_splitter.obj \
- $(OBJS)\corelib_tbarsmpl.obj \
$(OBJS)\corelib_textdlgg.obj \
$(OBJS)\corelib_tipwin.obj \
$(OBJS)\corelib_treectlg.obj \
$(OBJS)\monodll_selstore.obj \
$(OBJS)\monodll_spinctlg.obj \
$(OBJS)\monodll_splitter.obj \
- $(OBJS)\monodll_tbarsmpl.obj \
$(OBJS)\monodll_textdlgg.obj \
$(OBJS)\monodll_tipwin.obj \
$(OBJS)\monodll_treectlg.obj \
$(OBJS)\monodll_selstore.obj \
$(OBJS)\monodll_spinctlg.obj \
$(OBJS)\monodll_splitter.obj \
- $(OBJS)\monodll_tbarsmpl.obj \
$(OBJS)\monodll_textdlgg.obj \
$(OBJS)\monodll_tipwin.obj \
$(OBJS)\monodll_treectlg.obj \
__netlib___depname = \
$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib
!endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1"
__odbcdll___depname = \
$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).dll
!endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_ODBC)" == "1"
__odbclib___depname = \
$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib
!endif
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_tbarsmpl.obj: ..\..\src\generic\tbarsmpl.cpp
- $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_textcmn.obj: ..\..\src\common\textcmn.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_tbarsmpl.obj: ..\..\src\generic\tbarsmpl.cpp
- $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_textcmn.obj: ..\..\src\common\textcmn.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_tbarsmpl.obj: ..\..\src\generic\tbarsmpl.cpp
- $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
-!endif
-
$(OBJS)\monodll_textbuf.obj: ..\..\src\common\textbuf.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_tbarsmpl.obj: ..\..\src\generic\tbarsmpl.cpp
- $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
$(OBJS)\monolib_textbuf.obj: ..\..\src\common\textbuf.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
|
!endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1"
$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).dll: $(OBJS)\odbcdll_dummy.obj $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
ilink32 -Tpd -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) @&&|
c0d32.obj $(ODBCDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) import32.lib ole2w32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,,
implib -f $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc $@
!endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_ODBC)" == "1"
$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib: $(OBJS)\odbclib_dummy.obj $(ODBCLIB_OBJECTS)
if exist $@ del $@
tlib /a /p2048 $@ @&&|
$(OBJS)\htmllib_m_tables.o \
$(OBJS)\htmllib_winpars.o \
$(OBJS)\htmllib_htmllbox.o
-MAKEARGS = CPPFLAGS="$(CPPFLAGS)" DEBUG_FLAG="$(DEBUG_FLAG)" \
- LDFLAGS="$(LDFLAGS)" CC="$(CC)" USE_GUI="$(USE_GUI)" \
- MONOLITHIC="$(MONOLITHIC)" CXXFLAGS="$(CXXFLAGS)" \
- GCC_VERSION="$(GCC_VERSION)" USE_HTML="$(USE_HTML)" BUILD="$(BUILD)" \
- DEBUG_INFO="$(DEBUG_INFO)" VENDOR="$(VENDOR)" UNICODE="$(UNICODE)" \
- OFFICIAL_BUILD="$(OFFICIAL_BUILD)" MSLU="$(MSLU)" WXUNIV="$(WXUNIV)" \
- RUNTIME_LIBS="$(RUNTIME_LIBS)" CXX="$(CXX)" CFG="$(CFG)" CFLAGS="$(CFLAGS)" \
- SHARED="$(SHARED)" USE_ODBC="$(USE_ODBC)" USE_OPENGL="$(USE_OPENGL)"
+MAKEARGS = CPPFLAGS=$(CPPFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) LDFLAGS=$(LDFLAGS) \
+ CC=$(CC) USE_GUI=$(USE_GUI) MONOLITHIC=$(MONOLITHIC) CXXFLAGS=$(CXXFLAGS) \
+ GCC_VERSION=$(GCC_VERSION) USE_HTML=$(USE_HTML) BUILD=$(BUILD) \
+ DEBUG_INFO=$(DEBUG_INFO) VENDOR=$(VENDOR) UNICODE=$(UNICODE) \
+ OFFICIAL_BUILD=$(OFFICIAL_BUILD) MSLU=$(MSLU) WXUNIV=$(WXUNIV) \
+ RUNTIME_LIBS=$(RUNTIME_LIBS) CXX=$(CXX) CFG=$(CFG) CFLAGS=$(CFLAGS) \
+ SHARED=$(SHARED) USE_ODBC=$(USE_ODBC) USE_OPENGL=$(USE_OPENGL)
MONODLL_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \
$(OBJS)\monolib_selstore.o \
$(OBJS)\monolib_spinctlg.o \
$(OBJS)\monolib_splitter.o \
- $(OBJS)\monolib_tbarsmpl.o \
$(OBJS)\monolib_textdlgg.o \
$(OBJS)\monolib_tipwin.o \
$(OBJS)\monolib_treectlg.o \
$(OBJS)\monolib_selstore.o \
$(OBJS)\monolib_spinctlg.o \
$(OBJS)\monolib_splitter.o \
- $(OBJS)\monolib_tbarsmpl.o \
$(OBJS)\monolib_textdlgg.o \
$(OBJS)\monolib_tipwin.o \
$(OBJS)\monolib_treectlg.o \
$(OBJS)\coredll_selstore.o \
$(OBJS)\coredll_spinctlg.o \
$(OBJS)\coredll_splitter.o \
- $(OBJS)\coredll_tbarsmpl.o \
$(OBJS)\coredll_textdlgg.o \
$(OBJS)\coredll_tipwin.o \
$(OBJS)\coredll_treectlg.o \
$(OBJS)\coredll_selstore.o \
$(OBJS)\coredll_spinctlg.o \
$(OBJS)\coredll_splitter.o \
- $(OBJS)\coredll_tbarsmpl.o \
$(OBJS)\coredll_textdlgg.o \
$(OBJS)\coredll_tipwin.o \
$(OBJS)\coredll_treectlg.o \
$(OBJS)\corelib_selstore.o \
$(OBJS)\corelib_spinctlg.o \
$(OBJS)\corelib_splitter.o \
- $(OBJS)\corelib_tbarsmpl.o \
$(OBJS)\corelib_textdlgg.o \
$(OBJS)\corelib_tipwin.o \
$(OBJS)\corelib_treectlg.o \
$(OBJS)\corelib_selstore.o \
$(OBJS)\corelib_spinctlg.o \
$(OBJS)\corelib_splitter.o \
- $(OBJS)\corelib_tbarsmpl.o \
$(OBJS)\corelib_textdlgg.o \
$(OBJS)\corelib_tipwin.o \
$(OBJS)\corelib_treectlg.o \
$(OBJS)\monodll_selstore.o \
$(OBJS)\monodll_spinctlg.o \
$(OBJS)\monodll_splitter.o \
- $(OBJS)\monodll_tbarsmpl.o \
$(OBJS)\monodll_textdlgg.o \
$(OBJS)\monodll_tipwin.o \
$(OBJS)\monodll_treectlg.o \
$(OBJS)\monodll_selstore.o \
$(OBJS)\monodll_spinctlg.o \
$(OBJS)\monodll_splitter.o \
- $(OBJS)\monodll_tbarsmpl.o \
$(OBJS)\monodll_textdlgg.o \
$(OBJS)\monodll_tipwin.o \
$(OBJS)\monodll_treectlg.o \
endif
ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),1)
-ifeq ($(USE_GUI),1)
ifeq ($(USE_ODBC),1)
__odbcdll___depname = \
$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_gcc$(VENDORTAG).dll
endif
endif
endif
-endif
ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),0)
-ifeq ($(USE_GUI),1)
ifeq ($(USE_ODBC),1)
__odbclib___depname = \
$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a
endif
endif
endif
-endif
ifeq ($(USE_GUI),1)
__wxjpeg___depname = $(LIBDIRNAME)\libwxjpeg$(WXDEBUGFLAG).a
endif
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
endif
-ifeq ($(USE_GUI),1)
-$(OBJS)\coredll_tbarsmpl.o: ..\..\src\generic\tbarsmpl.cpp
- $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
-endif
-
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_textcmn.o: ..\..\src\common\textcmn.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $<
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
endif
-ifeq ($(USE_GUI),1)
-$(OBJS)\corelib_tbarsmpl.o: ..\..\src\generic\tbarsmpl.cpp
- $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
-endif
-
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_textcmn.o: ..\..\src\common\textcmn.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $<
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
endif
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_tbarsmpl.o: ..\..\src\generic\tbarsmpl.cpp
- $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
-endif
-
$(OBJS)\monodll_textbuf.o: ..\..\src\common\textbuf.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $<
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
endif
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_tbarsmpl.o: ..\..\src\generic\tbarsmpl.cpp
- $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
-endif
-
$(OBJS)\monolib_textbuf.o: ..\..\src\common\textbuf.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $<
ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),1)
-ifeq ($(USE_GUI),1)
ifeq ($(USE_ODBC),1)
$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_gcc$(VENDORTAG).dll: $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXDEBUGFLAG).a $(__basedll___depname)
$(CXX) -shared -o $@ $(ODBCDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).a
endif
endif
endif
-endif
ifeq ($(MONOLITHIC),0)
ifeq ($(SHARED),0)
-ifeq ($(USE_GUI),1)
ifeq ($(USE_ODBC),1)
$(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.a: $(ODBCLIB_OBJECTS)
if exist $@ del $@
endif
endif
endif
-endif
samples:
$(MAKE) -C ..\..\samples -f makefile.gcc $(MAKEARGS) all
$(OBJS)\htmllib_m_tables.obj \
$(OBJS)\htmllib_winpars.obj \
$(OBJS)\htmllib_htmllbox.obj
-MAKEARGS = CPPFLAGS="$(CPPFLAGS)" DEBUG_FLAG="$(DEBUG_FLAG)" \
- LDFLAGS="$(LDFLAGS)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" CC="$(CC)" \
- USE_GUI="$(USE_GUI)" MONOLITHIC="$(MONOLITHIC)" CXXFLAGS="$(CXXFLAGS)" \
- USE_HTML="$(USE_HTML)" BUILD="$(BUILD)" DEBUG_INFO="$(DEBUG_INFO)" \
- VENDOR="$(VENDOR)" UNICODE="$(UNICODE)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
- MSLU="$(MSLU)" WXUNIV="$(WXUNIV)" RUNTIME_LIBS="$(RUNTIME_LIBS)" \
- CXX="$(CXX)" CFG="$(CFG)" CFLAGS="$(CFLAGS)" SHARED="$(SHARED)" \
- USE_ODBC="$(USE_ODBC)" USE_OPENGL="$(USE_OPENGL)"
MONODLL_CFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_51) /DWIN32 \
$(__DEBUGINFO_36) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).pdb \
$(OBJS)\monolib_selstore.obj \
$(OBJS)\monolib_spinctlg.obj \
$(OBJS)\monolib_splitter.obj \
- $(OBJS)\monolib_tbarsmpl.obj \
$(OBJS)\monolib_textdlgg.obj \
$(OBJS)\monolib_tipwin.obj \
$(OBJS)\monolib_treectlg.obj \
$(OBJS)\monolib_selstore.obj \
$(OBJS)\monolib_spinctlg.obj \
$(OBJS)\monolib_splitter.obj \
- $(OBJS)\monolib_tbarsmpl.obj \
$(OBJS)\monolib_textdlgg.obj \
$(OBJS)\monolib_tipwin.obj \
$(OBJS)\monolib_treectlg.obj \
$(OBJS)\coredll_selstore.obj \
$(OBJS)\coredll_spinctlg.obj \
$(OBJS)\coredll_splitter.obj \
- $(OBJS)\coredll_tbarsmpl.obj \
$(OBJS)\coredll_textdlgg.obj \
$(OBJS)\coredll_tipwin.obj \
$(OBJS)\coredll_treectlg.obj \
$(OBJS)\coredll_selstore.obj \
$(OBJS)\coredll_spinctlg.obj \
$(OBJS)\coredll_splitter.obj \
- $(OBJS)\coredll_tbarsmpl.obj \
$(OBJS)\coredll_textdlgg.obj \
$(OBJS)\coredll_tipwin.obj \
$(OBJS)\coredll_treectlg.obj \
$(OBJS)\corelib_selstore.obj \
$(OBJS)\corelib_spinctlg.obj \
$(OBJS)\corelib_splitter.obj \
- $(OBJS)\corelib_tbarsmpl.obj \
$(OBJS)\corelib_textdlgg.obj \
$(OBJS)\corelib_tipwin.obj \
$(OBJS)\corelib_treectlg.obj \
$(OBJS)\corelib_selstore.obj \
$(OBJS)\corelib_spinctlg.obj \
$(OBJS)\corelib_splitter.obj \
- $(OBJS)\corelib_tbarsmpl.obj \
$(OBJS)\corelib_textdlgg.obj \
$(OBJS)\corelib_tipwin.obj \
$(OBJS)\corelib_treectlg.obj \
$(OBJS)\monodll_selstore.obj \
$(OBJS)\monodll_spinctlg.obj \
$(OBJS)\monodll_splitter.obj \
- $(OBJS)\monodll_tbarsmpl.obj \
$(OBJS)\monodll_textdlgg.obj \
$(OBJS)\monodll_tipwin.obj \
$(OBJS)\monodll_treectlg.obj \
$(OBJS)\monodll_selstore.obj \
$(OBJS)\monodll_spinctlg.obj \
$(OBJS)\monodll_splitter.obj \
- $(OBJS)\monodll_tbarsmpl.obj \
$(OBJS)\monodll_textdlgg.obj \
$(OBJS)\monodll_tipwin.obj \
$(OBJS)\monodll_treectlg.obj \
__netlib___depname = \
$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib
!endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1"
__odbcdll___depname = \
$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).dll
!endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_ODBC)" == "1"
__odbclib___depname = \
$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib
!endif
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
!endif
-!if "$(USE_GUI)" == "1"
-$(OBJS)\coredll_tbarsmpl.obj: ..\..\src\generic\tbarsmpl.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
-!endif
-
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_textcmn.obj: ..\..\src\common\textcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
!endif
-!if "$(USE_GUI)" == "1"
-$(OBJS)\corelib_tbarsmpl.obj: ..\..\src\generic\tbarsmpl.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
-!endif
-
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_textcmn.obj: ..\..\src\common\textcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_tbarsmpl.obj: ..\..\src\generic\tbarsmpl.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
-!endif
-
$(OBJS)\monodll_textbuf.obj: ..\..\src\common\textbuf.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_tbarsmpl.obj: ..\..\src\generic\tbarsmpl.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
-!endif
-
$(OBJS)\monolib_textbuf.obj: ..\..\src\common\textbuf.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
<<
!endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_ODBC)" == "1"
$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).dll: $(OBJS)\odbcdll_dummy.obj $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_34) /LIBPATH:$(LIBDIRNAME) @<<
$(ODBCDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib
<<
!endif
-!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_ODBC)" == "1"
+!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_ODBC)" == "1"
$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib: $(OBJS)\odbclib_dummy.obj $(ODBCLIB_OBJECTS)
if exist $@ del $@
lib /NOLOGO /OUT:$@ @<<
sub_samples:
cd ..\..\samples
- $(MAKE) -f makefile.vc $(MAKEARGS) all
+ $(MAKE) /$(MAKEFLAGS) -f makefile.vc all
cd $(MAKEDIR)
$(SETUPHDIR)\wx\setup.h:
$(OBJS)\monolib_selstore.obj &
$(OBJS)\monolib_spinctlg.obj &
$(OBJS)\monolib_splitter.obj &
- $(OBJS)\monolib_tbarsmpl.obj &
$(OBJS)\monolib_textdlgg.obj &
$(OBJS)\monolib_tipwin.obj &
$(OBJS)\monolib_treectlg.obj &
$(OBJS)\monolib_selstore.obj &
$(OBJS)\monolib_spinctlg.obj &
$(OBJS)\monolib_splitter.obj &
- $(OBJS)\monolib_tbarsmpl.obj &
$(OBJS)\monolib_textdlgg.obj &
$(OBJS)\monolib_tipwin.obj &
$(OBJS)\monolib_treectlg.obj &
$(OBJS)\coredll_selstore.obj &
$(OBJS)\coredll_spinctlg.obj &
$(OBJS)\coredll_splitter.obj &
- $(OBJS)\coredll_tbarsmpl.obj &
$(OBJS)\coredll_textdlgg.obj &
$(OBJS)\coredll_tipwin.obj &
$(OBJS)\coredll_treectlg.obj &
$(OBJS)\coredll_selstore.obj &
$(OBJS)\coredll_spinctlg.obj &
$(OBJS)\coredll_splitter.obj &
- $(OBJS)\coredll_tbarsmpl.obj &
$(OBJS)\coredll_textdlgg.obj &
$(OBJS)\coredll_tipwin.obj &
$(OBJS)\coredll_treectlg.obj &
$(OBJS)\corelib_selstore.obj &
$(OBJS)\corelib_spinctlg.obj &
$(OBJS)\corelib_splitter.obj &
- $(OBJS)\corelib_tbarsmpl.obj &
$(OBJS)\corelib_textdlgg.obj &
$(OBJS)\corelib_tipwin.obj &
$(OBJS)\corelib_treectlg.obj &
$(OBJS)\corelib_selstore.obj &
$(OBJS)\corelib_spinctlg.obj &
$(OBJS)\corelib_splitter.obj &
- $(OBJS)\corelib_tbarsmpl.obj &
$(OBJS)\corelib_textdlgg.obj &
$(OBJS)\corelib_tipwin.obj &
$(OBJS)\corelib_treectlg.obj &
$(OBJS)\monodll_selstore.obj &
$(OBJS)\monodll_spinctlg.obj &
$(OBJS)\monodll_splitter.obj &
- $(OBJS)\monodll_tbarsmpl.obj &
$(OBJS)\monodll_textdlgg.obj &
$(OBJS)\monodll_tipwin.obj &
$(OBJS)\monodll_treectlg.obj &
$(OBJS)\monodll_selstore.obj &
$(OBJS)\monodll_spinctlg.obj &
$(OBJS)\monodll_splitter.obj &
- $(OBJS)\monodll_tbarsmpl.obj &
$(OBJS)\monodll_textdlgg.obj &
$(OBJS)\monodll_tipwin.obj &
$(OBJS)\monodll_treectlg.obj &
__odbcdll___depname =
!ifeq MONOLITHIC 0
!ifeq SHARED 1
-!ifeq USE_GUI 1
!ifeq USE_ODBC 1
__odbcdll___depname = &
$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll
!endif
!endif
!endif
-!endif
__odbclib___depname =
!ifeq MONOLITHIC 0
!ifeq SHARED 0
-!ifeq USE_GUI 1
!ifeq USE_ODBC 1
__odbclib___depname = &
$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib
!endif
!endif
!endif
-!endif
__wxjpeg___depname =
!ifeq USE_GUI 1
__wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib
$(OBJS)\htmllib_m_tables.obj &
$(OBJS)\htmllib_winpars.obj &
$(OBJS)\htmllib_htmllbox.obj
-MAKEARGS = CPPFLAGS="$(CPPFLAGS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" &
- WXUNIV="$(WXUNIV)" DEBUG_FLAG="$(DEBUG_FLAG)" CFLAGS="$(CFLAGS)" &
- RUNTIME_LIBS="$(RUNTIME_LIBS)" CXX="$(CXX)" CFG="$(CFG)" &
- USE_GUI="$(USE_GUI)" MONOLITHIC="$(MONOLITHIC)" CXXFLAGS="$(CXXFLAGS)" &
- CC="$(CC)" USE_HTML="$(USE_HTML)" BUILD="$(BUILD)" LDFLAGS="$(LDFLAGS)" &
- DEBUG_INFO="$(DEBUG_INFO)" SHARED="$(SHARED)" VENDOR="$(VENDOR)" &
- USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" UNICODE="$(UNICODE)"
+MAKEARGS = CPPFLAGS=$(CPPFLAGS) OFFICIAL_BUILD=$(OFFICIAL_BUILD) &
+ WXUNIV=$(WXUNIV) DEBUG_FLAG=$(DEBUG_FLAG) CFLAGS=$(CFLAGS) &
+ RUNTIME_LIBS=$(RUNTIME_LIBS) CXX=$(CXX) CFG=$(CFG) USE_GUI=$(USE_GUI) &
+ MONOLITHIC=$(MONOLITHIC) CXXFLAGS=$(CXXFLAGS) CC=$(CC) USE_HTML=$(USE_HTML) &
+ BUILD=$(BUILD) LDFLAGS=$(LDFLAGS) DEBUG_INFO=$(DEBUG_INFO) SHARED=$(SHARED) &
+ VENDOR=$(VENDOR) USE_OPENGL=$(USE_OPENGL) USE_ODBC=$(USE_ODBC) &
+ UNICODE=$(UNICODE)
MONODLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__UNICODE_DEFINE_p) -i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff &
$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
-!ifeq USE_GUI 1
-$(OBJS)\coredll_tbarsmpl.obj : .AUTODEPEND ..\..\src\generic\tbarsmpl.cpp
- $(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
-!endif
-
!ifeq USE_GUI 1
$(OBJS)\coredll_textcmn.obj : .AUTODEPEND ..\..\src\common\textcmn.cpp
$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
-!ifeq USE_GUI 1
-$(OBJS)\corelib_tbarsmpl.obj : .AUTODEPEND ..\..\src\generic\tbarsmpl.cpp
- $(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
-!endif
-
!ifeq USE_GUI 1
$(OBJS)\corelib_textcmn.obj : .AUTODEPEND ..\..\src\common\textcmn.cpp
$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
-!ifeq USE_GUI 1
-$(OBJS)\monodll_tbarsmpl.obj : .AUTODEPEND ..\..\src\generic\tbarsmpl.cpp
- $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
$(OBJS)\monodll_textbuf.obj : .AUTODEPEND ..\..\src\common\textbuf.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
-!ifeq USE_GUI 1
-$(OBJS)\monolib_tbarsmpl.obj : .AUTODEPEND ..\..\src\generic\tbarsmpl.cpp
- $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
$(OBJS)\monolib_textbuf.obj : .AUTODEPEND ..\..\src\common\textbuf.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@%create $(OBJS)\advdll.lbc
@%append $(OBJS)\advdll.lbc option quiet
@%append $(OBJS)\advdll.lbc name $^@
- @%append $(OBJS)\advdll.lbc option caseexact
+ @%append $(OBJS)\advdll.lbc option incremental
@%append $(OBJS)\advdll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME)
@for %i in ($(ADVDLL_OBJECTS)) do @%append $(OBJS)\advdll.lbc file %i
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\advdll.lbc library %i
@%create $(OBJS)\basedll.lbc
@%append $(OBJS)\basedll.lbc option quiet
@%append $(OBJS)\basedll.lbc name $^@
- @%append $(OBJS)\basedll.lbc option caseexact
+ @%append $(OBJS)\basedll.lbc option incremental
@%append $(OBJS)\basedll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME)
@for %i in ($(BASEDLL_OBJECTS)) do @%append $(OBJS)\basedll.lbc file %i
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib) do @%append $(OBJS)\basedll.lbc library %i
@%create $(OBJS)\coredll.lbc
@%append $(OBJS)\coredll.lbc option quiet
@%append $(OBJS)\coredll.lbc name $^@
- @%append $(OBJS)\coredll.lbc option caseexact
+ @%append $(OBJS)\coredll.lbc option incremental
@%append $(OBJS)\coredll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME)
@for %i in ($(COREDLL_OBJECTS)) do @%append $(OBJS)\coredll.lbc file %i
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\coredll.lbc library %i
@%create $(OBJS)\dbgriddll.lbc
@%append $(OBJS)\dbgriddll.lbc option quiet
@%append $(OBJS)\dbgriddll.lbc name $^@
- @%append $(OBJS)\dbgriddll.lbc option caseexact
+ @%append $(OBJS)\dbgriddll.lbc option incremental
@%append $(OBJS)\dbgriddll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME)
@for %i in ($(DBGRIDDLL_OBJECTS)) do @%append $(OBJS)\dbgriddll.lbc file %i
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\dbgriddll.lbc library %i
@%create $(OBJS)\gldll.lbc
@%append $(OBJS)\gldll.lbc option quiet
@%append $(OBJS)\gldll.lbc name $^@
- @%append $(OBJS)\gldll.lbc option caseexact
+ @%append $(OBJS)\gldll.lbc option incremental
@%append $(OBJS)\gldll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME)
@for %i in ($(GLDLL_OBJECTS)) do @%append $(OBJS)\gldll.lbc file %i
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib) do @%append $(OBJS)\gldll.lbc library %i
@%create $(OBJS)\htmldll.lbc
@%append $(OBJS)\htmldll.lbc option quiet
@%append $(OBJS)\htmldll.lbc name $^@
- @%append $(OBJS)\htmldll.lbc option caseexact
+ @%append $(OBJS)\htmldll.lbc option incremental
@%append $(OBJS)\htmldll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME)
@for %i in ($(HTMLDLL_OBJECTS)) do @%append $(OBJS)\htmldll.lbc file %i
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\htmldll.lbc library %i
@%create $(OBJS)\monodll.lbc
@%append $(OBJS)\monodll.lbc option quiet
@%append $(OBJS)\monodll.lbc name $^@
- @%append $(OBJS)\monodll.lbc option caseexact
+ @%append $(OBJS)\monodll.lbc option incremental
@%append $(OBJS)\monodll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME)
@for %i in ($(MONODLL_OBJECTS)) do @%append $(OBJS)\monodll.lbc file %i
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\monodll.lbc library %i
@%create $(OBJS)\netdll.lbc
@%append $(OBJS)\netdll.lbc option quiet
@%append $(OBJS)\netdll.lbc name $^@
- @%append $(OBJS)\netdll.lbc option caseexact
+ @%append $(OBJS)\netdll.lbc option incremental
@%append $(OBJS)\netdll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME)
@for %i in ($(NETDLL_OBJECTS)) do @%append $(OBJS)\netdll.lbc file %i
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\netdll.lbc library %i
!ifeq MONOLITHIC 0
!ifeq SHARED 1
-!ifeq USE_GUI 1
!ifeq USE_ODBC 1
$(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_wat$(VENDORTAG).dll : $(ODBCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__basedll___depname)
@%create $(OBJS)\odbcdll.lbc
@%append $(OBJS)\odbcdll.lbc option quiet
@%append $(OBJS)\odbcdll.lbc name $^@
- @%append $(OBJS)\odbcdll.lbc option caseexact
+ @%append $(OBJS)\odbcdll.lbc option incremental
@%append $(OBJS)\odbcdll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME)
@for %i in ($(ODBCDLL_OBJECTS)) do @%append $(OBJS)\odbcdll.lbc file %i
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib ) do @%append $(OBJS)\odbcdll.lbc library %i
!endif
!endif
!endif
-!endif
!ifeq MONOLITHIC 0
!ifeq SHARED 0
-!ifeq USE_GUI 1
!ifeq USE_ODBC 1
$(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc.lib : $(ODBCLIB_OBJECTS)
@%create $(OBJS)\odbclib.lbc
!endif
!endif
!endif
-!endif
samples : .SYMBOLIC
cd ..\..\samples
@%create $(OBJS)\xmldll.lbc
@%append $(OBJS)\xmldll.lbc option quiet
@%append $(OBJS)\xmldll.lbc name $^@
- @%append $(OBJS)\xmldll.lbc option caseexact
+ @%append $(OBJS)\xmldll.lbc option incremental
@%append $(OBJS)\xmldll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME)
@for %i in ($(XMLDLL_OBJECTS)) do @%append $(OBJS)\xmldll.lbc file %i
@for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib ) do @%append $(OBJS)\xmldll.lbc library %i
# End Source File
# Begin Source File
-SOURCE=..\..\src\generic\tbarsmpl.cpp
-# End Source File
-# Begin Source File
-
SOURCE=..\..\src\generic\textdlgg.cpp
# End Source File
# Begin Source File
# End Source File
# Begin Source File
-SOURCE=..\..\include\wx\tbarsmpl.h
-# End Source File
-# Begin Source File
-
SOURCE=..\..\include\wx\textctrl.h
# End Source File
# Begin Source File
propform.cpp
proplist.cpp
resource.cpp
+ tbarsmpl.cpp
treelay.cpp
wxexpr.cpp
wx/deprecated/proplist.h
wx/deprecated/resource.h
wx/deprecated/setup.h
+ wx/deprecated/tbarsmpl.h
wx/deprecated/treelay.h
wx/deprecated/wxexpr.h
</files>
<dll id="deprecateddll" template="wx_contrib_dll" cond="SHARED=='1'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_DEPRECATED</define>
- <include>$(SRCDIR)</include>
<sources>$(DEPRECATED_SRC)</sources>
<wx-lib>core</wx-lib>
<wx-lib>base</wx-lib>
</dll>
<lib id="deprecatedlib" template="wx_contrib_lib" cond="SHARED=='0'">
- <include>$(SRCDIR)</include>
<sources>$(DEPRECATED_SRC)</sources>
</lib>
# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswd\deprecated"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25d_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25d_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25d_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswd" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25d_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswd\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_msw\deprecated"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\msw" /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\msw" /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\msw" /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\msw" /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_msw\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswud\deprecated"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25ud_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25ud_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25ud_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswud" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25ud_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswu\deprecated"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswu" /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25u_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswu" /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25u_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswu" /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25u_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswu" /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmsw25u_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivd\deprecated"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25d_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25d_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25d_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswunivd" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25d_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivd\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswuniv\deprecated"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswuniv" /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswuniv" /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswuniv" /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswuniv" /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswuniv\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivud\deprecated"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25ud_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25ud_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25ud_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswunivud" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25ud_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivud\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_lib"
# PROP Intermediate_Dir "vc_mswunivu\deprecated"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswunivu" /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25u_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswunivu" /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25u_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswunivu" /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25u_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_lib\mswunivu" /Fd..\..\src\deprecated\..\..\..\lib\vc_lib\wxmswuniv25u_deprecated.pdb /Yu"wx/wxprec.h" /Fp"vc_mswunivu\wxprec_deprecatedlib.pch" /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /c
# ADD BASE RSC /l 0x405
# ADD RSC /l 0x405
BSC32=bscmake.exe
# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswddll\deprecated"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswd" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw250d_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswd" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw250d_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswd" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw250d_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswd" /Yu"wx/wxprec.h" /Fp"vc_mswddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw250d_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswd" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswd" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswd" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_DEPRECATED
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswd" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_DEPRECATED
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswdll\deprecated"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\msw" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw250_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\msw" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw250_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\msw" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw250_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\msw" /Yu"wx/wxprec.h" /Fp"vc_mswdll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw250_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\msw" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
-# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\msw" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\msw" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_DEPRECATED
+# ADD RSC /l 0x405 /d "__WXMSW__" /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\msw" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_DEPRECATED
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswuddll\deprecated"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswud" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw250ud_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswud" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw250ud_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswud" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw250ud_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswud" /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw250ud_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswud" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswud" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswud" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_DEPRECATED
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswud" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_DEPRECATED
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswudll\deprecated"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswu" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw250u_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswu" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw250u_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswu" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw250u_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswu" /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmsw250u_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswu" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
-# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswu" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswu" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_DEPRECATED
+# ADD RSC /l 0x405 /d "__WXMSW__" /d wxUSE_UNICODE=1 /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswu" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_DEPRECATED
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivddll\deprecated"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivd" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv250d_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivd" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv250d_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivd" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv250d_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivd" /Yu"wx/wxprec.h" /Fp"vc_mswunivddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv250d_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_DEPRECATED
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivd" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_DEPRECATED
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivdll\deprecated"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswuniv" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv250_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswuniv" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv250_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswuniv" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv250_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswuniv" /Yu"wx/wxprec.h" /Fp"vc_mswunivdll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv250_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_DEPRECATED
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswuniv" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_DEPRECATED
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivuddll\deprecated"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivud" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv250ud_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
-# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivud" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv250ud_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
+# ADD BASE CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivud" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv250ud_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
+# ADD CPP /nologo /FD /W4 /MDd /Od /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivud" /Yu"wx/wxprec.h" /Fp"vc_mswunivuddll\wxprec_deprecateddll.pch" /Zi /Gm /GZ /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv250ud_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
-# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
+# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_DEPRECATED
+# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d wxUSE_UNICODE=1 /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivud" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_DEPRECATED
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
# PROP Output_Dir "..\..\src\deprecated\..\..\..\lib\vc_dll"
# PROP Intermediate_Dir "vc_mswunivudll\deprecated"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivu" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv250u_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
-# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivu" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv250u_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /I "..\..\src\deprecated" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
+# ADD BASE CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivu" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv250u_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
+# ADD CPP /nologo /FD /W4 /MD /O1 /I "..\..\src\deprecated\..\..\..\include" /I "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivu" /Yu"wx/wxprec.h" /Fp"vc_mswunivudll\wxprec_deprecateddll.pch" /Fd..\..\src\deprecated\..\..\..\lib\vc_dll\wxmswuniv250u_deprecated_vc_custom.pdb /I "..\..\src\deprecated\..\..\include" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /c
# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D wxUSE_UNICODE=1 /D "WXUSINGDLL" /D "WXMAKINGDLL_DEPRECATED" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
-# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d "WXMAKINGDLL_DEPRECATED" /i ..\..\src\deprecated
+# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_DEPRECATED
+# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d wxUSE_UNICODE=1 /i "..\..\src\deprecated\..\..\..\include" /i "..\..\src\deprecated\..\..\..\lib\vc_dll\mswunivu" /i "..\..\src\deprecated\..\..\include" /d "WXUSINGDLL" /d WXMAKINGDLL_DEPRECATED
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
# End Source File
# Begin Source File
+SOURCE=../../src/deprecated\tbarsmpl.cpp
+# End Source File
+# Begin Source File
+
SOURCE=../../src/deprecated\treelay.cpp
# End Source File
# Begin Source File
$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \
-I$(SETUPHDIR) -I..\..\src\deprecated\..\..\include -DWXUSINGDLL \
- -DWXMAKINGDLL_DEPRECATED -I..\..\src\deprecated $(CFLAGS)
+ -DWXMAKINGDLL_DEPRECATED $(CFLAGS)
DEPRECATEDDLL_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \
-I$(SETUPHDIR) -I..\..\src\deprecated\..\..\include -DWXUSINGDLL \
- -DWXMAKINGDLL_DEPRECATED -I..\..\src\deprecated $(CXXFLAGS) -Hu \
+ -DWXMAKINGDLL_DEPRECATED $(CXXFLAGS) -Hu \
-H=$(OBJS)\wxprec_deprecateddll.csm
DEPRECATEDDLL_OBJECTS = \
$(OBJS)\deprecateddll_dummy.obj \
$(OBJS)\deprecateddll_propform.obj \
$(OBJS)\deprecateddll_proplist.obj \
$(OBJS)\deprecateddll_resource.obj \
+ $(OBJS)\deprecateddll_tbarsmpl.obj \
$(OBJS)\deprecateddll_treelay.obj \
$(OBJS)\deprecateddll_wxexpr.obj \
$(OBJS)\deprecateddll_dosyacc.obj
DEPRECATEDLIB_CFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \
- -I$(SETUPHDIR) -I..\..\src\deprecated\..\..\include -I..\..\src\deprecated \
- $(CFLAGS)
+ -I$(SETUPHDIR) -I..\..\src\deprecated\..\..\include $(CFLAGS)
DEPRECATEDLIB_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS) $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \
- -I$(SETUPHDIR) -I..\..\src\deprecated\..\..\include -I..\..\src\deprecated \
- $(CXXFLAGS) -Hu -H=$(OBJS)\wxprec_deprecatedlib.csm
+ -I$(SETUPHDIR) -I..\..\src\deprecated\..\..\include $(CXXFLAGS) -Hu \
+ -H=$(OBJS)\wxprec_deprecatedlib.csm
DEPRECATEDLIB_OBJECTS = \
$(OBJS)\deprecatedlib_dummy.obj \
$(OBJS)\deprecatedlib_prop.obj \
$(OBJS)\deprecatedlib_propform.obj \
$(OBJS)\deprecatedlib_proplist.obj \
$(OBJS)\deprecatedlib_resource.obj \
+ $(OBJS)\deprecatedlib_tbarsmpl.obj \
$(OBJS)\deprecatedlib_treelay.obj \
$(OBJS)\deprecatedlib_wxexpr.obj \
$(OBJS)\deprecatedlib_dosyacc.obj
$(OBJS)\deprecateddll_resource.obj: ../../src/deprecated\resource.cpp
$(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) $**
+$(OBJS)\deprecateddll_tbarsmpl.obj: ../../src/deprecated\tbarsmpl.cpp
+ $(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) $**
+
$(OBJS)\deprecateddll_treelay.obj: ../../src/deprecated\treelay.cpp
$(CXX) -q -c -P -o$@ $(DEPRECATEDDLL_CXXFLAGS) $**
$(OBJS)\deprecatedlib_resource.obj: ../../src/deprecated\resource.cpp
$(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) $**
+$(OBJS)\deprecatedlib_tbarsmpl.obj: ../../src/deprecated\tbarsmpl.cpp
+ $(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) $**
+
$(OBJS)\deprecatedlib_treelay.obj: ../../src/deprecated\treelay.cpp
$(CXX) -q -c -P -o$@ $(DEPRECATEDLIB_CXXFLAGS) $**
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \
-I$(SETUPHDIR) -I..\..\src\deprecated\..\..\include -DWXUSINGDLL \
- -DWXMAKINGDLL_DEPRECATED -I..\..\src\deprecated $(CFLAGS)
+ -DWXMAKINGDLL_DEPRECATED $(CFLAGS)
DEPRECATEDDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-I..\..\src\deprecated\..\..\..\include -I$(SETUPHDIR) \
-I..\..\src\deprecated\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_DEPRECATED \
- -I..\..\src\deprecated $(CXXFLAGS)
+ $(CXXFLAGS)
DEPRECATEDDLL_OBJECTS = \
$(OBJS)\deprecateddll_dummy.o \
$(OBJS)\deprecateddll_prop.o \
$(OBJS)\deprecateddll_propform.o \
$(OBJS)\deprecateddll_proplist.o \
$(OBJS)\deprecateddll_resource.o \
+ $(OBJS)\deprecateddll_tbarsmpl.o \
$(OBJS)\deprecateddll_treelay.o \
$(OBJS)\deprecateddll_wxexpr.o \
$(OBJS)\deprecateddll_dosyacc.o
DEPRECATEDLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__UNICODE_DEFINE_p) -I..\..\src\deprecated\..\..\..\include \
- -I$(SETUPHDIR) -I..\..\src\deprecated\..\..\include -I..\..\src\deprecated \
- $(CFLAGS)
+ -I$(SETUPHDIR) -I..\..\src\deprecated\..\..\include $(CFLAGS)
DEPRECATEDLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
-I..\..\src\deprecated\..\..\..\include -I$(SETUPHDIR) \
- -I..\..\src\deprecated\..\..\include -I..\..\src\deprecated $(CXXFLAGS)
+ -I..\..\src\deprecated\..\..\include $(CXXFLAGS)
DEPRECATEDLIB_OBJECTS = \
$(OBJS)\deprecatedlib_dummy.o \
$(OBJS)\deprecatedlib_prop.o \
$(OBJS)\deprecatedlib_propform.o \
$(OBJS)\deprecatedlib_proplist.o \
$(OBJS)\deprecatedlib_resource.o \
+ $(OBJS)\deprecatedlib_tbarsmpl.o \
$(OBJS)\deprecatedlib_treelay.o \
$(OBJS)\deprecatedlib_wxexpr.o \
$(OBJS)\deprecatedlib_dosyacc.o
$(OBJS)\deprecateddll_resource.o: ../../src/deprecated\resource.cpp
$(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $<
+$(OBJS)\deprecateddll_tbarsmpl.o: ../../src/deprecated\tbarsmpl.cpp
+ $(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $<
+
$(OBJS)\deprecateddll_treelay.o: ../../src/deprecated\treelay.cpp
$(CXX) -c -o $@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(OBJS)\deprecatedlib_resource.o: ../../src/deprecated\resource.cpp
$(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $<
+$(OBJS)\deprecatedlib_tbarsmpl.o: ../../src/deprecated\tbarsmpl.cpp
+ $(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $<
+
$(OBJS)\deprecatedlib_treelay.o: ../../src/deprecated\treelay.cpp
$(CXX) -c -o $@ $(DEPRECATEDLIB_CXXFLAGS) $<
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
/I..\..\src\deprecated\..\..\..\include /I$(SETUPHDIR) \
/I..\..\src\deprecated\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_DEPRECATED \
- /I..\..\src\deprecated $(CFLAGS)
+ $(CFLAGS)
DEPRECATEDDLL_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) \
/DWIN32 $(__DEBUGINFO_2) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_vc$(VENDORTAG).pdb \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
/I..\..\src\deprecated\..\..\..\include /I$(SETUPHDIR) \
/I..\..\src\deprecated\..\..\include /DWXUSINGDLL /DWXMAKINGDLL_DEPRECATED \
- /I..\..\src\deprecated $(CXXFLAGS) /Yu"wx/wxprec.h" \
- /Fp"$(OBJS)\wxprec_deprecateddll.pch"
+ $(CXXFLAGS) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_deprecateddll.pch"
DEPRECATEDDLL_OBJECTS = \
$(OBJS)\deprecateddll_dummy.obj \
$(OBJS)\deprecateddll_prop.obj \
$(OBJS)\deprecateddll_propform.obj \
$(OBJS)\deprecateddll_proplist.obj \
$(OBJS)\deprecateddll_resource.obj \
+ $(OBJS)\deprecateddll_tbarsmpl.obj \
$(OBJS)\deprecateddll_treelay.obj \
$(OBJS)\deprecateddll_wxexpr.obj \
$(OBJS)\deprecateddll_dosyacc.obj
$(____DEBUGRUNTIME_11_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
/I..\..\src\deprecated\..\..\..\include /I$(SETUPHDIR) \
- /I..\..\src\deprecated\..\..\include /I..\..\src\deprecated $(CFLAGS)
+ /I..\..\src\deprecated\..\..\include $(CFLAGS)
DEPRECATEDLIB_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_12) \
/DWIN32 $(__DEBUGINFO_2) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.pdb \
$(____DEBUGRUNTIME_11_p) $(__OPTIMIZEFLAG) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
/I..\..\src\deprecated\..\..\..\include /I$(SETUPHDIR) \
- /I..\..\src\deprecated\..\..\include /I..\..\src\deprecated $(CXXFLAGS) \
- /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_deprecatedlib.pch"
+ /I..\..\src\deprecated\..\..\include $(CXXFLAGS) /Yu"wx/wxprec.h" \
+ /Fp"$(OBJS)\wxprec_deprecatedlib.pch"
DEPRECATEDLIB_OBJECTS = \
$(OBJS)\deprecatedlib_dummy.obj \
$(OBJS)\deprecatedlib_prop.obj \
$(OBJS)\deprecatedlib_propform.obj \
$(OBJS)\deprecatedlib_proplist.obj \
$(OBJS)\deprecatedlib_resource.obj \
+ $(OBJS)\deprecatedlib_tbarsmpl.obj \
$(OBJS)\deprecatedlib_treelay.obj \
$(OBJS)\deprecatedlib_wxexpr.obj \
$(OBJS)\deprecatedlib_dosyacc.obj
$(OBJS)\deprecateddll_resource.obj: ../../src/deprecated\resource.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) $**
+$(OBJS)\deprecateddll_tbarsmpl.obj: ../../src/deprecated\tbarsmpl.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) $**
+
$(OBJS)\deprecateddll_treelay.obj: ../../src/deprecated\treelay.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDDLL_CXXFLAGS) $**
$(OBJS)\deprecatedlib_resource.obj: ../../src/deprecated\resource.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) $**
+$(OBJS)\deprecatedlib_tbarsmpl.obj: ../../src/deprecated\tbarsmpl.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) $**
+
$(OBJS)\deprecatedlib_treelay.obj: ../../src/deprecated\treelay.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DEPRECATEDLIB_CXXFLAGS) $**
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__UNICODE_DEFINE_p) -i=..\..\src\deprecated\..\..\..\include &
-i=$(SETUPHDIR) -i=..\..\src\deprecated\..\..\include -dWXUSINGDLL &
- -dWXMAKINGDLL_DEPRECATED -i=..\..\src\deprecated $(CFLAGS)
+ -dWXMAKINGDLL_DEPRECATED $(CFLAGS)
DEPRECATEDDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__UNICODE_DEFINE_p) -i=..\..\src\deprecated\..\..\..\include &
-i=$(SETUPHDIR) -i=..\..\src\deprecated\..\..\include -dWXUSINGDLL &
- -dWXMAKINGDLL_DEPRECATED -i=..\..\src\deprecated $(CXXFLAGS) &
- /fh=$(OBJS)\wxprec_deprecateddll.pch
+ -dWXMAKINGDLL_DEPRECATED $(CXXFLAGS) /fh=$(OBJS)\wxprec_deprecateddll.pch
DEPRECATEDDLL_OBJECTS = &
$(OBJS)\deprecateddll_dummy.obj &
$(OBJS)\deprecateddll_prop.obj &
$(OBJS)\deprecateddll_propform.obj &
$(OBJS)\deprecateddll_proplist.obj &
$(OBJS)\deprecateddll_resource.obj &
+ $(OBJS)\deprecateddll_tbarsmpl.obj &
$(OBJS)\deprecateddll_treelay.obj &
$(OBJS)\deprecateddll_wxexpr.obj &
$(OBJS)\deprecateddll_dosyacc.obj
DEPRECATEDLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__UNICODE_DEFINE_p) -i=..\..\src\deprecated\..\..\..\include &
- -i=$(SETUPHDIR) -i=..\..\src\deprecated\..\..\include &
- -i=..\..\src\deprecated $(CFLAGS)
+ -i=$(SETUPHDIR) -i=..\..\src\deprecated\..\..\include $(CFLAGS)
DEPRECATEDLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__UNICODE_DEFINE_p) -i=..\..\src\deprecated\..\..\..\include &
- -i=$(SETUPHDIR) -i=..\..\src\deprecated\..\..\include &
- -i=..\..\src\deprecated $(CXXFLAGS) /fh=$(OBJS)\wxprec_deprecatedlib.pch
+ -i=$(SETUPHDIR) -i=..\..\src\deprecated\..\..\include $(CXXFLAGS) &
+ /fh=$(OBJS)\wxprec_deprecatedlib.pch
DEPRECATEDLIB_OBJECTS = &
$(OBJS)\deprecatedlib_dummy.obj &
$(OBJS)\deprecatedlib_prop.obj &
$(OBJS)\deprecatedlib_propform.obj &
$(OBJS)\deprecatedlib_proplist.obj &
$(OBJS)\deprecatedlib_resource.obj &
+ $(OBJS)\deprecatedlib_tbarsmpl.obj &
$(OBJS)\deprecatedlib_treelay.obj &
$(OBJS)\deprecatedlib_wxexpr.obj &
$(OBJS)\deprecatedlib_dosyacc.obj
$(OBJS)\deprecateddll_resource.obj : .AUTODEPEND ../../src/deprecated\resource.cpp
$(CXX) -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
+$(OBJS)\deprecateddll_tbarsmpl.obj : .AUTODEPEND ../../src/deprecated\tbarsmpl.cpp
+ $(CXX) -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
+
$(OBJS)\deprecateddll_treelay.obj : .AUTODEPEND ../../src/deprecated\treelay.cpp
$(CXX) -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
$(OBJS)\deprecatedlib_resource.obj : .AUTODEPEND ../../src/deprecated\resource.cpp
$(CXX) -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
+$(OBJS)\deprecatedlib_tbarsmpl.obj : .AUTODEPEND ../../src/deprecated\tbarsmpl.cpp
+ $(CXX) -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
+
$(OBJS)\deprecatedlib_treelay.obj : .AUTODEPEND ../../src/deprecated\treelay.cpp
$(CXX) -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
@%create $(OBJS)\deprecateddll.lbc
@%append $(OBJS)\deprecateddll.lbc option quiet
@%append $(OBJS)\deprecateddll.lbc name $^@
- @%append $(OBJS)\deprecateddll.lbc option caseexact
+ @%append $(OBJS)\deprecateddll.lbc option incremental
@%append $(OBJS)\deprecateddll.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME)
@for %i in ($(DEPRECATEDDLL_OBJECTS)) do @%append $(OBJS)\deprecateddll.lbc file %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\deprecateddll.lbc library %i
#endif
#define wxUSE_WX_RESOURCES 1
-
-
+// Use simple, generic toolbar
+#ifdef wxUSE_TOOLBAR_SIMPLE
+#undef wxUSE_TOOLBAR_SIMPLE
+#endif
+#define wxUSE_TOOLBAR_SIMPLE 1
#ifdef WXMAKINGDLL_DEPRECATED
--- /dev/null
+/////////////////////////////////////////////////////////////////////////////
+// Name: wx/deprecated/tbarsmpl.h
+// Purpose: wxToolBarSimple class
+// Author: Julian Smart
+// Modified by: VZ on 14.12.99 during wxToolBar classes reorganization
+// Created: 01/02/97
+// RCS-ID: $Id$
+// Copyright: (c) Julian Smart
+// Licence: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_TBARSMPLH__
+#define _WX_TBARSMPLH__
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+ #pragma interface "tbarsmpl.h"
+#endif
+
+#include "wx/tbarbase.h"
+
+#include "wx/deprecated/setup.h"
+
+#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_SIMPLE
+
+class WXDLLEXPORT wxMemoryDC;
+
+// ----------------------------------------------------------------------------
+// wxToolBarSimple is a generic toolbar implementation in pure wxWindows
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_DEPRECATED wxToolBarSimple : public wxToolBarBase
+{
+public:
+ // ctors and dtor
+ wxToolBarSimple() { Init(); }
+
+ wxToolBarSimple(wxWindow *parent,
+ wxWindowID winid,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = wxNO_BORDER | wxTB_HORIZONTAL,
+ const wxString& name = wxToolBarNameStr)
+ {
+ Init();
+
+ Create(parent, winid, pos, size, style, name);
+ }
+
+ bool Create(wxWindow *parent,
+ wxWindowID winid,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = wxNO_BORDER | wxTB_HORIZONTAL,
+ const wxString& name = wxToolBarNameStr);
+
+ virtual ~wxToolBarSimple();
+
+ // override/implement base class virtuals
+ virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
+
+ virtual bool Realize();
+
+ virtual void SetRows(int nRows);
+
+ // implementation from now on
+ // --------------------------
+
+ // SCROLLING: this has to be copied from wxScrolledWindow since
+ // wxToolBarBase inherits from wxControl. This could have been put into
+ // wxToolBarSimple, but we might want any derived toolbar class to be
+ // scrollable.
+
+ // Number of pixels per user unit (0 or -1 for no scrollbar)
+ // Length of virtual canvas in user units
+ virtual void SetScrollbars(int horizontal, int vertical,
+ int x_length, int y_length,
+ int x_pos = 0, int y_pos = 0);
+
+ // Physically scroll the window
+ virtual void Scroll(int x_pos, int y_pos);
+ virtual void GetScrollPixelsPerUnit(int *x_unit, int *y_unit) const;
+ virtual void EnableScrolling(bool x_scrolling, bool y_scrolling);
+ virtual void AdjustScrollbars();
+
+ // Prepare the DC by translating it according to the current scroll position
+ virtual void PrepareDC(wxDC& dc);
+
+ int GetScrollPageSize(int orient) const ;
+ void SetScrollPageSize(int orient, int pageSize);
+
+ // Get the view start
+ virtual void ViewStart(int *x, int *y) const;
+
+ // Actual size in pixels when scrolling is taken into account
+ virtual void GetVirtualSize(int *x, int *y) const;
+
+ int CalcScrollInc(wxScrollEvent& event);
+
+ // event handlers
+ void OnPaint(wxPaintEvent& event);
+ void OnSize(wxSizeEvent& event);
+ void OnMouseEvent(wxMouseEvent& event);
+ void OnKillFocus(wxFocusEvent& event);
+ void OnScroll(wxScrollEvent& event);
+
+protected:
+ // common part of all ctors
+ void Init();
+
+ // implement base class pure virtuals
+ virtual wxToolBarToolBase *DoAddTool
+ (
+ int toolid,
+ const wxString& label,
+ const wxBitmap& bitmap,
+ const wxBitmap& bmpDisabled,
+ wxItemKind kind,
+ const wxString& shortHelp = wxEmptyString,
+ const wxString& longHelp = wxEmptyString,
+ wxObject *clientData = NULL,
+ wxCoord xPos = -1,
+ wxCoord yPos = -1
+ );
+
+ virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
+ virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
+
+ virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable);
+ virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
+ virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
+
+ virtual wxToolBarToolBase *CreateTool(int winid,
+ const wxString& label,
+ const wxBitmap& bmpNormal,
+ const wxBitmap& bmpDisabled,
+ wxItemKind kind,
+ wxObject *clientData,
+ const wxString& shortHelp,
+ const wxString& longHelp);
+ virtual wxToolBarToolBase *CreateTool(wxControl *control);
+
+ // helpers
+ void DrawTool(wxToolBarToolBase *tool);
+ virtual void DrawTool(wxDC& dc, wxToolBarToolBase *tool);
+ virtual void SpringUpButton(int index);
+
+ int m_currentRowsOrColumns;
+
+ int m_pressedTool, m_currentTool;
+
+ wxCoord m_lastX, m_lastY;
+ wxCoord m_maxWidth, m_maxHeight;
+ wxCoord m_xPos, m_yPos;
+
+ // scrolling data
+ int m_xScrollPixelsPerLine;
+ int m_yScrollPixelsPerLine;
+ bool m_xScrollingEnabled;
+ bool m_yScrollingEnabled;
+ int m_xScrollPosition;
+ int m_yScrollPosition;
+ int m_xScrollLines;
+ int m_yScrollLines;
+ int m_xScrollLinesPerPage;
+ int m_yScrollLinesPerPage;
+
+private:
+ DECLARE_EVENT_TABLE()
+ DECLARE_DYNAMIC_CLASS_NO_COPY(wxToolBarSimple)
+};
+
+#endif // wxUSE_TOOLBAR_SIMPLE
+
+#endif
+ // _WX_TBARSMPLH__
+
#if 0 // def __WXGTK__
#include <wx/toolbar.h>
#else
-#include <wx/tbarsmpl.h>
+#include <wx/deprecated/tbarsmpl.h>
#endif
/*
#include <wx/wx.h>
#include <wx/string.h>
-#include <wx/tbarsmpl.h>
+#include <wx/deprecated/tbarsmpl.h>
/*
* Object editor tool palette
--- /dev/null
+/////////////////////////////////////////////////////////////////////////////
+// Name: contrib/src/deprecated//tbarsmpl.cpp
+// Purpose: wxToolBarSimple
+// Author: Julian Smart
+// Modified by: VZ on 14.12.99 during wxToolBarSimple reorganization
+// Created: 04/01/98
+// RCS-ID: $Id$
+// Copyright: (c) Julian Smart
+// Licence: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+ #pragma implementation "tbarsmpl.h"
+#endif
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+ #pragma hdrstop
+#endif
+
+#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_SIMPLE
+
+#ifndef WX_PRECOMP
+ #include "wx/settings.h"
+ #include "wx/window.h"
+ #include "wx/dcclient.h"
+ #include "wx/dcmemory.h"
+#endif
+
+#include "wx/toolbar.h"
+#include "wx/deprecated/tbarsmpl.h"
+
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_DEPRECATED wxToolBarToolSimple : public wxToolBarToolBase
+{
+public:
+ wxToolBarToolSimple(wxToolBarSimple *tbar,
+ int id,
+ const wxString& label,
+ const wxBitmap& bmpNormal,
+ const wxBitmap& bmpDisabled,
+ wxItemKind kind,
+ wxObject *clientData,
+ const wxString& shortHelp,
+ const wxString& longHelp)
+ : wxToolBarToolBase(tbar, id, label, bmpNormal, bmpDisabled, kind,
+ clientData, shortHelp, longHelp)
+ {
+ }
+
+ wxToolBarToolSimple(wxToolBarSimple *tbar, wxControl *control)
+ : wxToolBarToolBase(tbar, control)
+ {
+ }
+
+ void SetSize(const wxSize& size)
+ {
+ m_width = size.x;
+ m_height = size.y;
+ }
+
+ wxCoord GetWidth() const { return m_width; }
+ wxCoord GetHeight() const { return m_height; }
+
+ wxCoord m_x;
+ wxCoord m_y;
+ wxCoord m_width;
+ wxCoord m_height;
+
+ DECLARE_NO_COPY_CLASS(wxToolBarToolSimple)
+};
+
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxToolBarSimple, wxControl)
+
+#if !wxUSE_TOOLBAR_NATIVE && !defined(__WXUNIVERSAL__)
+ IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarSimple)
+#endif
+
+BEGIN_EVENT_TABLE(wxToolBarSimple, wxToolBarBase)
+ EVT_SIZE(wxToolBarSimple::OnSize)
+ EVT_SCROLL(wxToolBarSimple::OnScroll)
+ EVT_PAINT(wxToolBarSimple::OnPaint)
+ EVT_KILL_FOCUS(wxToolBarSimple::OnKillFocus)
+ EVT_MOUSE_EVENTS(wxToolBarSimple::OnMouseEvent)
+END_EVENT_TABLE()
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// tool bar tools creation
+// ----------------------------------------------------------------------------
+
+wxToolBarToolBase *wxToolBarSimple::CreateTool(int id,
+ const wxString& label,
+ const wxBitmap& bmpNormal,
+ const wxBitmap& bmpDisabled,
+ wxItemKind kind,
+ wxObject *clientData,
+ const wxString& shortHelp,
+ const wxString& longHelp)
+{
+ return new wxToolBarToolSimple(this, id, label, bmpNormal, bmpDisabled,
+ kind, clientData, shortHelp, longHelp);
+}
+
+wxToolBarToolBase *wxToolBarSimple::CreateTool(wxControl *control)
+{
+ return new wxToolBarToolSimple(this, control);
+}
+
+// ----------------------------------------------------------------------------
+// wxToolBarSimple creation
+// ----------------------------------------------------------------------------
+
+void wxToolBarSimple::Init()
+{
+ m_currentRowsOrColumns = 0;
+
+ m_lastX =
+ m_lastY = 0;
+
+ m_maxWidth =
+ m_maxHeight = 0;
+
+ m_pressedTool =
+ m_currentTool = -1;
+
+ m_xPos =
+ m_yPos = -1;
+
+ m_toolPacking = 1;
+ m_toolSeparation = 5;
+
+ m_defaultWidth = 16;
+ m_defaultHeight = 15;
+
+ m_xScrollPixelsPerLine = 1;
+ m_yScrollPixelsPerLine = 1;
+ m_xScrollingEnabled = FALSE;
+ m_yScrollingEnabled = FALSE;
+ m_xScrollPosition = 0;
+ m_yScrollPosition = 0;
+ m_xScrollLines = 0;
+ m_yScrollLines = 0;
+ m_xScrollLinesPerPage = 0;
+ m_yScrollLinesPerPage = 0;
+}
+
+wxToolBarToolBase *wxToolBarSimple::DoAddTool(int id,
+ const wxString& label,
+ const wxBitmap& bitmap,
+ const wxBitmap& bmpDisabled,
+ wxItemKind kind,
+ const wxString& shortHelp,
+ const wxString& longHelp,
+ wxObject *clientData,
+ wxCoord xPos,
+ wxCoord yPos)
+{
+ // rememeber the position for DoInsertTool()
+ m_xPos = xPos;
+ m_yPos = yPos;
+
+ return wxToolBarBase::DoAddTool(id, label, bitmap, bmpDisabled, kind,
+ shortHelp, longHelp,
+ clientData, xPos, yPos);
+}
+
+bool wxToolBarSimple::DoInsertTool(size_t WXUNUSED(pos),
+ wxToolBarToolBase *toolBase)
+{
+ wxToolBarToolSimple *tool = (wxToolBarToolSimple *)toolBase;
+
+ wxCHECK_MSG( !tool->IsControl(), FALSE,
+ _T("generic wxToolBarSimple doesn't support controls") );
+
+ tool->m_x = m_xPos;
+ if ( tool->m_x == -1 )
+ tool->m_x = m_xMargin;
+
+ tool->m_y = m_yPos;
+ if ( tool->m_y == -1 )
+ tool->m_y = m_yMargin;
+
+ tool->SetSize(GetToolSize());
+
+ if ( tool->IsButton() )
+ {
+ // Calculate reasonable max size in case Layout() not called
+ if ((tool->m_x + tool->GetNormalBitmap().GetWidth() + m_xMargin) > m_maxWidth)
+ m_maxWidth = (wxCoord)((tool->m_x + tool->GetWidth() + m_xMargin));
+
+ if ((tool->m_y + tool->GetNormalBitmap().GetHeight() + m_yMargin) > m_maxHeight)
+ m_maxHeight = (wxCoord)((tool->m_y + tool->GetHeight() + m_yMargin));
+ }
+
+ return TRUE;
+}
+
+bool wxToolBarSimple::DoDeleteTool(size_t WXUNUSED(pos),
+ wxToolBarToolBase *tool)
+{
+ // VZ: didn't test whether it works, but why not...
+ tool->Detach();
+
+ Refresh();
+
+ return TRUE;
+}
+
+bool wxToolBarSimple::Create(wxWindow *parent,
+ wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxString& name)
+{
+ if ( !wxWindow::Create(parent, id, pos, size, style, name) )
+ return FALSE;
+
+ // Set it to grey (or other 3D face colour)
+ SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
+
+ if ( GetWindowStyleFlag() & wxTB_VERTICAL )
+ {
+ m_lastX = 7;
+ m_lastY = 3;
+
+ m_maxRows = 32000; // a lot
+ m_maxCols = 1;
+ }
+ else
+ {
+ m_lastX = 3;
+ m_lastY = 7;
+
+ m_maxRows = 1;
+ m_maxCols = 32000; // a lot
+ }
+
+ SetCursor(*wxSTANDARD_CURSOR);
+
+ return TRUE;
+}
+
+wxToolBarSimple::~wxToolBarSimple()
+{
+}
+
+bool wxToolBarSimple::Realize()
+{
+ m_currentRowsOrColumns = 0;
+ m_lastX = m_xMargin;
+ m_lastY = m_yMargin;
+ m_maxWidth = 0;
+ m_maxHeight = 0;
+
+ int maxToolWidth = 0;
+ int maxToolHeight = 0;
+
+ // Find the maximum tool width and height
+ wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
+ while ( node )
+ {
+ wxToolBarToolSimple *tool = (wxToolBarToolSimple *)node->GetData();
+ if ( tool->GetWidth() > maxToolWidth )
+ maxToolWidth = tool->GetWidth();
+ if (tool->GetHeight() > maxToolHeight)
+ maxToolHeight = tool->GetHeight();
+
+ node = node->GetNext();
+ }
+
+ int separatorSize = m_toolSeparation;
+
+ node = m_tools.GetFirst();
+ while ( node )
+ {
+ wxToolBarToolSimple *tool = (wxToolBarToolSimple *)node->GetData();
+ if ( tool->IsSeparator() )
+ {
+ if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
+ {
+ if (m_currentRowsOrColumns >= m_maxCols)
+ m_lastY += separatorSize;
+ else
+ m_lastX += separatorSize;
+ }
+ else
+ {
+ if (m_currentRowsOrColumns >= m_maxRows)
+ m_lastX += separatorSize;
+ else
+ m_lastY += separatorSize;
+ }
+ }
+ else if ( tool->IsButton() )
+ {
+ if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
+ {
+ if (m_currentRowsOrColumns >= m_maxCols)
+ {
+ m_currentRowsOrColumns = 0;
+ m_lastX = m_xMargin;
+ m_lastY += maxToolHeight + m_toolPacking;
+ }
+ tool->m_x = (wxCoord)(m_lastX + (maxToolWidth - tool->GetWidth())/2.0);
+ tool->m_y = (wxCoord)(m_lastY + (maxToolHeight - tool->GetHeight())/2.0);
+
+ m_lastX += maxToolWidth + m_toolPacking;
+ }
+ else
+ {
+ if (m_currentRowsOrColumns >= m_maxRows)
+ {
+ m_currentRowsOrColumns = 0;
+ m_lastX += (maxToolWidth + m_toolPacking);
+ m_lastY = m_yMargin;
+ }
+ tool->m_x = (wxCoord)(m_lastX + (maxToolWidth - tool->GetWidth())/2.0);
+ tool->m_y = (wxCoord)(m_lastY + (maxToolHeight - tool->GetHeight())/2.0);
+
+ m_lastY += maxToolHeight + m_toolPacking;
+ }
+ m_currentRowsOrColumns ++;
+ }
+ else
+ {
+ // TODO: support the controls
+ }
+
+ if (m_lastX > m_maxWidth)
+ m_maxWidth = m_lastX;
+ if (m_lastY > m_maxHeight)
+ m_maxHeight = m_lastY;
+
+ node = node->GetNext();
+ }
+
+ if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
+ m_maxHeight += maxToolHeight;
+ else
+ m_maxWidth += maxToolWidth;
+
+ m_maxWidth += m_xMargin;
+ m_maxHeight += m_yMargin;
+
+ SetSize(m_maxWidth, m_maxHeight);
+
+ return TRUE;
+}
+
+// ----------------------------------------------------------------------------
+// event handlers
+// ----------------------------------------------------------------------------
+
+void wxToolBarSimple::OnPaint (wxPaintEvent& WXUNUSED(event))
+{
+ wxPaintDC dc(this);
+ PrepareDC(dc);
+
+ static int count = 0;
+ // Prevent reentry of OnPaint which would cause wxMemoryDC errors.
+ if ( count > 0 )
+ return;
+ count++;
+
+ for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
+ node;
+ node = node->GetNext() )
+ {
+ wxToolBarToolBase *tool = node->GetData();
+ if ( tool->IsButton() )
+ DrawTool(dc, tool);
+ }
+
+ count--;
+}
+
+void wxToolBarSimple::OnSize (wxSizeEvent& WXUNUSED(event))
+{
+#if wxUSE_CONSTRAINTS
+ if (GetAutoLayout())
+ Layout();
+#endif
+
+ AdjustScrollbars();
+}
+
+void wxToolBarSimple::OnKillFocus(wxFocusEvent& WXUNUSED(event))
+{
+ OnMouseEnter(m_pressedTool = m_currentTool = -1);
+}
+
+void wxToolBarSimple::OnMouseEvent(wxMouseEvent & event)
+{
+ wxCoord x, y;
+ event.GetPosition(&x, &y);
+ wxToolBarToolSimple *tool = (wxToolBarToolSimple *)FindToolForPosition(x, y);
+
+ if (event.LeftDown())
+ {
+ CaptureMouse();
+ }
+ if (event.LeftUp())
+ {
+ ReleaseMouse();
+ }
+
+ if (!tool)
+ {
+ if (m_currentTool > -1)
+ {
+ if (event.LeftIsDown())
+ SpringUpButton(m_currentTool);
+ m_currentTool = -1;
+ OnMouseEnter(-1);
+ }
+ return;
+ }
+
+ if (!event.IsButton())
+ {
+ if ( tool->GetId() != m_currentTool )
+ {
+ // If the left button is kept down and moved over buttons,
+ // press those buttons.
+ if ( event.LeftIsDown() && tool->IsEnabled() )
+ {
+ SpringUpButton(m_currentTool);
+
+ if ( tool->CanBeToggled() )
+ {
+ tool->Toggle();
+ }
+
+ DrawTool(tool);
+ }
+
+ m_currentTool = tool->GetId();
+ OnMouseEnter(m_currentTool);
+ }
+ return;
+ }
+
+ // Left button pressed.
+ if ( event.LeftDown() && tool->IsEnabled() )
+ {
+ if ( tool->CanBeToggled() )
+ {
+ tool->Toggle();
+ }
+
+ DrawTool(tool);
+ }
+ else if (event.RightDown())
+ {
+ OnRightClick(tool->GetId(), x, y);
+ }
+
+ // Left Button Released. Only this action confirms selection.
+ // If the button is enabled and it is not a toggle tool and it is
+ // in the pressed state, then raise the button and call OnLeftClick.
+ //
+ if ( event.LeftUp() && tool->IsEnabled() )
+ {
+ // Pass the OnLeftClick event to tool
+ if ( !OnLeftClick(tool->GetId(), tool->IsToggled()) &&
+ tool->CanBeToggled() )
+ {
+ // If it was a toggle, and OnLeftClick says No Toggle allowed,
+ // then change it back
+ tool->Toggle();
+ }
+
+ DrawTool(tool);
+ }
+}
+
+// ----------------------------------------------------------------------------
+// drawing
+// ----------------------------------------------------------------------------
+
+void wxToolBarSimple::DrawTool(wxToolBarToolBase *tool)
+{
+ wxClientDC dc(this);
+ DrawTool(dc, tool);
+}
+
+void wxToolBarSimple::DrawTool(wxDC& dc, wxToolBarToolBase *toolBase)
+{
+ wxToolBarToolSimple *tool = (wxToolBarToolSimple *)toolBase;
+
+ wxMemoryDC memDC;
+ PrepareDC(dc);
+
+ wxPen dark_grey_pen(wxColour( 85,85,85 ), 1, wxSOLID);
+ wxPen white_pen(wxT("WHITE"), 1, wxSOLID);
+ wxPen black_pen(wxT("BLACK"), 1, wxSOLID);
+
+ wxBitmap bitmap = tool->GetNormalBitmap();
+ if (!bitmap.Ok())
+ return;
+
+ if ( !tool->IsToggled() )
+ {
+#if wxUSE_PALETTE
+#ifndef __WXGTK__
+ if (bitmap.GetPalette())
+ memDC.SetPalette(*bitmap.GetPalette());
+#endif
+#endif // wxUSE_PALETTE
+
+ int ax = (int)tool->m_x,
+ ay = (int)tool->m_y,
+ bx = (int)(tool->m_x+tool->GetWidth()),
+ by = (int)(tool->m_y+tool->GetHeight());
+
+ memDC.SelectObject(bitmap);
+ if (m_windowStyle & wxTB_3DBUTTONS)
+ {
+ dc.SetClippingRegion(ax, ay, (bx-ax+1), (by-ay+1));
+ dc.Blit((ax+1), (ay+1), (bx-ax-2), (by-ay-2), &memDC, 0, 0);
+ wxPen * old_pen = & dc.GetPen();
+ dc.SetPen( white_pen );
+ dc.DrawLine(ax,(by-1),ax,ay);
+ dc.DrawLine(ax,ay,(bx-1),ay);
+ dc.SetPen( dark_grey_pen );
+ dc.DrawLine((bx-1),(ay+1),(bx-1),(by-1));
+ dc.DrawLine((bx-1),(by-1),(ax+1),(by-1));
+ dc.SetPen( black_pen );
+ dc.DrawLine(bx,ay,bx,by);
+ dc.DrawLine(bx,by,ax,by);
+ dc.SetPen( *old_pen );
+ dc.DestroyClippingRegion();
+ // Select bitmap out of the DC
+ }
+ else
+ {
+ dc.Blit(tool->m_x, tool->m_y,
+ bitmap.GetWidth(), bitmap.GetHeight(),
+ &memDC, 0, 0);
+ }
+ memDC.SelectObject(wxNullBitmap);
+
+#if wxUSE_PALETTE
+#ifndef __WXGTK__
+ if (bitmap.GetPalette())
+ memDC.SetPalette(wxNullPalette);
+#endif
+#endif // wxUSE_PALETTE
+ }
+ // No second bitmap, so draw a thick line around bitmap, or invert if mono
+ else if ( tool->IsToggled() )
+ {
+ bool drawBorder = FALSE;
+#ifdef __X__ // X doesn't invert properly on colour
+ drawBorder = wxColourDisplay();
+#else // Inversion works fine under Windows
+ drawBorder = FALSE;
+#endif
+
+ if (!drawBorder)
+ {
+ memDC.SelectObject(tool->GetNormalBitmap());
+ dc.Blit(tool->m_x, tool->m_y, tool->GetWidth(), tool->GetHeight(),
+ &memDC, 0, 0, wxSRC_INVERT);
+ memDC.SelectObject(wxNullBitmap);
+ }
+ else
+ {
+ bitmap = tool->GetNormalBitmap();
+
+ if (m_windowStyle & wxTB_3DBUTTONS)
+ {
+ int ax = (int)tool->m_x,
+ ay = (int)tool->m_y,
+ bx = (int)(tool->m_x+tool->GetWidth()),
+ by = (int)(tool->m_y+tool->GetHeight());
+
+ memDC.SelectObject(bitmap);
+ dc.SetClippingRegion(ax, ay, (bx-ax+1), (by-ay+1));
+ dc.Blit((ax+2), (ay+2), (bx-ax-2), (by-ay-2), &memDC, 0, 0);
+ wxPen * old_pen = & dc.GetPen();
+ dc.SetPen( black_pen );
+ dc.DrawLine(ax,(by-1),ax,ay);
+ dc.DrawLine(ax,ay,(bx-1),ay);
+ dc.SetPen( dark_grey_pen );
+ dc.DrawLine((ax+1),(by-2),(ax+1),(ay+1));
+ dc.DrawLine((ax+1),(ay+1),(bx-2),(ay+1));
+ dc.SetPen( white_pen );
+ dc.DrawLine(bx,ay,bx,by);
+ dc.DrawLine(bx,by,ax,by);
+ dc.SetPen( *old_pen );
+ dc.DestroyClippingRegion();
+ memDC.SelectObject(wxNullBitmap);
+ }
+ else
+ {
+ wxCoord x = tool->m_x;
+ wxCoord y = tool->m_y;
+ wxCoord w = bitmap.GetWidth();
+ wxCoord h = bitmap.GetHeight();
+ wxPen thick_black_pen(wxT("BLACK"), 3, wxSOLID);
+
+ memDC.SelectObject(bitmap);
+ dc.SetClippingRegion(tool->m_x, tool->m_y, w, h);
+ dc.Blit(tool->m_x, tool->m_y, w, h,
+ &memDC, 0, 0);
+ dc.SetPen(thick_black_pen);
+ dc.SetBrush(*wxTRANSPARENT_BRUSH);
+ dc.DrawRectangle(x, y, w-1, h-1);
+ dc.DestroyClippingRegion();
+ memDC.SelectObject(wxNullBitmap);
+ }
+ }
+ }
+}
+
+// ----------------------------------------------------------------------------
+// toolbar geometry
+// ----------------------------------------------------------------------------
+
+void wxToolBarSimple::SetRows(int nRows)
+{
+ wxCHECK_RET( nRows != 0, _T("max number of rows must be > 0") );
+
+ m_maxCols = (GetToolsCount() + nRows - 1) / nRows;
+
+ AdjustScrollbars();
+ Refresh();
+}
+
+wxToolBarToolBase *wxToolBarSimple::FindToolForPosition(wxCoord x,
+ wxCoord y) const
+{
+ wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
+ while (node)
+ {
+ wxToolBarToolSimple *tool = (wxToolBarToolSimple *)node->GetData();
+ if ((x >= tool->m_x) && (y >= tool->m_y) &&
+ (x <= (tool->m_x + tool->GetWidth())) &&
+ (y <= (tool->m_y + tool->GetHeight())))
+ {
+ return tool;
+ }
+
+ node = node->GetNext();
+ }
+
+ return (wxToolBarToolBase *)NULL;
+}
+
+// ----------------------------------------------------------------------------
+// tool state change handlers
+// ----------------------------------------------------------------------------
+
+void wxToolBarSimple::DoEnableTool(wxToolBarToolBase *tool,
+ bool WXUNUSED(enable))
+{
+ DrawTool(tool);
+}
+
+void wxToolBarSimple::DoToggleTool(wxToolBarToolBase *tool,
+ bool WXUNUSED(toggle))
+{
+ DrawTool(tool);
+}
+
+void wxToolBarSimple::DoSetToggle(wxToolBarToolBase * WXUNUSED(tool),
+ bool WXUNUSED(toggle))
+{
+ // nothing to do
+}
+
+// Okay, so we've left the tool we're in ... we must check if the tool we're
+// leaving was a 'sprung push button' and if so, spring it back to the up
+// state.
+void wxToolBarSimple::SpringUpButton(int id)
+{
+ wxToolBarToolBase *tool = FindById(id);
+
+ if ( tool && tool->CanBeToggled() )
+ {
+ if (tool->IsToggled())
+ tool->Toggle();
+
+ DrawTool(tool);
+ }
+}
+
+// ----------------------------------------------------------------------------
+// scrolling implementation
+// ----------------------------------------------------------------------------
+
+/*
+ * pixelsPerUnitX/pixelsPerUnitY: number of pixels per unit (e.g. pixels per text line)
+ * noUnitsX/noUnitsY: : no. units per scrollbar
+ */
+void wxToolBarSimple::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY,
+ int noUnitsX, int noUnitsY,
+ int xPos, int yPos)
+{
+ m_xScrollPixelsPerLine = pixelsPerUnitX;
+ m_yScrollPixelsPerLine = pixelsPerUnitY;
+ m_xScrollLines = noUnitsX;
+ m_yScrollLines = noUnitsY;
+
+ int w, h;
+ GetSize(&w, &h);
+
+ // Recalculate scroll bar range and position
+ if (m_xScrollLines > 0)
+ {
+ m_xScrollPosition = xPos;
+ SetScrollPos (wxHORIZONTAL, m_xScrollPosition, TRUE);
+ }
+ else
+ {
+ SetScrollbar(wxHORIZONTAL, 0, 0, 0, FALSE);
+ m_xScrollPosition = 0;
+ }
+
+ if (m_yScrollLines > 0)
+ {
+ m_yScrollPosition = yPos;
+ SetScrollPos (wxVERTICAL, m_yScrollPosition, TRUE);
+ }
+ else
+ {
+ SetScrollbar(wxVERTICAL, 0, 0, 0, FALSE);
+ m_yScrollPosition = 0;
+ }
+ AdjustScrollbars();
+ Refresh();
+
+#if 0 //def __WXMSW__
+ ::UpdateWindow ((HWND) GetHWND());
+#endif
+}
+
+void wxToolBarSimple::OnScroll(wxScrollEvent& event)
+{
+ int orient = event.GetOrientation();
+
+ int nScrollInc = CalcScrollInc(event);
+ if (nScrollInc == 0)
+ return;
+
+ if (orient == wxHORIZONTAL)
+ {
+ int newPos = m_xScrollPosition + nScrollInc;
+ SetScrollPos(wxHORIZONTAL, newPos, TRUE );
+ }
+ else
+ {
+ int newPos = m_yScrollPosition + nScrollInc;
+ SetScrollPos(wxVERTICAL, newPos, TRUE );
+ }
+
+ if (orient == wxHORIZONTAL)
+ {
+ if (m_xScrollingEnabled)
+ ScrollWindow(-m_xScrollPixelsPerLine * nScrollInc, 0, NULL);
+ else
+ Refresh();
+ }
+ else
+ {
+ if (m_yScrollingEnabled)
+ ScrollWindow(0, -m_yScrollPixelsPerLine * nScrollInc, NULL);
+ else
+ Refresh();
+ }
+
+ if (orient == wxHORIZONTAL)
+ {
+ m_xScrollPosition += nScrollInc;
+ }
+ else
+ {
+ m_yScrollPosition += nScrollInc;
+ }
+
+}
+
+int wxToolBarSimple::CalcScrollInc(wxScrollEvent& event)
+{
+ int pos = event.GetPosition();
+ int orient = event.GetOrientation();
+
+ int nScrollInc = 0;
+ if (event.GetEventType() == wxEVT_SCROLL_TOP)
+ {
+ if (orient == wxHORIZONTAL)
+ nScrollInc = - m_xScrollPosition;
+ else
+ nScrollInc = - m_yScrollPosition;
+ } else
+ if (event.GetEventType() == wxEVT_SCROLL_BOTTOM)
+ {
+ if (orient == wxHORIZONTAL)
+ nScrollInc = m_xScrollLines - m_xScrollPosition;
+ else
+ nScrollInc = m_yScrollLines - m_yScrollPosition;
+ } else
+ if (event.GetEventType() == wxEVT_SCROLL_LINEUP)
+ {
+ nScrollInc = -1;
+ } else
+ if (event.GetEventType() == wxEVT_SCROLL_LINEDOWN)
+ {
+ nScrollInc = 1;
+ } else
+ if (event.GetEventType() == wxEVT_SCROLL_PAGEUP)
+ {
+ if (orient == wxHORIZONTAL)
+ nScrollInc = -GetScrollPageSize(wxHORIZONTAL);
+ else
+ nScrollInc = -GetScrollPageSize(wxVERTICAL);
+ } else
+ if (event.GetEventType() == wxEVT_SCROLL_PAGEDOWN)
+ {
+ if (orient == wxHORIZONTAL)
+ nScrollInc = GetScrollPageSize(wxHORIZONTAL);
+ else
+ nScrollInc = GetScrollPageSize(wxVERTICAL);
+ } else
+ if ((event.GetEventType() == wxEVT_SCROLL_THUMBTRACK) ||
+ (event.GetEventType() == wxEVT_SCROLL_THUMBRELEASE))
+ {
+ if (orient == wxHORIZONTAL)
+ nScrollInc = pos - m_xScrollPosition;
+ else
+ nScrollInc = pos - m_yScrollPosition;
+ }
+
+ if (orient == wxHORIZONTAL)
+ {
+ int w, h;
+ GetClientSize(&w, &h);
+
+ int nMaxWidth = m_xScrollLines*m_xScrollPixelsPerLine;
+ int noPositions = (int) ( ((nMaxWidth - w)/(float)m_xScrollPixelsPerLine) + 0.5 );
+ if (noPositions < 0)
+ noPositions = 0;
+
+ if ( (m_xScrollPosition + nScrollInc) < 0 )
+ nScrollInc = -m_xScrollPosition; // As -ve as we can go
+ else if ( (m_xScrollPosition + nScrollInc) > noPositions )
+ nScrollInc = noPositions - m_xScrollPosition; // As +ve as we can go
+
+ return nScrollInc;
+ }
+ else
+ {
+ int w, h;
+ GetClientSize(&w, &h);
+
+ int nMaxHeight = m_yScrollLines*m_yScrollPixelsPerLine;
+ int noPositions = (int) ( ((nMaxHeight - h)/(float)m_yScrollPixelsPerLine) + 0.5 );
+ if (noPositions < 0)
+ noPositions = 0;
+
+ if ( (m_yScrollPosition + nScrollInc) < 0 )
+ nScrollInc = -m_yScrollPosition; // As -ve as we can go
+ else if ( (m_yScrollPosition + nScrollInc) > noPositions )
+ nScrollInc = noPositions - m_yScrollPosition; // As +ve as we can go
+
+ return nScrollInc;
+ }
+}
+
+// Adjust the scrollbars - new version.
+void wxToolBarSimple::AdjustScrollbars()
+{
+ int w, h;
+ GetClientSize(&w, &h);
+
+ // Recalculate scroll bar range and position
+ if (m_xScrollLines > 0)
+ {
+ int nMaxWidth = m_xScrollLines*m_xScrollPixelsPerLine;
+ int newRange = (int) ( ((nMaxWidth)/(float)m_xScrollPixelsPerLine) + 0.5 );
+ if (newRange < 0)
+ newRange = 0;
+
+ m_xScrollPosition = wxMin(newRange, m_xScrollPosition);
+
+ // Calculate page size i.e. number of scroll units you get on the
+ // current client window
+ int noPagePositions = (int) ( (w/(float)m_xScrollPixelsPerLine) + 0.5 );
+ if (noPagePositions < 1)
+ noPagePositions = 1;
+
+ SetScrollbar(wxHORIZONTAL, m_xScrollPosition, noPagePositions, newRange);
+ SetScrollPageSize(wxHORIZONTAL, noPagePositions);
+ }
+ if (m_yScrollLines > 0)
+ {
+ int nMaxHeight = m_yScrollLines*m_yScrollPixelsPerLine;
+ int newRange = (int) ( ((nMaxHeight)/(float)m_yScrollPixelsPerLine) + 0.5 );
+ if (newRange < 0)
+ newRange = 0;
+
+ m_yScrollPosition = wxMin(newRange, m_yScrollPosition);
+
+ // Calculate page size i.e. number of scroll units you get on the
+ // current client window
+ int noPagePositions = (int) ( (h/(float)m_yScrollPixelsPerLine) + 0.5 );
+ if (noPagePositions < 1)
+ noPagePositions = 1;
+
+ SetScrollbar(wxVERTICAL, m_yScrollPosition, noPagePositions, newRange);
+ SetScrollPageSize(wxVERTICAL, noPagePositions);
+ }
+}
+
+// Prepare the DC by translating it according to the current scroll position
+void wxToolBarSimple::PrepareDC(wxDC& dc)
+{
+ dc.SetDeviceOrigin(- m_xScrollPosition * m_xScrollPixelsPerLine, - m_yScrollPosition * m_yScrollPixelsPerLine);
+}
+
+void wxToolBarSimple::GetScrollPixelsPerUnit (int *x_unit, int *y_unit) const
+{
+ *x_unit = m_xScrollPixelsPerLine;
+ *y_unit = m_yScrollPixelsPerLine;
+}
+
+int wxToolBarSimple::GetScrollPageSize(int orient) const
+{
+ if ( orient == wxHORIZONTAL )
+ return m_xScrollLinesPerPage;
+ else
+ return m_yScrollLinesPerPage;
+}
+
+void wxToolBarSimple::SetScrollPageSize(int orient, int pageSize)
+{
+ if ( orient == wxHORIZONTAL )
+ m_xScrollLinesPerPage = pageSize;
+ else
+ m_yScrollLinesPerPage = pageSize;
+}
+
+/*
+ * Scroll to given position (scroll position, not pixel position)
+ */
+void wxToolBarSimple::Scroll (int x_pos, int y_pos)
+{
+ int old_x, old_y;
+ ViewStart (&old_x, &old_y);
+ if (((x_pos == -1) || (x_pos == old_x)) && ((y_pos == -1) || (y_pos == old_y)))
+ return;
+
+ if (x_pos > -1)
+ {
+ m_xScrollPosition = x_pos;
+ SetScrollPos (wxHORIZONTAL, x_pos, TRUE);
+ }
+ if (y_pos > -1)
+ {
+ m_yScrollPosition = y_pos;
+ SetScrollPos (wxVERTICAL, y_pos, TRUE);
+ }
+ Refresh();
+
+#if 0 //def __WXMSW__
+ UpdateWindow ((HWND) GetHWND());
+#endif
+}
+
+void wxToolBarSimple::EnableScrolling (bool x_scroll, bool y_scroll)
+{
+ m_xScrollingEnabled = x_scroll;
+ m_yScrollingEnabled = y_scroll;
+}
+
+void wxToolBarSimple::GetVirtualSize (int *x, int *y) const
+{
+ *x = m_xScrollPixelsPerLine * m_xScrollLines;
+ *y = m_yScrollPixelsPerLine * m_yScrollLines;
+}
+
+// Where the current view starts from
+void wxToolBarSimple::ViewStart (int *x, int *y) const
+{
+ *x = m_xScrollPosition;
+ *y = m_yScrollPosition;
+}
+
+#endif // wxUSE_TOOLBAR_SIMPLE
+
mkdir $DESTDIR/wxWindows-$VERSION
cd $DESTDIR/wxWindows-$VERSION
unzip $ZIPFLAGS ../wxOS2-$VERSION.zip
- echo Overwriting with OS2-specific versions of configure files...
- unzip $ZIPFLAGS -o $APPDIR/distrib/os2/os2-specific.zip
+ # No longer do this, configure should be OK (maybe)
+ # echo Overwriting with OS2-specific versions of configure files...
+ # unzip $ZIPFLAGS -o $APPDIR/distrib/os2/os2-specific.zip
rm -f src/gtk/descrip.mms src/motif/descrip.mms docs/pdf/*.pdf
rm -f src/tiff/*.mcp src/jpeg/*.mcp src/png/*.mcp src/zlib/*.mcp
rm -f -r docs/html/dialoged docs/html/tex2rtf
unix2dos --unix2dos `cat $WXSRC/distrib/msw/vc.rsp`
# Copy OS/2 specific configure files
-cp $WXSRC/distrib/os2/os2-specific.zip docs/os2
+# (no longer)
+# cp $WXSRC/distrib/os2/os2-specific.zip docs/os2
# Copy the OS/2 files which probably haven't been copied yet
mkdir include/wx/os2
Note that you can use the wxUniversal classes, wxMSW and MicroWindows (from
Century Software) to build a different variant of wxUniversal than that
documented here. Please see docs/univ/readme.txt for further information.
+Note that this port is not up-to-date and probably needs work
+to compile.
+
+Note that by default, wxUniv under MSW uses PostScript printing,
+not Windows printing. To change to Windows printing, set
+wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW to 0 in include/wx/univ/setup.h
+before compiling.
3. Installing under Unix
------------------------
// wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar
// classes at all. Otherwise, use the native toolbar class unless
-// wxUSE_TOOLBAR_NATIVE is 0. Additionally, the generic toolbar class which
-// supports some features which might not be supported by the native wxToolBar
-// class may be compiled in if wxUSE_TOOLBAR_SIMPLE is 1.
+// wxUSE_TOOLBAR_NATIVE is 0.
//
// Default is 1 for all settings.
//
-// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE and 0 for
-// wxUSE_TOOLBAR_SIMPLE (the default is 1 mainly for backwards compatibility).
+// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE.
#define wxUSE_TOOLBAR 1
#define wxUSE_TOOLBAR_NATIVE 1
-#define wxUSE_TOOLBAR_SIMPLE 1
// this setting is obsolete, value is ignored
#define wxUSE_BUTTONBAR 1
// wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar
// classes at all. Otherwise, use the native toolbar class unless
-// wxUSE_TOOLBAR_NATIVE is 0. Additionally, the generic toolbar class which
-// supports some features which might not be supported by the native wxToolBar
-// class may be compiled in if wxUSE_TOOLBAR_SIMPLE is 1.
+// wxUSE_TOOLBAR_NATIVE is 0.
//
// Default is 1 for all settings.
//
-// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE and 0 for
-// wxUSE_TOOLBAR_SIMPLE (the default is 1 mainly for backwards compatibility).
+// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE.
#define wxUSE_TOOLBAR 1
#define wxUSE_TOOLBAR_NATIVE 1
-#define wxUSE_TOOLBAR_SIMPLE 1
// this setting is obsolete, value is ignored
#define wxUSE_BUTTONBAR 1
// wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar
// classes at all. Otherwise, use the native toolbar class unless
-// wxUSE_TOOLBAR_NATIVE is 0. Additionally, the generic toolbar class which
-// supports some features which might not be supported by the native wxToolBar
-// class may be compiled in if wxUSE_TOOLBAR_SIMPLE is 1.
+// wxUSE_TOOLBAR_NATIVE is 0.
//
// Default is 1 for all settings.
//
-// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE and 0 for
-// wxUSE_TOOLBAR_SIMPLE (the default is 1 mainly for backwards compatibility).
+// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE.
#define wxUSE_TOOLBAR 1
#define wxUSE_TOOLBAR_NATIVE 1
-#define wxUSE_TOOLBAR_SIMPLE 1
// this setting is obsolete, value is ignored
#define wxUSE_BUTTONBAR 1
+++ /dev/null
-/////////////////////////////////////////////////////////////////////////////
-// Name: wx/tbarsmpl.h
-// Purpose: wxToolBarSimple class
-// Author: Julian Smart
-// Modified by: VZ on 14.12.99 during wxToolBar classes reorganization
-// Created: 01/02/97
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_TBARSMPLH__
-#define _WX_TBARSMPLH__
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma interface "tbarsmpl.h"
-#endif
-
-#include "wx/tbarbase.h"
-
-#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_SIMPLE
-
-class WXDLLEXPORT wxMemoryDC;
-
-// ----------------------------------------------------------------------------
-// wxToolBarSimple is a generic toolbar implementation in pure wxWindows
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxToolBarSimple : public wxToolBarBase
-{
-public:
- // ctors and dtor
- wxToolBarSimple() { Init(); }
-
- wxToolBarSimple(wxWindow *parent,
- wxWindowID winid,
- const wxPoint& pos = wxDefaultPosition,
- const wxSize& size = wxDefaultSize,
- long style = wxNO_BORDER | wxTB_HORIZONTAL,
- const wxString& name = wxToolBarNameStr)
- {
- Init();
-
- Create(parent, winid, pos, size, style, name);
- }
-
- bool Create(wxWindow *parent,
- wxWindowID winid,
- const wxPoint& pos = wxDefaultPosition,
- const wxSize& size = wxDefaultSize,
- long style = wxNO_BORDER | wxTB_HORIZONTAL,
- const wxString& name = wxToolBarNameStr);
-
- virtual ~wxToolBarSimple();
-
- // override/implement base class virtuals
- virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
-
- virtual bool Realize();
-
- virtual void SetRows(int nRows);
-
- // implementation from now on
- // --------------------------
-
- // SCROLLING: this has to be copied from wxScrolledWindow since
- // wxToolBarBase inherits from wxControl. This could have been put into
- // wxToolBarSimple, but we might want any derived toolbar class to be
- // scrollable.
-
- // Number of pixels per user unit (0 or -1 for no scrollbar)
- // Length of virtual canvas in user units
- virtual void SetScrollbars(int horizontal, int vertical,
- int x_length, int y_length,
- int x_pos = 0, int y_pos = 0);
-
- // Physically scroll the window
- virtual void Scroll(int x_pos, int y_pos);
- virtual void GetScrollPixelsPerUnit(int *x_unit, int *y_unit) const;
- virtual void EnableScrolling(bool x_scrolling, bool y_scrolling);
- virtual void AdjustScrollbars();
-
- // Prepare the DC by translating it according to the current scroll position
- virtual void PrepareDC(wxDC& dc);
-
- int GetScrollPageSize(int orient) const ;
- void SetScrollPageSize(int orient, int pageSize);
-
- // Get the view start
- virtual void ViewStart(int *x, int *y) const;
-
- // Actual size in pixels when scrolling is taken into account
- virtual void GetVirtualSize(int *x, int *y) const;
-
- int CalcScrollInc(wxScrollEvent& event);
-
- // event handlers
- void OnPaint(wxPaintEvent& event);
- void OnSize(wxSizeEvent& event);
- void OnMouseEvent(wxMouseEvent& event);
- void OnKillFocus(wxFocusEvent& event);
- void OnScroll(wxScrollEvent& event);
-
-protected:
- // common part of all ctors
- void Init();
-
- // implement base class pure virtuals
- virtual wxToolBarToolBase *DoAddTool
- (
- int toolid,
- const wxString& label,
- const wxBitmap& bitmap,
- const wxBitmap& bmpDisabled,
- wxItemKind kind,
- const wxString& shortHelp = wxEmptyString,
- const wxString& longHelp = wxEmptyString,
- wxObject *clientData = NULL,
- wxCoord xPos = -1,
- wxCoord yPos = -1
- );
-
- virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
- virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
-
- virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable);
- virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
- virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
-
- virtual wxToolBarToolBase *CreateTool(int winid,
- const wxString& label,
- const wxBitmap& bmpNormal,
- const wxBitmap& bmpDisabled,
- wxItemKind kind,
- wxObject *clientData,
- const wxString& shortHelp,
- const wxString& longHelp);
- virtual wxToolBarToolBase *CreateTool(wxControl *control);
-
- // helpers
- void DrawTool(wxToolBarToolBase *tool);
- virtual void DrawTool(wxDC& dc, wxToolBarToolBase *tool);
- virtual void SpringUpButton(int index);
-
- int m_currentRowsOrColumns;
-
- int m_pressedTool, m_currentTool;
-
- wxCoord m_lastX, m_lastY;
- wxCoord m_maxWidth, m_maxHeight;
- wxCoord m_xPos, m_yPos;
-
- // scrolling data
- int m_xScrollPixelsPerLine;
- int m_yScrollPixelsPerLine;
- bool m_xScrollingEnabled;
- bool m_yScrollingEnabled;
- int m_xScrollPosition;
- int m_yScrollPosition;
- int m_xScrollLines;
- int m_yScrollLines;
- int m_xScrollLinesPerPage;
- int m_yScrollLinesPerPage;
-
-private:
- DECLARE_EVENT_TABLE()
- DECLARE_DYNAMIC_CLASS_NO_COPY(wxToolBarSimple)
-};
-
-#endif // wxUSE_TOOLBAR_SIMPLE
-
-#endif
- // _WX_TBARSMPLH__
-
// wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar
// classes at all. Otherwise, use the native toolbar class unless
-// wxUSE_TOOLBAR_NATIVE is 0. Additionally, the generic toolbar class which
-// supports some features which might not be supported by the native wxToolBar
-// class may be compiled in if wxUSE_TOOLBAR_SIMPLE is 1.
+// wxUSE_TOOLBAR_NATIVE is 0.
//
// Default is 0 for all settings.
//
-// Recommended setting: 1 for wxUSE_TOOLBAR and 0 for wxUSE_TOOLBAR_NATIVE and
-// wxUSE_TOOLBAR_SIMPLE.
+// Recommended setting: 1 for wxUSE_TOOLBAR and 0 for wxUSE_TOOLBAR_NATIVE.
#define wxUSE_TOOLBAR 1
#define wxUSE_TOOLBAR_NATIVE 0
-#define wxUSE_TOOLBAR_SIMPLE 1
// this setting is obsolete, value is ignored
#define wxUSE_BUTTONBAR 0
+++ /dev/null
-/////////////////////////////////////////////////////////////////////////////
-// Name: generic/tbarsmpl.cpp
-// Purpose: wxToolBarSimple
-// Author: Julian Smart
-// Modified by: VZ on 14.12.99 during wxToolBarSimple reorganization
-// Created: 04/01/98
-// RCS-ID: $Id$
-// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "tbarsmpl.h"
-#endif
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
- #pragma hdrstop
-#endif
-
-#if wxUSE_TOOLBAR && wxUSE_TOOLBAR_SIMPLE
-
-#ifndef WX_PRECOMP
- #include "wx/settings.h"
- #include "wx/window.h"
- #include "wx/dcclient.h"
- #include "wx/dcmemory.h"
-#endif
-
-#include "wx/toolbar.h"
-#include "wx/tbarsmpl.h"
-
-// ----------------------------------------------------------------------------
-// private classes
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxToolBarToolSimple : public wxToolBarToolBase
-{
-public:
- wxToolBarToolSimple(wxToolBarSimple *tbar,
- int id,
- const wxString& label,
- const wxBitmap& bmpNormal,
- const wxBitmap& bmpDisabled,
- wxItemKind kind,
- wxObject *clientData,
- const wxString& shortHelp,
- const wxString& longHelp)
- : wxToolBarToolBase(tbar, id, label, bmpNormal, bmpDisabled, kind,
- clientData, shortHelp, longHelp)
- {
- }
-
- wxToolBarToolSimple(wxToolBarSimple *tbar, wxControl *control)
- : wxToolBarToolBase(tbar, control)
- {
- }
-
- void SetSize(const wxSize& size)
- {
- m_width = size.x;
- m_height = size.y;
- }
-
- wxCoord GetWidth() const { return m_width; }
- wxCoord GetHeight() const { return m_height; }
-
- wxCoord m_x;
- wxCoord m_y;
- wxCoord m_width;
- wxCoord m_height;
-
- DECLARE_NO_COPY_CLASS(wxToolBarToolSimple)
-};
-
-// ----------------------------------------------------------------------------
-// wxWin macros
-// ----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxToolBarSimple, wxControl)
-
-#if !wxUSE_TOOLBAR_NATIVE && !defined(__WXUNIVERSAL__)
- IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarSimple)
-#endif
-
-BEGIN_EVENT_TABLE(wxToolBarSimple, wxToolBarBase)
- EVT_SIZE(wxToolBarSimple::OnSize)
- EVT_SCROLL(wxToolBarSimple::OnScroll)
- EVT_PAINT(wxToolBarSimple::OnPaint)
- EVT_KILL_FOCUS(wxToolBarSimple::OnKillFocus)
- EVT_MOUSE_EVENTS(wxToolBarSimple::OnMouseEvent)
-END_EVENT_TABLE()
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// tool bar tools creation
-// ----------------------------------------------------------------------------
-
-wxToolBarToolBase *wxToolBarSimple::CreateTool(int id,
- const wxString& label,
- const wxBitmap& bmpNormal,
- const wxBitmap& bmpDisabled,
- wxItemKind kind,
- wxObject *clientData,
- const wxString& shortHelp,
- const wxString& longHelp)
-{
- return new wxToolBarToolSimple(this, id, label, bmpNormal, bmpDisabled,
- kind, clientData, shortHelp, longHelp);
-}
-
-wxToolBarToolBase *wxToolBarSimple::CreateTool(wxControl *control)
-{
- return new wxToolBarToolSimple(this, control);
-}
-
-// ----------------------------------------------------------------------------
-// wxToolBarSimple creation
-// ----------------------------------------------------------------------------
-
-void wxToolBarSimple::Init()
-{
- m_currentRowsOrColumns = 0;
-
- m_lastX =
- m_lastY = 0;
-
- m_maxWidth =
- m_maxHeight = 0;
-
- m_pressedTool =
- m_currentTool = -1;
-
- m_xPos =
- m_yPos = -1;
-
- m_toolPacking = 1;
- m_toolSeparation = 5;
-
- m_defaultWidth = 16;
- m_defaultHeight = 15;
-
- m_xScrollPixelsPerLine = 1;
- m_yScrollPixelsPerLine = 1;
- m_xScrollingEnabled = FALSE;
- m_yScrollingEnabled = FALSE;
- m_xScrollPosition = 0;
- m_yScrollPosition = 0;
- m_xScrollLines = 0;
- m_yScrollLines = 0;
- m_xScrollLinesPerPage = 0;
- m_yScrollLinesPerPage = 0;
-}
-
-wxToolBarToolBase *wxToolBarSimple::DoAddTool(int id,
- const wxString& label,
- const wxBitmap& bitmap,
- const wxBitmap& bmpDisabled,
- wxItemKind kind,
- const wxString& shortHelp,
- const wxString& longHelp,
- wxObject *clientData,
- wxCoord xPos,
- wxCoord yPos)
-{
- // rememeber the position for DoInsertTool()
- m_xPos = xPos;
- m_yPos = yPos;
-
- return wxToolBarBase::DoAddTool(id, label, bitmap, bmpDisabled, kind,
- shortHelp, longHelp,
- clientData, xPos, yPos);
-}
-
-bool wxToolBarSimple::DoInsertTool(size_t WXUNUSED(pos),
- wxToolBarToolBase *toolBase)
-{
- wxToolBarToolSimple *tool = (wxToolBarToolSimple *)toolBase;
-
- wxCHECK_MSG( !tool->IsControl(), FALSE,
- _T("generic wxToolBarSimple doesn't support controls") );
-
- tool->m_x = m_xPos;
- if ( tool->m_x == -1 )
- tool->m_x = m_xMargin;
-
- tool->m_y = m_yPos;
- if ( tool->m_y == -1 )
- tool->m_y = m_yMargin;
-
- tool->SetSize(GetToolSize());
-
- if ( tool->IsButton() )
- {
- // Calculate reasonable max size in case Layout() not called
- if ((tool->m_x + tool->GetNormalBitmap().GetWidth() + m_xMargin) > m_maxWidth)
- m_maxWidth = (wxCoord)((tool->m_x + tool->GetWidth() + m_xMargin));
-
- if ((tool->m_y + tool->GetNormalBitmap().GetHeight() + m_yMargin) > m_maxHeight)
- m_maxHeight = (wxCoord)((tool->m_y + tool->GetHeight() + m_yMargin));
- }
-
- return TRUE;
-}
-
-bool wxToolBarSimple::DoDeleteTool(size_t WXUNUSED(pos),
- wxToolBarToolBase *tool)
-{
- // VZ: didn't test whether it works, but why not...
- tool->Detach();
-
- Refresh();
-
- return TRUE;
-}
-
-bool wxToolBarSimple::Create(wxWindow *parent,
- wxWindowID id,
- const wxPoint& pos,
- const wxSize& size,
- long style,
- const wxString& name)
-{
- if ( !wxWindow::Create(parent, id, pos, size, style, name) )
- return FALSE;
-
- // Set it to grey (or other 3D face colour)
- SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
-
- if ( GetWindowStyleFlag() & wxTB_VERTICAL )
- {
- m_lastX = 7;
- m_lastY = 3;
-
- m_maxRows = 32000; // a lot
- m_maxCols = 1;
- }
- else
- {
- m_lastX = 3;
- m_lastY = 7;
-
- m_maxRows = 1;
- m_maxCols = 32000; // a lot
- }
-
- SetCursor(*wxSTANDARD_CURSOR);
-
- return TRUE;
-}
-
-wxToolBarSimple::~wxToolBarSimple()
-{
-}
-
-bool wxToolBarSimple::Realize()
-{
- m_currentRowsOrColumns = 0;
- m_lastX = m_xMargin;
- m_lastY = m_yMargin;
- m_maxWidth = 0;
- m_maxHeight = 0;
-
- int maxToolWidth = 0;
- int maxToolHeight = 0;
-
- // Find the maximum tool width and height
- wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
- while ( node )
- {
- wxToolBarToolSimple *tool = (wxToolBarToolSimple *)node->GetData();
- if ( tool->GetWidth() > maxToolWidth )
- maxToolWidth = tool->GetWidth();
- if (tool->GetHeight() > maxToolHeight)
- maxToolHeight = tool->GetHeight();
-
- node = node->GetNext();
- }
-
- int separatorSize = m_toolSeparation;
-
- node = m_tools.GetFirst();
- while ( node )
- {
- wxToolBarToolSimple *tool = (wxToolBarToolSimple *)node->GetData();
- if ( tool->IsSeparator() )
- {
- if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
- {
- if (m_currentRowsOrColumns >= m_maxCols)
- m_lastY += separatorSize;
- else
- m_lastX += separatorSize;
- }
- else
- {
- if (m_currentRowsOrColumns >= m_maxRows)
- m_lastX += separatorSize;
- else
- m_lastY += separatorSize;
- }
- }
- else if ( tool->IsButton() )
- {
- if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
- {
- if (m_currentRowsOrColumns >= m_maxCols)
- {
- m_currentRowsOrColumns = 0;
- m_lastX = m_xMargin;
- m_lastY += maxToolHeight + m_toolPacking;
- }
- tool->m_x = (wxCoord)(m_lastX + (maxToolWidth - tool->GetWidth())/2.0);
- tool->m_y = (wxCoord)(m_lastY + (maxToolHeight - tool->GetHeight())/2.0);
-
- m_lastX += maxToolWidth + m_toolPacking;
- }
- else
- {
- if (m_currentRowsOrColumns >= m_maxRows)
- {
- m_currentRowsOrColumns = 0;
- m_lastX += (maxToolWidth + m_toolPacking);
- m_lastY = m_yMargin;
- }
- tool->m_x = (wxCoord)(m_lastX + (maxToolWidth - tool->GetWidth())/2.0);
- tool->m_y = (wxCoord)(m_lastY + (maxToolHeight - tool->GetHeight())/2.0);
-
- m_lastY += maxToolHeight + m_toolPacking;
- }
- m_currentRowsOrColumns ++;
- }
- else
- {
- // TODO: support the controls
- }
-
- if (m_lastX > m_maxWidth)
- m_maxWidth = m_lastX;
- if (m_lastY > m_maxHeight)
- m_maxHeight = m_lastY;
-
- node = node->GetNext();
- }
-
- if ( GetWindowStyleFlag() & wxTB_HORIZONTAL )
- m_maxHeight += maxToolHeight;
- else
- m_maxWidth += maxToolWidth;
-
- m_maxWidth += m_xMargin;
- m_maxHeight += m_yMargin;
-
- SetSize(m_maxWidth, m_maxHeight);
-
- return TRUE;
-}
-
-// ----------------------------------------------------------------------------
-// event handlers
-// ----------------------------------------------------------------------------
-
-void wxToolBarSimple::OnPaint (wxPaintEvent& WXUNUSED(event))
-{
- wxPaintDC dc(this);
- PrepareDC(dc);
-
- static int count = 0;
- // Prevent reentry of OnPaint which would cause wxMemoryDC errors.
- if ( count > 0 )
- return;
- count++;
-
- for ( wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
- node;
- node = node->GetNext() )
- {
- wxToolBarToolBase *tool = node->GetData();
- if ( tool->IsButton() )
- DrawTool(dc, tool);
- }
-
- count--;
-}
-
-void wxToolBarSimple::OnSize (wxSizeEvent& WXUNUSED(event))
-{
-#if wxUSE_CONSTRAINTS
- if (GetAutoLayout())
- Layout();
-#endif
-
- AdjustScrollbars();
-}
-
-void wxToolBarSimple::OnKillFocus(wxFocusEvent& WXUNUSED(event))
-{
- OnMouseEnter(m_pressedTool = m_currentTool = -1);
-}
-
-void wxToolBarSimple::OnMouseEvent(wxMouseEvent & event)
-{
- wxCoord x, y;
- event.GetPosition(&x, &y);
- wxToolBarToolSimple *tool = (wxToolBarToolSimple *)FindToolForPosition(x, y);
-
- if (event.LeftDown())
- {
- CaptureMouse();
- }
- if (event.LeftUp())
- {
- ReleaseMouse();
- }
-
- if (!tool)
- {
- if (m_currentTool > -1)
- {
- if (event.LeftIsDown())
- SpringUpButton(m_currentTool);
- m_currentTool = -1;
- OnMouseEnter(-1);
- }
- return;
- }
-
- if (!event.IsButton())
- {
- if ( tool->GetId() != m_currentTool )
- {
- // If the left button is kept down and moved over buttons,
- // press those buttons.
- if ( event.LeftIsDown() && tool->IsEnabled() )
- {
- SpringUpButton(m_currentTool);
-
- if ( tool->CanBeToggled() )
- {
- tool->Toggle();
- }
-
- DrawTool(tool);
- }
-
- m_currentTool = tool->GetId();
- OnMouseEnter(m_currentTool);
- }
- return;
- }
-
- // Left button pressed.
- if ( event.LeftDown() && tool->IsEnabled() )
- {
- if ( tool->CanBeToggled() )
- {
- tool->Toggle();
- }
-
- DrawTool(tool);
- }
- else if (event.RightDown())
- {
- OnRightClick(tool->GetId(), x, y);
- }
-
- // Left Button Released. Only this action confirms selection.
- // If the button is enabled and it is not a toggle tool and it is
- // in the pressed state, then raise the button and call OnLeftClick.
- //
- if ( event.LeftUp() && tool->IsEnabled() )
- {
- // Pass the OnLeftClick event to tool
- if ( !OnLeftClick(tool->GetId(), tool->IsToggled()) &&
- tool->CanBeToggled() )
- {
- // If it was a toggle, and OnLeftClick says No Toggle allowed,
- // then change it back
- tool->Toggle();
- }
-
- DrawTool(tool);
- }
-}
-
-// ----------------------------------------------------------------------------
-// drawing
-// ----------------------------------------------------------------------------
-
-void wxToolBarSimple::DrawTool(wxToolBarToolBase *tool)
-{
- wxClientDC dc(this);
- DrawTool(dc, tool);
-}
-
-void wxToolBarSimple::DrawTool(wxDC& dc, wxToolBarToolBase *toolBase)
-{
- wxToolBarToolSimple *tool = (wxToolBarToolSimple *)toolBase;
-
- wxMemoryDC memDC;
- PrepareDC(dc);
-
- wxPen dark_grey_pen(wxColour( 85,85,85 ), 1, wxSOLID);
- wxPen white_pen(wxT("WHITE"), 1, wxSOLID);
- wxPen black_pen(wxT("BLACK"), 1, wxSOLID);
-
- wxBitmap bitmap = tool->GetNormalBitmap();
- if (!bitmap.Ok())
- return;
-
- if ( !tool->IsToggled() )
- {
-#if wxUSE_PALETTE
-#ifndef __WXGTK__
- if (bitmap.GetPalette())
- memDC.SetPalette(*bitmap.GetPalette());
-#endif
-#endif // wxUSE_PALETTE
-
- int ax = (int)tool->m_x,
- ay = (int)tool->m_y,
- bx = (int)(tool->m_x+tool->GetWidth()),
- by = (int)(tool->m_y+tool->GetHeight());
-
- memDC.SelectObject(bitmap);
- if (m_windowStyle & wxTB_3DBUTTONS)
- {
- dc.SetClippingRegion(ax, ay, (bx-ax+1), (by-ay+1));
- dc.Blit((ax+1), (ay+1), (bx-ax-2), (by-ay-2), &memDC, 0, 0);
- wxPen * old_pen = & dc.GetPen();
- dc.SetPen( white_pen );
- dc.DrawLine(ax,(by-1),ax,ay);
- dc.DrawLine(ax,ay,(bx-1),ay);
- dc.SetPen( dark_grey_pen );
- dc.DrawLine((bx-1),(ay+1),(bx-1),(by-1));
- dc.DrawLine((bx-1),(by-1),(ax+1),(by-1));
- dc.SetPen( black_pen );
- dc.DrawLine(bx,ay,bx,by);
- dc.DrawLine(bx,by,ax,by);
- dc.SetPen( *old_pen );
- dc.DestroyClippingRegion();
- // Select bitmap out of the DC
- }
- else
- {
- dc.Blit(tool->m_x, tool->m_y,
- bitmap.GetWidth(), bitmap.GetHeight(),
- &memDC, 0, 0);
- }
- memDC.SelectObject(wxNullBitmap);
-
-#if wxUSE_PALETTE
-#ifndef __WXGTK__
- if (bitmap.GetPalette())
- memDC.SetPalette(wxNullPalette);
-#endif
-#endif // wxUSE_PALETTE
- }
- // No second bitmap, so draw a thick line around bitmap, or invert if mono
- else if ( tool->IsToggled() )
- {
- bool drawBorder = FALSE;
-#ifdef __X__ // X doesn't invert properly on colour
- drawBorder = wxColourDisplay();
-#else // Inversion works fine under Windows
- drawBorder = FALSE;
-#endif
-
- if (!drawBorder)
- {
- memDC.SelectObject(tool->GetNormalBitmap());
- dc.Blit(tool->m_x, tool->m_y, tool->GetWidth(), tool->GetHeight(),
- &memDC, 0, 0, wxSRC_INVERT);
- memDC.SelectObject(wxNullBitmap);
- }
- else
- {
- bitmap = tool->GetNormalBitmap();
-
- if (m_windowStyle & wxTB_3DBUTTONS)
- {
- int ax = (int)tool->m_x,
- ay = (int)tool->m_y,
- bx = (int)(tool->m_x+tool->GetWidth()),
- by = (int)(tool->m_y+tool->GetHeight());
-
- memDC.SelectObject(bitmap);
- dc.SetClippingRegion(ax, ay, (bx-ax+1), (by-ay+1));
- dc.Blit((ax+2), (ay+2), (bx-ax-2), (by-ay-2), &memDC, 0, 0);
- wxPen * old_pen = & dc.GetPen();
- dc.SetPen( black_pen );
- dc.DrawLine(ax,(by-1),ax,ay);
- dc.DrawLine(ax,ay,(bx-1),ay);
- dc.SetPen( dark_grey_pen );
- dc.DrawLine((ax+1),(by-2),(ax+1),(ay+1));
- dc.DrawLine((ax+1),(ay+1),(bx-2),(ay+1));
- dc.SetPen( white_pen );
- dc.DrawLine(bx,ay,bx,by);
- dc.DrawLine(bx,by,ax,by);
- dc.SetPen( *old_pen );
- dc.DestroyClippingRegion();
- memDC.SelectObject(wxNullBitmap);
- }
- else
- {
- wxCoord x = tool->m_x;
- wxCoord y = tool->m_y;
- wxCoord w = bitmap.GetWidth();
- wxCoord h = bitmap.GetHeight();
- wxPen thick_black_pen(wxT("BLACK"), 3, wxSOLID);
-
- memDC.SelectObject(bitmap);
- dc.SetClippingRegion(tool->m_x, tool->m_y, w, h);
- dc.Blit(tool->m_x, tool->m_y, w, h,
- &memDC, 0, 0);
- dc.SetPen(thick_black_pen);
- dc.SetBrush(*wxTRANSPARENT_BRUSH);
- dc.DrawRectangle(x, y, w-1, h-1);
- dc.DestroyClippingRegion();
- memDC.SelectObject(wxNullBitmap);
- }
- }
- }
-}
-
-// ----------------------------------------------------------------------------
-// toolbar geometry
-// ----------------------------------------------------------------------------
-
-void wxToolBarSimple::SetRows(int nRows)
-{
- wxCHECK_RET( nRows != 0, _T("max number of rows must be > 0") );
-
- m_maxCols = (GetToolsCount() + nRows - 1) / nRows;
-
- AdjustScrollbars();
- Refresh();
-}
-
-wxToolBarToolBase *wxToolBarSimple::FindToolForPosition(wxCoord x,
- wxCoord y) const
-{
- wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst();
- while (node)
- {
- wxToolBarToolSimple *tool = (wxToolBarToolSimple *)node->GetData();
- if ((x >= tool->m_x) && (y >= tool->m_y) &&
- (x <= (tool->m_x + tool->GetWidth())) &&
- (y <= (tool->m_y + tool->GetHeight())))
- {
- return tool;
- }
-
- node = node->GetNext();
- }
-
- return (wxToolBarToolBase *)NULL;
-}
-
-// ----------------------------------------------------------------------------
-// tool state change handlers
-// ----------------------------------------------------------------------------
-
-void wxToolBarSimple::DoEnableTool(wxToolBarToolBase *tool,
- bool WXUNUSED(enable))
-{
- DrawTool(tool);
-}
-
-void wxToolBarSimple::DoToggleTool(wxToolBarToolBase *tool,
- bool WXUNUSED(toggle))
-{
- DrawTool(tool);
-}
-
-void wxToolBarSimple::DoSetToggle(wxToolBarToolBase * WXUNUSED(tool),
- bool WXUNUSED(toggle))
-{
- // nothing to do
-}
-
-// Okay, so we've left the tool we're in ... we must check if the tool we're
-// leaving was a 'sprung push button' and if so, spring it back to the up
-// state.
-void wxToolBarSimple::SpringUpButton(int id)
-{
- wxToolBarToolBase *tool = FindById(id);
-
- if ( tool && tool->CanBeToggled() )
- {
- if (tool->IsToggled())
- tool->Toggle();
-
- DrawTool(tool);
- }
-}
-
-// ----------------------------------------------------------------------------
-// scrolling implementation
-// ----------------------------------------------------------------------------
-
-/*
- * pixelsPerUnitX/pixelsPerUnitY: number of pixels per unit (e.g. pixels per text line)
- * noUnitsX/noUnitsY: : no. units per scrollbar
- */
-void wxToolBarSimple::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY,
- int noUnitsX, int noUnitsY,
- int xPos, int yPos)
-{
- m_xScrollPixelsPerLine = pixelsPerUnitX;
- m_yScrollPixelsPerLine = pixelsPerUnitY;
- m_xScrollLines = noUnitsX;
- m_yScrollLines = noUnitsY;
-
- int w, h;
- GetSize(&w, &h);
-
- // Recalculate scroll bar range and position
- if (m_xScrollLines > 0)
- {
- m_xScrollPosition = xPos;
- SetScrollPos (wxHORIZONTAL, m_xScrollPosition, TRUE);
- }
- else
- {
- SetScrollbar(wxHORIZONTAL, 0, 0, 0, FALSE);
- m_xScrollPosition = 0;
- }
-
- if (m_yScrollLines > 0)
- {
- m_yScrollPosition = yPos;
- SetScrollPos (wxVERTICAL, m_yScrollPosition, TRUE);
- }
- else
- {
- SetScrollbar(wxVERTICAL, 0, 0, 0, FALSE);
- m_yScrollPosition = 0;
- }
- AdjustScrollbars();
- Refresh();
-
-#if 0 //def __WXMSW__
- ::UpdateWindow ((HWND) GetHWND());
-#endif
-}
-
-void wxToolBarSimple::OnScroll(wxScrollEvent& event)
-{
- int orient = event.GetOrientation();
-
- int nScrollInc = CalcScrollInc(event);
- if (nScrollInc == 0)
- return;
-
- if (orient == wxHORIZONTAL)
- {
- int newPos = m_xScrollPosition + nScrollInc;
- SetScrollPos(wxHORIZONTAL, newPos, TRUE );
- }
- else
- {
- int newPos = m_yScrollPosition + nScrollInc;
- SetScrollPos(wxVERTICAL, newPos, TRUE );
- }
-
- if (orient == wxHORIZONTAL)
- {
- if (m_xScrollingEnabled)
- ScrollWindow(-m_xScrollPixelsPerLine * nScrollInc, 0, NULL);
- else
- Refresh();
- }
- else
- {
- if (m_yScrollingEnabled)
- ScrollWindow(0, -m_yScrollPixelsPerLine * nScrollInc, NULL);
- else
- Refresh();
- }
-
- if (orient == wxHORIZONTAL)
- {
- m_xScrollPosition += nScrollInc;
- }
- else
- {
- m_yScrollPosition += nScrollInc;
- }
-
-}
-
-int wxToolBarSimple::CalcScrollInc(wxScrollEvent& event)
-{
- int pos = event.GetPosition();
- int orient = event.GetOrientation();
-
- int nScrollInc = 0;
- if (event.GetEventType() == wxEVT_SCROLL_TOP)
- {
- if (orient == wxHORIZONTAL)
- nScrollInc = - m_xScrollPosition;
- else
- nScrollInc = - m_yScrollPosition;
- } else
- if (event.GetEventType() == wxEVT_SCROLL_BOTTOM)
- {
- if (orient == wxHORIZONTAL)
- nScrollInc = m_xScrollLines - m_xScrollPosition;
- else
- nScrollInc = m_yScrollLines - m_yScrollPosition;
- } else
- if (event.GetEventType() == wxEVT_SCROLL_LINEUP)
- {
- nScrollInc = -1;
- } else
- if (event.GetEventType() == wxEVT_SCROLL_LINEDOWN)
- {
- nScrollInc = 1;
- } else
- if (event.GetEventType() == wxEVT_SCROLL_PAGEUP)
- {
- if (orient == wxHORIZONTAL)
- nScrollInc = -GetScrollPageSize(wxHORIZONTAL);
- else
- nScrollInc = -GetScrollPageSize(wxVERTICAL);
- } else
- if (event.GetEventType() == wxEVT_SCROLL_PAGEDOWN)
- {
- if (orient == wxHORIZONTAL)
- nScrollInc = GetScrollPageSize(wxHORIZONTAL);
- else
- nScrollInc = GetScrollPageSize(wxVERTICAL);
- } else
- if ((event.GetEventType() == wxEVT_SCROLL_THUMBTRACK) ||
- (event.GetEventType() == wxEVT_SCROLL_THUMBRELEASE))
- {
- if (orient == wxHORIZONTAL)
- nScrollInc = pos - m_xScrollPosition;
- else
- nScrollInc = pos - m_yScrollPosition;
- }
-
- if (orient == wxHORIZONTAL)
- {
- int w, h;
- GetClientSize(&w, &h);
-
- int nMaxWidth = m_xScrollLines*m_xScrollPixelsPerLine;
- int noPositions = (int) ( ((nMaxWidth - w)/(float)m_xScrollPixelsPerLine) + 0.5 );
- if (noPositions < 0)
- noPositions = 0;
-
- if ( (m_xScrollPosition + nScrollInc) < 0 )
- nScrollInc = -m_xScrollPosition; // As -ve as we can go
- else if ( (m_xScrollPosition + nScrollInc) > noPositions )
- nScrollInc = noPositions - m_xScrollPosition; // As +ve as we can go
-
- return nScrollInc;
- }
- else
- {
- int w, h;
- GetClientSize(&w, &h);
-
- int nMaxHeight = m_yScrollLines*m_yScrollPixelsPerLine;
- int noPositions = (int) ( ((nMaxHeight - h)/(float)m_yScrollPixelsPerLine) + 0.5 );
- if (noPositions < 0)
- noPositions = 0;
-
- if ( (m_yScrollPosition + nScrollInc) < 0 )
- nScrollInc = -m_yScrollPosition; // As -ve as we can go
- else if ( (m_yScrollPosition + nScrollInc) > noPositions )
- nScrollInc = noPositions - m_yScrollPosition; // As +ve as we can go
-
- return nScrollInc;
- }
-}
-
-// Adjust the scrollbars - new version.
-void wxToolBarSimple::AdjustScrollbars()
-{
- int w, h;
- GetClientSize(&w, &h);
-
- // Recalculate scroll bar range and position
- if (m_xScrollLines > 0)
- {
- int nMaxWidth = m_xScrollLines*m_xScrollPixelsPerLine;
- int newRange = (int) ( ((nMaxWidth)/(float)m_xScrollPixelsPerLine) + 0.5 );
- if (newRange < 0)
- newRange = 0;
-
- m_xScrollPosition = wxMin(newRange, m_xScrollPosition);
-
- // Calculate page size i.e. number of scroll units you get on the
- // current client window
- int noPagePositions = (int) ( (w/(float)m_xScrollPixelsPerLine) + 0.5 );
- if (noPagePositions < 1)
- noPagePositions = 1;
-
- SetScrollbar(wxHORIZONTAL, m_xScrollPosition, noPagePositions, newRange);
- SetScrollPageSize(wxHORIZONTAL, noPagePositions);
- }
- if (m_yScrollLines > 0)
- {
- int nMaxHeight = m_yScrollLines*m_yScrollPixelsPerLine;
- int newRange = (int) ( ((nMaxHeight)/(float)m_yScrollPixelsPerLine) + 0.5 );
- if (newRange < 0)
- newRange = 0;
-
- m_yScrollPosition = wxMin(newRange, m_yScrollPosition);
-
- // Calculate page size i.e. number of scroll units you get on the
- // current client window
- int noPagePositions = (int) ( (h/(float)m_yScrollPixelsPerLine) + 0.5 );
- if (noPagePositions < 1)
- noPagePositions = 1;
-
- SetScrollbar(wxVERTICAL, m_yScrollPosition, noPagePositions, newRange);
- SetScrollPageSize(wxVERTICAL, noPagePositions);
- }
-}
-
-// Prepare the DC by translating it according to the current scroll position
-void wxToolBarSimple::PrepareDC(wxDC& dc)
-{
- dc.SetDeviceOrigin(- m_xScrollPosition * m_xScrollPixelsPerLine, - m_yScrollPosition * m_yScrollPixelsPerLine);
-}
-
-void wxToolBarSimple::GetScrollPixelsPerUnit (int *x_unit, int *y_unit) const
-{
- *x_unit = m_xScrollPixelsPerLine;
- *y_unit = m_yScrollPixelsPerLine;
-}
-
-int wxToolBarSimple::GetScrollPageSize(int orient) const
-{
- if ( orient == wxHORIZONTAL )
- return m_xScrollLinesPerPage;
- else
- return m_yScrollLinesPerPage;
-}
-
-void wxToolBarSimple::SetScrollPageSize(int orient, int pageSize)
-{
- if ( orient == wxHORIZONTAL )
- m_xScrollLinesPerPage = pageSize;
- else
- m_yScrollLinesPerPage = pageSize;
-}
-
-/*
- * Scroll to given position (scroll position, not pixel position)
- */
-void wxToolBarSimple::Scroll (int x_pos, int y_pos)
-{
- int old_x, old_y;
- ViewStart (&old_x, &old_y);
- if (((x_pos == -1) || (x_pos == old_x)) && ((y_pos == -1) || (y_pos == old_y)))
- return;
-
- if (x_pos > -1)
- {
- m_xScrollPosition = x_pos;
- SetScrollPos (wxHORIZONTAL, x_pos, TRUE);
- }
- if (y_pos > -1)
- {
- m_yScrollPosition = y_pos;
- SetScrollPos (wxVERTICAL, y_pos, TRUE);
- }
- Refresh();
-
-#if 0 //def __WXMSW__
- UpdateWindow ((HWND) GetHWND());
-#endif
-}
-
-void wxToolBarSimple::EnableScrolling (bool x_scroll, bool y_scroll)
-{
- m_xScrollingEnabled = x_scroll;
- m_yScrollingEnabled = y_scroll;
-}
-
-void wxToolBarSimple::GetVirtualSize (int *x, int *y) const
-{
- *x = m_xScrollPixelsPerLine * m_xScrollLines;
- *y = m_yScrollPixelsPerLine * m_yScrollLines;
-}
-
-// Where the current view starts from
-void wxToolBarSimple::ViewStart (int *x, int *y) const
-{
- *x = m_xScrollPosition;
- *y = m_yScrollPosition;
-}
-
-#endif // wxUSE_TOOLBAR_SIMPLE
projects / wxWidgets.git / commitdiff
