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

Moved wxToolBarSimple to deprecated library

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-08-17 10:20:08 +00:00
parent 1d42ad9a21
commit 8a82c9ecc9
26 changed files with 195 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
build/msw/makefile.bcc
View File

@@ -364,15 +364,14 @@ HTMLLIB_OBJECTS = \
$(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 \
@@ -1077,7 +1076,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(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 \
@@ -1270,7 +1268,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(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 \
@@ -1460,7 +1457,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(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 \
@@ -1653,7 +1649,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(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 \
@@ -1843,7 +1838,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(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 \
@@ -2036,7 +2030,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(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 \
@@ -2226,7 +2219,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(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 \
@@ -2419,7 +2411,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(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 \
@@ -2584,11 +2575,11 @@ __netdll___depname = \
__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
@@ -4096,11 +4087,6 @@ $(OBJS)\coredll_tbarbase.obj: ..\..\src\common\tbarbase.cpp
$(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) $**
@@ -5210,11 +5196,6 @@ $(OBJS)\corelib_tbarbase.obj: ..\..\src\common\tbarbase.cpp
$(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) $**
@@ -6768,11 +6749,6 @@ $(OBJS)\monodll_tbarbase.obj: ..\..\src\common\tbarbase.cpp
$(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) $**
@@ -8221,11 +8197,6 @@ $(OBJS)\monolib_tbarbase.obj: ..\..\src\common\tbarbase.cpp
$(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) $**
@@ -9058,7 +9029,7 @@ $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_net.lib: $(OBJS)\netlib_dum
|
!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,,
@@ -9066,7 +9037,7 @@ $(LIBDIRNAME)\wxbase250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_bcc$(VENDORTAG).dll:
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 $@ @&&|