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

Fix wxGTK1 link after toolbar files renaming.

Browse Source 
Fix a typo in r62849: tooltip.cpp was used instead of toolbar.cpp resulting in
linking errors for the duplicate symbols in the former and undefined symbols
in the latter.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-04-26 14:19:22 +00:00
parent c59aa14a6c
commit be2b08ebc8
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile.in
View File

@@ -2737,7 +2737,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION__GUI_HDR = \
wx/gtk1/statbox.h \ wx/gtk1/statbox.h \
wx/gtk1/statline.h \ wx/gtk1/statline.h \
wx/gtk1/stattext.h \ wx/gtk1/stattext.h \
wx/gtk1/tooltip.h \ wx/gtk1/toolbar.h \
wx/gtk1/textctrl.h \ wx/gtk1/textctrl.h \
wx/gtk1/tglbtn.h \ wx/gtk1/tglbtn.h \
wx/gtk1/treectrl.h wx/gtk1/treectrl.h
@@ -5030,7 +5030,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS = \
monodll_gtk1_statbox.o \ monodll_gtk1_statbox.o \
monodll_gtk1_statline.o \ monodll_gtk1_statline.o \
monodll_gtk1_stattext.o \ monodll_gtk1_stattext.o \
monodll_gtk1_tooltip.o \ monodll_gtk1_toolbar.o \
monodll_gtk1_textctrl.o \ monodll_gtk1_textctrl.o \
monodll_gtk1_tglbtn.o monodll_gtk1_tglbtn.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS)
@@ -6867,7 +6867,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_1 = \
monolib_gtk1_statbox.o \ monolib_gtk1_statbox.o \
monolib_gtk1_statline.o \ monolib_gtk1_statline.o \
monolib_gtk1_stattext.o \ monolib_gtk1_stattext.o \
monolib_gtk1_tooltip.o \ monolib_gtk1_toolbar.o \
monolib_gtk1_textctrl.o \ monolib_gtk1_textctrl.o \
monolib_gtk1_tglbtn.o monolib_gtk1_tglbtn.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_1) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_1)
@@ -8893,7 +8893,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_2 = \
coredll_gtk1_statbox.o \ coredll_gtk1_statbox.o \
coredll_gtk1_statline.o \ coredll_gtk1_statline.o \
coredll_gtk1_stattext.o \ coredll_gtk1_stattext.o \
coredll_gtk1_tooltip.o \ coredll_gtk1_toolbar.o \
coredll_gtk1_textctrl.o \ coredll_gtk1_textctrl.o \
coredll_gtk1_tglbtn.o coredll_gtk1_tglbtn.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_2) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_2)
@@ -10403,7 +10403,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_3 = \
corelib_gtk1_statbox.o \ corelib_gtk1_statbox.o \
corelib_gtk1_statline.o \ corelib_gtk1_statline.o \
corelib_gtk1_stattext.o \ corelib_gtk1_stattext.o \
corelib_gtk1_tooltip.o \ corelib_gtk1_toolbar.o \
corelib_gtk1_textctrl.o \ corelib_gtk1_textctrl.o \
corelib_gtk1_tglbtn.o corelib_gtk1_tglbtn.o
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_3) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_@__GUI_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION____GUI_SRC_OBJECTS_3)
@@ -15405,6 +15405,9 @@ monodll_gtk1_statline.o: $(srcdir)/src/gtk1/statline.cpp $(MONODLL_ODEP)
monodll_gtk1_stattext.o: $(srcdir)/src/gtk1/stattext.cpp $(MONODLL_ODEP) monodll_gtk1_stattext.o: $(srcdir)/src/gtk1/stattext.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/stattext.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/stattext.cpp
monodll_gtk1_toolbar.o: $(srcdir)/src/gtk1/toolbar.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/toolbar.cpp
monodll_gtk1_textctrl.o: $(srcdir)/src/gtk1/textctrl.cpp $(MONODLL_ODEP) monodll_gtk1_textctrl.o: $(srcdir)/src/gtk1/textctrl.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/textctrl.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/textctrl.cpp
@@ -20259,6 +20262,9 @@ monolib_gtk1_statline.o: $(srcdir)/src/gtk1/statline.cpp $(MONOLIB_ODEP)
monolib_gtk1_stattext.o: $(srcdir)/src/gtk1/stattext.cpp $(MONOLIB_ODEP) monolib_gtk1_stattext.o: $(srcdir)/src/gtk1/stattext.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/stattext.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/stattext.cpp
monolib_gtk1_toolbar.o: $(srcdir)/src/gtk1/toolbar.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/toolbar.cpp
monolib_gtk1_textctrl.o: $(srcdir)/src/gtk1/textctrl.cpp $(MONOLIB_ODEP) monolib_gtk1_textctrl.o: $(srcdir)/src/gtk1/textctrl.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/textctrl.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/textctrl.cpp
@@ -25830,6 +25836,9 @@ coredll_gtk1_statline.o: $(srcdir)/src/gtk1/statline.cpp $(COREDLL_ODEP)
coredll_gtk1_stattext.o: $(srcdir)/src/gtk1/stattext.cpp $(COREDLL_ODEP) coredll_gtk1_stattext.o: $(srcdir)/src/gtk1/stattext.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/stattext.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/stattext.cpp
coredll_gtk1_toolbar.o: $(srcdir)/src/gtk1/toolbar.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/toolbar.cpp
coredll_gtk1_textctrl.o: $(srcdir)/src/gtk1/textctrl.cpp $(COREDLL_ODEP) coredll_gtk1_textctrl.o: $(srcdir)/src/gtk1/textctrl.cpp $(COREDLL_ODEP)
$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/textctrl.cpp $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/textctrl.cpp
@@ -29409,6 +29418,9 @@ corelib_gtk1_statline.o: $(srcdir)/src/gtk1/statline.cpp $(CORELIB_ODEP)
corelib_gtk1_stattext.o: $(srcdir)/src/gtk1/stattext.cpp $(CORELIB_ODEP) corelib_gtk1_stattext.o: $(srcdir)/src/gtk1/stattext.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/stattext.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/stattext.cpp
corelib_gtk1_toolbar.o: $(srcdir)/src/gtk1/toolbar.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/toolbar.cpp
corelib_gtk1_textctrl.o: $(srcdir)/src/gtk1/textctrl.cpp $(CORELIB_ODEP) corelib_gtk1_textctrl.o: $(srcdir)/src/gtk1/textctrl.cpp $(CORELIB_ODEP)
$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/textctrl.cpp $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/textctrl.cpp

4
build/bakefiles/files.bkl
View File

@@ -1305,7 +1305,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/gtk1/statbox.cpp src/gtk1/statbox.cpp
src/gtk1/statline.cpp src/gtk1/statline.cpp
src/gtk1/stattext.cpp src/gtk1/stattext.cpp
src/gtk1/tooltip.cpp src/gtk1/toolbar.cpp
src/gtk1/textctrl.cpp src/gtk1/textctrl.cpp
src/gtk1/tglbtn.cpp src/gtk1/tglbtn.cpp
</set> </set>
@@ -1351,7 +1351,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/gtk1/statbox.h wx/gtk1/statbox.h
wx/gtk1/statline.h wx/gtk1/statline.h
wx/gtk1/stattext.h wx/gtk1/stattext.h
wx/gtk1/tooltip.h wx/gtk1/toolbar.h
wx/gtk1/textctrl.h wx/gtk1/textctrl.h
wx/gtk1/tglbtn.h wx/gtk1/tglbtn.h
wx/gtk1/treectrl.h wx/gtk1/treectrl.h