From 742df99230329b2c072c2adcc27fd3cc541d2833 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 5 May 2010 12:20:08 +0000
Subject: [PATCH] Move wxInfoBar to core library from adv.

This is necessary in order to be able to use it in the print preview (an
upcoming change).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 Makefile.in                  | 116 +++++++++++++++++------------------
 build/bakefiles/files.bkl    |  14 ++---
 build/msw/makefile.bcc       |  52 ++++++++--------
 build/msw/makefile.gcc       |  52 ++++++++--------
 build/msw/makefile.vc        |  52 ++++++++--------
 build/msw/makefile.wat       |  52 ++++++++--------
 build/msw/wx_adv.dsp         |  12 ----
 build/msw/wx_core.dsp        |   4 ++
 build/msw/wx_vc7_adv.vcproj  |   9 ---
 build/msw/wx_vc7_core.vcproj |   3 +
 build/msw/wx_vc8_adv.vcproj  |  12 ----
 build/msw/wx_vc8_core.vcproj |   4 ++
 build/msw/wx_vc9_adv.vcproj  |  12 ----
 build/msw/wx_vc9_core.vcproj |   4 ++
 include/wx/generic/infobar.h |   2 +-
 include/wx/gtk/infobar.h     |   2 +-
 include/wx/infobar.h         |   2 +-
 interface/wx/infobar.h       |   2 +-
 18 files changed, 195 insertions(+), 211 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index b4fc200a67..9ed99f4424 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2771,13 +2771,14 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_GUI_HDR =  \
 	wx/gtk/gauge.h \
 	wx/gtk/gnome/gprint.h \
 	wx/gtk/gnome/gvfs.h \
-	wx/gtk/print.h \
+	wx/gtk/infobar.h \
 	wx/gtk/listbox.h \
 	wx/gtk/mdi.h \
 	wx/gtk/menu.h \
 	wx/gtk/menuitem.h \
 	wx/gtk/msgdlg.h \
 	wx/gtk/notebook.h \
+	wx/gtk/print.h \
 	wx/gtk/radiobox.h \
 	wx/gtk/radiobut.h \
 	wx/gtk/scrolbar.h \
@@ -3470,8 +3471,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_NATIVE_HDR =  \
 	wx/gtk/dataview.h \
 	wx/gtk/dvrenderer.h \
 	wx/gtk/dvrenderers.h \
-	wx/gtk/hyperlink.h \
-	wx/gtk/infobar.h
+	wx/gtk/hyperlink.h
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ADVANCED_PLATFORM_NATIVE_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_NATIVE_HDR)
 @COND_TOOLKIT_MSW@ADVANCED_PLATFORM_NATIVE_HDR = \
 @COND_TOOLKIT_MSW@	wx/generic/animate.h wx/msw/bmpcbox.h wx/msw/calctrl.h \
@@ -3503,7 +3503,6 @@ COND_WXUNIV_0_ADVANCED_HDR =  \
 	wx/generic/gridsel.h \
 	wx/generic/helpext.h \
 	wx/generic/hyperlink.h \
-	wx/generic/infobar.h \
 	wx/generic/laywin.h \
 	wx/generic/notifmsg.h \
 	wx/generic/propdlg.h \
@@ -3512,7 +3511,6 @@ COND_WXUNIV_0_ADVANCED_HDR =  \
 	wx/generic/wizard.h \
 	wx/grid.h \
 	wx/hyperlink.h \
-	wx/infobar.h \
 	wx/joystick.h \
 	wx/laywin.h \
 	wx/notifmsg.h \
@@ -3551,7 +3549,6 @@ COND_WXUNIV_1_ADVANCED_HDR =  \
 	wx/generic/gridsel.h \
 	wx/generic/helpext.h \
 	wx/generic/hyperlink.h \
-	wx/generic/infobar.h \
 	wx/generic/laywin.h \
 	wx/generic/notifmsg.h \
 	wx/generic/propdlg.h \
@@ -3560,7 +3557,6 @@ COND_WXUNIV_1_ADVANCED_HDR =  \
 	wx/generic/wizard.h \
 	wx/grid.h \
 	wx/hyperlink.h \
-	wx/infobar.h \
 	wx/joystick.h \
 	wx/laywin.h \
 	wx/notifmsg.h \
@@ -3682,6 +3678,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
 	wx/generic/dragimgg.h \
 	wx/generic/filectrlg.h \
 	wx/generic/headerctrlg.h \
+	wx/generic/infobar.h \
 	wx/generic/logg.h \
 	wx/generic/msgdlgg.h \
 	wx/generic/numdlgg.h \
@@ -3703,6 +3700,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
 	wx/headerctrl.h \
 	wx/helphtml.h \
 	wx/icon.h \
+	wx/infobar.h \
 	wx/layout.h \
 	wx/listbox.h \
 	wx/mdi.h \
@@ -4377,6 +4375,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
 	monodll_dragimgg.o \
 	monodll_filectrlg.o \
 	monodll_headerctrlg.o \
+	monodll_generic_infobar.o \
 	monodll_listbkg.o \
 	monodll_logg.o \
 	monodll_numdlgg.o \
@@ -4574,6 +4573,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
 	monodll_dragimgg.o \
 	monodll_filectrlg.o \
 	monodll_headerctrlg.o \
+	monodll_generic_infobar.o \
 	monodll_listbkg.o \
 	monodll_logg.o \
 	monodll_numdlgg.o \
@@ -5067,7 +5067,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS =  \
 	monodll_gtk_gauge.o \
 	monodll_gprint.o \
 	monodll_gvfs.o \
-	monodll_gtk_print.o \
+	monodll_gtk_infobar.o \
 	monodll_gtk_listbox.o \
 	monodll_gtk_mdi.o \
 	monodll_gtk_menu.o \
@@ -5075,6 +5075,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS =  \
 	monodll_gtk_msgdlg.o \
 	monodll_gtk_nativewin.o \
 	monodll_gtk_notebook.o \
+	monodll_gtk_print.o \
 	monodll_gtk_radiobox.o \
 	monodll_gtk_radiobut.o \
 	monodll_gtk_scrolbar.o \
@@ -5765,7 +5766,6 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS =  \
 	monodll_gridsel.o \
 	monodll_helpext.o \
 	monodll_hyperlinkg.o \
-	monodll_generic_infobar.o \
 	monodll_laywin.o \
 	monodll_notifmsgg.o \
 	monodll_odcombo.o \
@@ -5795,7 +5795,6 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS =  \
 	monodll_gridsel.o \
 	monodll_helpext.o \
 	monodll_hyperlinkg.o \
-	monodll_generic_infobar.o \
 	monodll_laywin.o \
 	monodll_notifmsgg.o \
 	monodll_odcombo.o \
@@ -5813,8 +5812,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS =  \
 	monodll_gtk_bmpcbox.o \
 	monodll_gtk_calctrl.o \
 	monodll_gtk_dataview.o \
-	monodll_hyperlink.o \
-	monodll_gtk_infobar.o
+	monodll_hyperlink.o
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS)
 COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS =  \
 	monodll_animateg.o \
@@ -6216,6 +6214,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
 	monolib_dragimgg.o \
 	monolib_filectrlg.o \
 	monolib_headerctrlg.o \
+	monolib_generic_infobar.o \
 	monolib_listbkg.o \
 	monolib_logg.o \
 	monolib_numdlgg.o \
@@ -6413,6 +6412,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
 	monolib_dragimgg.o \
 	monolib_filectrlg.o \
 	monolib_headerctrlg.o \
+	monolib_generic_infobar.o \
 	monolib_listbkg.o \
 	monolib_logg.o \
 	monolib_numdlgg.o \
@@ -6906,7 +6906,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1 =  \
 	monolib_gtk_gauge.o \
 	monolib_gprint.o \
 	monolib_gvfs.o \
-	monolib_gtk_print.o \
+	monolib_gtk_infobar.o \
 	monolib_gtk_listbox.o \
 	monolib_gtk_mdi.o \
 	monolib_gtk_menu.o \
@@ -6914,6 +6914,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1 =  \
 	monolib_gtk_msgdlg.o \
 	monolib_gtk_nativewin.o \
 	monolib_gtk_notebook.o \
+	monolib_gtk_print.o \
 	monolib_gtk_radiobox.o \
 	monolib_gtk_radiobut.o \
 	monolib_gtk_scrolbar.o \
@@ -7604,7 +7605,6 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_1 =  \
 	monolib_gridsel.o \
 	monolib_helpext.o \
 	monolib_hyperlinkg.o \
-	monolib_generic_infobar.o \
 	monolib_laywin.o \
 	monolib_notifmsgg.o \
 	monolib_odcombo.o \
@@ -7634,7 +7634,6 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_1 =  \
 	monolib_gridsel.o \
 	monolib_helpext.o \
 	monolib_hyperlinkg.o \
-	monolib_generic_infobar.o \
 	monolib_laywin.o \
 	monolib_notifmsgg.o \
 	monolib_odcombo.o \
@@ -7652,8 +7651,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 =  \
 	monolib_gtk_bmpcbox.o \
 	monolib_gtk_calctrl.o \
 	monolib_gtk_dataview.o \
-	monolib_hyperlink.o \
-	monolib_gtk_infobar.o
+	monolib_hyperlink.o
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1)
 COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 =  \
 	monolib_animateg.o \
@@ -8244,6 +8242,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
 	coredll_dragimgg.o \
 	coredll_filectrlg.o \
 	coredll_headerctrlg.o \
+	coredll_generic_infobar.o \
 	coredll_listbkg.o \
 	coredll_logg.o \
 	coredll_numdlgg.o \
@@ -8441,6 +8440,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
 	coredll_dragimgg.o \
 	coredll_filectrlg.o \
 	coredll_headerctrlg.o \
+	coredll_generic_infobar.o \
 	coredll_listbkg.o \
 	coredll_logg.o \
 	coredll_numdlgg.o \
@@ -8934,7 +8934,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2 =  \
 	coredll_gtk_gauge.o \
 	coredll_gprint.o \
 	coredll_gvfs.o \
-	coredll_gtk_print.o \
+	coredll_gtk_infobar.o \
 	coredll_gtk_listbox.o \
 	coredll_gtk_mdi.o \
 	coredll_gtk_menu.o \
@@ -8942,6 +8942,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2 =  \
 	coredll_gtk_msgdlg.o \
 	coredll_gtk_nativewin.o \
 	coredll_gtk_notebook.o \
+	coredll_gtk_print.o \
 	coredll_gtk_radiobox.o \
 	coredll_gtk_radiobut.o \
 	coredll_gtk_scrolbar.o \
@@ -9756,6 +9757,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
 	corelib_dragimgg.o \
 	corelib_filectrlg.o \
 	corelib_headerctrlg.o \
+	corelib_generic_infobar.o \
 	corelib_listbkg.o \
 	corelib_logg.o \
 	corelib_numdlgg.o \
@@ -9953,6 +9955,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
 	corelib_dragimgg.o \
 	corelib_filectrlg.o \
 	corelib_headerctrlg.o \
+	corelib_generic_infobar.o \
 	corelib_listbkg.o \
 	corelib_logg.o \
 	corelib_numdlgg.o \
@@ -10446,7 +10449,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3 =  \
 	corelib_gtk_gauge.o \
 	corelib_gprint.o \
 	corelib_gvfs.o \
-	corelib_gtk_print.o \
+	corelib_gtk_infobar.o \
 	corelib_gtk_listbox.o \
 	corelib_gtk_mdi.o \
 	corelib_gtk_menu.o \
@@ -10454,6 +10457,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3 =  \
 	corelib_gtk_msgdlg.o \
 	corelib_gtk_nativewin.o \
 	corelib_gtk_notebook.o \
+	corelib_gtk_print.o \
 	corelib_gtk_radiobox.o \
 	corelib_gtk_radiobut.o \
 	corelib_gtk_scrolbar.o \
@@ -11213,7 +11217,6 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_2 =  \
 	advdll_gridsel.o \
 	advdll_helpext.o \
 	advdll_hyperlinkg.o \
-	advdll_generic_infobar.o \
 	advdll_laywin.o \
 	advdll_notifmsgg.o \
 	advdll_odcombo.o \
@@ -11243,7 +11246,6 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_2 =  \
 	advdll_gridsel.o \
 	advdll_helpext.o \
 	advdll_hyperlinkg.o \
-	advdll_generic_infobar.o \
 	advdll_laywin.o \
 	advdll_notifmsgg.o \
 	advdll_odcombo.o \
@@ -11261,8 +11263,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 =  \
 	advdll_gtk_bmpcbox.o \
 	advdll_gtk_calctrl.o \
 	advdll_gtk_dataview.o \
-	advdll_hyperlink.o \
-	advdll_gtk_infobar.o
+	advdll_hyperlink.o
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2)
 COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 =  \
 	advdll_animateg.o \
@@ -11310,7 +11311,6 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_3 =  \
 	advlib_gridsel.o \
 	advlib_helpext.o \
 	advlib_hyperlinkg.o \
-	advlib_generic_infobar.o \
 	advlib_laywin.o \
 	advlib_notifmsgg.o \
 	advlib_odcombo.o \
@@ -11340,7 +11340,6 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3 =  \
 	advlib_gridsel.o \
 	advlib_helpext.o \
 	advlib_hyperlinkg.o \
-	advlib_generic_infobar.o \
 	advlib_laywin.o \
 	advlib_notifmsgg.o \
 	advlib_odcombo.o \
@@ -11358,8 +11357,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 =  \
 	advlib_gtk_bmpcbox.o \
 	advlib_gtk_calctrl.o \
 	advlib_gtk_dataview.o \
-	advlib_hyperlink.o \
-	advlib_gtk_infobar.o
+	advlib_hyperlink.o
 @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3)
 COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 =  \
 	advlib_animateg.o \
@@ -15261,8 +15259,8 @@ monodll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONODLL_ODEP)
 monodll_gvfs.o: $(srcdir)/src/gtk/gnome/gvfs.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/gnome/gvfs.cpp
 
-monodll_gtk_print.o: $(srcdir)/src/gtk/print.cpp $(MONODLL_ODEP)
-	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/print.cpp
+monodll_gtk_infobar.o: $(srcdir)/src/gtk/infobar.cpp $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/infobar.cpp
 
 monodll_gtk_listbox.o: $(srcdir)/src/gtk/listbox.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/listbox.cpp
@@ -15285,6 +15283,9 @@ monodll_gtk_nativewin.o: $(srcdir)/src/gtk/nativewin.cpp $(MONODLL_ODEP)
 monodll_gtk_notebook.o: $(srcdir)/src/gtk/notebook.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/notebook.cpp
 
+monodll_gtk_print.o: $(srcdir)/src/gtk/print.cpp $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/print.cpp
+
 monodll_gtk_radiobox.o: $(srcdir)/src/gtk/radiobox.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/radiobox.cpp
 
@@ -16398,9 +16399,6 @@ monodll_gtk_dataview.o: $(srcdir)/src/gtk/dataview.cpp $(MONODLL_ODEP)
 monodll_hyperlink.o: $(srcdir)/src/gtk/hyperlink.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/hyperlink.cpp
 
-monodll_gtk_infobar.o: $(srcdir)/src/gtk/infobar.cpp $(MONODLL_ODEP)
-	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/infobar.cpp
-
 monodll_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/mediactrlcmn.cpp
 
@@ -19215,6 +19213,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@monodll_headerctrlg.o: $(srcdir)/src/generic/headerctrlg.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/headerctrlg.cpp
 
+@COND_USE_GUI_1@monodll_generic_infobar.o: $(srcdir)/src/generic/infobar.cpp $(MONODLL_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/infobar.cpp
+
 @COND_USE_GUI_1@monodll_listbkg.o: $(srcdir)/src/generic/listbkg.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/listbkg.cpp
 
@@ -19329,9 +19330,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@monodll_hyperlinkg.o: $(srcdir)/src/generic/hyperlinkg.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/hyperlinkg.cpp
 
-@COND_USE_GUI_1@monodll_generic_infobar.o: $(srcdir)/src/generic/infobar.cpp $(MONODLL_ODEP)
-@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/infobar.cpp
-
 @COND_USE_GUI_1@monodll_laywin.o: $(srcdir)/src/generic/laywin.cpp $(MONODLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/laywin.cpp
 
@@ -20121,8 +20119,8 @@ monolib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(MONOLIB_ODEP)
 monolib_gvfs.o: $(srcdir)/src/gtk/gnome/gvfs.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/gnome/gvfs.cpp
 
-monolib_gtk_print.o: $(srcdir)/src/gtk/print.cpp $(MONOLIB_ODEP)
-	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/print.cpp
+monolib_gtk_infobar.o: $(srcdir)/src/gtk/infobar.cpp $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/infobar.cpp
 
 monolib_gtk_listbox.o: $(srcdir)/src/gtk/listbox.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/listbox.cpp
@@ -20145,6 +20143,9 @@ monolib_gtk_nativewin.o: $(srcdir)/src/gtk/nativewin.cpp $(MONOLIB_ODEP)
 monolib_gtk_notebook.o: $(srcdir)/src/gtk/notebook.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/notebook.cpp
 
+monolib_gtk_print.o: $(srcdir)/src/gtk/print.cpp $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/print.cpp
+
 monolib_gtk_radiobox.o: $(srcdir)/src/gtk/radiobox.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/radiobox.cpp
 
@@ -21258,9 +21259,6 @@ monolib_gtk_dataview.o: $(srcdir)/src/gtk/dataview.cpp $(MONOLIB_ODEP)
 monolib_hyperlink.o: $(srcdir)/src/gtk/hyperlink.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/hyperlink.cpp
 
-monolib_gtk_infobar.o: $(srcdir)/src/gtk/infobar.cpp $(MONOLIB_ODEP)
-	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/infobar.cpp
-
 monolib_mediactrlcmn.o: $(srcdir)/src/common/mediactrlcmn.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/mediactrlcmn.cpp
 
@@ -24075,6 +24073,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@monolib_headerctrlg.o: $(srcdir)/src/generic/headerctrlg.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/headerctrlg.cpp
 
+@COND_USE_GUI_1@monolib_generic_infobar.o: $(srcdir)/src/generic/infobar.cpp $(MONOLIB_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/infobar.cpp
+
 @COND_USE_GUI_1@monolib_listbkg.o: $(srcdir)/src/generic/listbkg.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/listbkg.cpp
 
@@ -24189,9 +24190,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@monolib_hyperlinkg.o: $(srcdir)/src/generic/hyperlinkg.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/hyperlinkg.cpp
 
-@COND_USE_GUI_1@monolib_generic_infobar.o: $(srcdir)/src/generic/infobar.cpp $(MONOLIB_ODEP)
-@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/infobar.cpp
-
 @COND_USE_GUI_1@monolib_laywin.o: $(srcdir)/src/generic/laywin.cpp $(MONOLIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/laywin.cpp
 
@@ -25698,8 +25696,8 @@ coredll_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(COREDLL_ODEP)
 coredll_gvfs.o: $(srcdir)/src/gtk/gnome/gvfs.cpp $(COREDLL_ODEP)
 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/gnome/gvfs.cpp
 
-coredll_gtk_print.o: $(srcdir)/src/gtk/print.cpp $(COREDLL_ODEP)
-	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/print.cpp
+coredll_gtk_infobar.o: $(srcdir)/src/gtk/infobar.cpp $(COREDLL_ODEP)
+	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/infobar.cpp
 
 coredll_gtk_listbox.o: $(srcdir)/src/gtk/listbox.cpp $(COREDLL_ODEP)
 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/listbox.cpp
@@ -25722,6 +25720,9 @@ coredll_gtk_nativewin.o: $(srcdir)/src/gtk/nativewin.cpp $(COREDLL_ODEP)
 coredll_gtk_notebook.o: $(srcdir)/src/gtk/notebook.cpp $(COREDLL_ODEP)
 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/notebook.cpp
 
+coredll_gtk_print.o: $(srcdir)/src/gtk/print.cpp $(COREDLL_ODEP)
+	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/print.cpp
+
 coredll_gtk_radiobox.o: $(srcdir)/src/gtk/radiobox.cpp $(COREDLL_ODEP)
 	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/radiobox.cpp
 
@@ -29124,6 +29125,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1@coredll_headerctrlg.o: $(srcdir)/src/generic/headerctrlg.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/headerctrlg.cpp
 
+@COND_USE_GUI_1@coredll_generic_infobar.o: $(srcdir)/src/generic/infobar.cpp $(COREDLL_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/infobar.cpp
+
 @COND_USE_GUI_1@coredll_listbkg.o: $(srcdir)/src/generic/listbkg.cpp $(COREDLL_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/listbkg.cpp
 
@@ -29283,8 +29287,8 @@ corelib_gprint.o: $(srcdir)/src/gtk/gnome/gprint.cpp $(CORELIB_ODEP)
 corelib_gvfs.o: $(srcdir)/src/gtk/gnome/gvfs.cpp $(CORELIB_ODEP)
 	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/gnome/gvfs.cpp
 
-corelib_gtk_print.o: $(srcdir)/src/gtk/print.cpp $(CORELIB_ODEP)
-	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/print.cpp
+corelib_gtk_infobar.o: $(srcdir)/src/gtk/infobar.cpp $(CORELIB_ODEP)
+	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/infobar.cpp
 
 corelib_gtk_listbox.o: $(srcdir)/src/gtk/listbox.cpp $(CORELIB_ODEP)
 	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/listbox.cpp
@@ -29307,6 +29311,9 @@ corelib_gtk_nativewin.o: $(srcdir)/src/gtk/nativewin.cpp $(CORELIB_ODEP)
 corelib_gtk_notebook.o: $(srcdir)/src/gtk/notebook.cpp $(CORELIB_ODEP)
 	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/notebook.cpp
 
+corelib_gtk_print.o: $(srcdir)/src/gtk/print.cpp $(CORELIB_ODEP)
+	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/print.cpp
+
 corelib_gtk_radiobox.o: $(srcdir)/src/gtk/radiobox.cpp $(CORELIB_ODEP)
 	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/radiobox.cpp
 
@@ -32709,6 +32716,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@corelib_headerctrlg.o: $(srcdir)/src/generic/headerctrlg.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/headerctrlg.cpp
 
+@COND_USE_GUI_1@corelib_generic_infobar.o: $(srcdir)/src/generic/infobar.cpp $(CORELIB_ODEP)
+@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/infobar.cpp
+
 @COND_USE_GUI_1@corelib_listbkg.o: $(srcdir)/src/generic/listbkg.cpp $(CORELIB_ODEP)
 @COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/listbkg.cpp
 
@@ -32793,9 +32803,6 @@ advdll_gtk_dataview.o: $(srcdir)/src/gtk/dataview.cpp $(ADVDLL_ODEP)
 advdll_hyperlink.o: $(srcdir)/src/gtk/hyperlink.cpp $(ADVDLL_ODEP)
 	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/hyperlink.cpp
 
-advdll_gtk_infobar.o: $(srcdir)/src/gtk/infobar.cpp $(ADVDLL_ODEP)
-	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/gtk/infobar.cpp
-
 advdll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVDLL_ODEP)
 	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/unix/sound_sdl.cpp
 
@@ -32850,9 +32857,6 @@ advdll_helpext.o: $(srcdir)/src/generic/helpext.cpp $(ADVDLL_ODEP)
 advdll_hyperlinkg.o: $(srcdir)/src/generic/hyperlinkg.cpp $(ADVDLL_ODEP)
 	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/hyperlinkg.cpp
 
-advdll_generic_infobar.o: $(srcdir)/src/generic/infobar.cpp $(ADVDLL_ODEP)
-	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/infobar.cpp
-
 advdll_laywin.o: $(srcdir)/src/generic/laywin.cpp $(ADVDLL_ODEP)
 	$(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/laywin.cpp
 
@@ -33123,9 +33127,6 @@ advlib_gtk_dataview.o: $(srcdir)/src/gtk/dataview.cpp $(ADVLIB_ODEP)
 advlib_hyperlink.o: $(srcdir)/src/gtk/hyperlink.cpp $(ADVLIB_ODEP)
 	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/hyperlink.cpp
 
-advlib_gtk_infobar.o: $(srcdir)/src/gtk/infobar.cpp $(ADVLIB_ODEP)
-	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/gtk/infobar.cpp
-
 advlib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVLIB_ODEP)
 	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/unix/sound_sdl.cpp
 
@@ -33180,9 +33181,6 @@ advlib_helpext.o: $(srcdir)/src/generic/helpext.cpp $(ADVLIB_ODEP)
 advlib_hyperlinkg.o: $(srcdir)/src/generic/hyperlinkg.cpp $(ADVLIB_ODEP)
 	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/hyperlinkg.cpp
 
-advlib_generic_infobar.o: $(srcdir)/src/generic/infobar.cpp $(ADVLIB_ODEP)
-	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/infobar.cpp
-
 advlib_laywin.o: $(srcdir)/src/generic/laywin.cpp $(ADVLIB_ODEP)
 	$(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/laywin.cpp
 
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index dd96e0fd04..c48fc03d6e 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -750,6 +750,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/dragimgg.cpp
     src/generic/filectrlg.cpp
     src/generic/headerctrlg.cpp
+    src/generic/infobar.cpp
     src/generic/listbkg.cpp
     src/generic/logg.cpp
     src/generic/numdlgg.cpp
@@ -814,6 +815,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/dragimgg.h
     wx/generic/filectrlg.h
     wx/generic/headerctrlg.h
+    wx/generic/infobar.h
     wx/generic/logg.h
     wx/generic/msgdlgg.h
     wx/generic/numdlgg.h
@@ -835,6 +837,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/headerctrl.h
     wx/helphtml.h
     wx/icon.h
+    wx/infobar.h
     wx/layout.h
     wx/listbox.h
     wx/mdi.h
@@ -1117,7 +1120,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/gauge.cpp
     src/gtk/gnome/gprint.cpp
     src/gtk/gnome/gvfs.cpp
-    src/gtk/print.cpp
+    src/gtk/infobar.cpp
     src/gtk/listbox.cpp
     src/gtk/mdi.cpp
     src/gtk/menu.cpp
@@ -1125,6 +1128,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/gtk/msgdlg.cpp
     src/gtk/nativewin.cpp
     src/gtk/notebook.cpp
+    src/gtk/print.cpp
     src/gtk/radiobox.cpp
     src/gtk/radiobut.cpp
     src/gtk/scrolbar.cpp
@@ -1171,13 +1175,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/gtk/gauge.h
     wx/gtk/gnome/gprint.h
     wx/gtk/gnome/gvfs.h
-    wx/gtk/print.h
+    wx/gtk/infobar.h
     wx/gtk/listbox.h
     wx/gtk/mdi.h
     wx/gtk/menu.h
     wx/gtk/menuitem.h
     wx/gtk/msgdlg.h
     wx/gtk/notebook.h
+    wx/gtk/print.h
     wx/gtk/radiobox.h
     wx/gtk/radiobut.h
     wx/gtk/scrolbar.h
@@ -2866,7 +2871,6 @@ src/osx/iphone/window.mm
     src/generic/gridsel.cpp
     src/generic/helpext.cpp
     src/generic/hyperlinkg.cpp
-    src/generic/infobar.cpp
     src/generic/laywin.cpp
     src/generic/notifmsgg.cpp
     src/generic/odcombo.cpp
@@ -2901,7 +2905,6 @@ src/osx/iphone/window.mm
     wx/generic/gridsel.h
     wx/generic/helpext.h
     wx/generic/hyperlink.h
-    wx/generic/infobar.h
     wx/generic/laywin.h
     wx/generic/notifmsg.h
     wx/generic/propdlg.h
@@ -2910,7 +2913,6 @@ src/osx/iphone/window.mm
     wx/generic/wizard.h
     wx/grid.h
     wx/hyperlink.h
-    wx/infobar.h
     wx/joystick.h
     wx/laywin.h
     wx/notifmsg.h
@@ -3072,7 +3074,6 @@ src/osx/iphone/window.mm
     src/gtk/calctrl.cpp
     src/gtk/dataview.cpp
     src/gtk/hyperlink.cpp
-    src/gtk/infobar.cpp
 </set>
 <set var="ADVANCED_GTK_NATIVE_HDR" hints="files">
     wx/gtk/animate.h
@@ -3082,7 +3083,6 @@ src/osx/iphone/window.mm
     wx/gtk/dvrenderer.h
     wx/gtk/dvrenderers.h
     wx/gtk/hyperlink.h
-    wx/gtk/infobar.h
 </set>
 
 <set var="ADVANCED_GTK1_SRC" hints="files">
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 464d370247..6a6d53b323 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1882,6 +1882,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_dragimgg.obj \
 	$(OBJS)\monodll_filectrlg.obj \
 	$(OBJS)\monodll_headerctrlg.obj \
+	$(OBJS)\monodll_infobar.obj \
 	$(OBJS)\monodll_listbkg.obj \
 	$(OBJS)\monodll_logg.obj \
 	$(OBJS)\monodll_numdlgg.obj \
@@ -2127,6 +2128,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_dragimgg.obj \
 	$(OBJS)\monodll_filectrlg.obj \
 	$(OBJS)\monodll_headerctrlg.obj \
+	$(OBJS)\monodll_infobar.obj \
 	$(OBJS)\monodll_listbkg.obj \
 	$(OBJS)\monodll_logg.obj \
 	$(OBJS)\monodll_numdlgg.obj \
@@ -2168,7 +2170,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_gridsel.obj \
 	$(OBJS)\monodll_helpext.obj \
 	$(OBJS)\monodll_hyperlinkg.obj \
-	$(OBJS)\monodll_infobar.obj \
 	$(OBJS)\monodll_laywin.obj \
 	$(OBJS)\monodll_notifmsgg.obj \
 	$(OBJS)\monodll_odcombo.obj \
@@ -2208,7 +2209,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_gridsel.obj \
 	$(OBJS)\monodll_helpext.obj \
 	$(OBJS)\monodll_hyperlinkg.obj \
-	$(OBJS)\monodll_infobar.obj \
 	$(OBJS)\monodll_laywin.obj \
 	$(OBJS)\monodll_notifmsgg.obj \
 	$(OBJS)\monodll_odcombo.obj \
@@ -2589,6 +2589,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_dragimgg.obj \
 	$(OBJS)\monolib_filectrlg.obj \
 	$(OBJS)\monolib_headerctrlg.obj \
+	$(OBJS)\monolib_infobar.obj \
 	$(OBJS)\monolib_listbkg.obj \
 	$(OBJS)\monolib_logg.obj \
 	$(OBJS)\monolib_numdlgg.obj \
@@ -2834,6 +2835,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_dragimgg.obj \
 	$(OBJS)\monolib_filectrlg.obj \
 	$(OBJS)\monolib_headerctrlg.obj \
+	$(OBJS)\monolib_infobar.obj \
 	$(OBJS)\monolib_listbkg.obj \
 	$(OBJS)\monolib_logg.obj \
 	$(OBJS)\monolib_numdlgg.obj \
@@ -2875,7 +2877,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_gridsel.obj \
 	$(OBJS)\monolib_helpext.obj \
 	$(OBJS)\monolib_hyperlinkg.obj \
-	$(OBJS)\monolib_infobar.obj \
 	$(OBJS)\monolib_laywin.obj \
 	$(OBJS)\monolib_notifmsgg.obj \
 	$(OBJS)\monolib_odcombo.obj \
@@ -2915,7 +2916,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_gridsel.obj \
 	$(OBJS)\monolib_helpext.obj \
 	$(OBJS)\monolib_hyperlinkg.obj \
-	$(OBJS)\monolib_infobar.obj \
 	$(OBJS)\monolib_laywin.obj \
 	$(OBJS)\monolib_notifmsgg.obj \
 	$(OBJS)\monolib_odcombo.obj \
@@ -3189,6 +3189,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_dragimgg.obj \
 	$(OBJS)\coredll_filectrlg.obj \
 	$(OBJS)\coredll_headerctrlg.obj \
+	$(OBJS)\coredll_infobar.obj \
 	$(OBJS)\coredll_listbkg.obj \
 	$(OBJS)\coredll_logg.obj \
 	$(OBJS)\coredll_numdlgg.obj \
@@ -3434,6 +3435,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_dragimgg.obj \
 	$(OBJS)\coredll_filectrlg.obj \
 	$(OBJS)\coredll_headerctrlg.obj \
+	$(OBJS)\coredll_infobar.obj \
 	$(OBJS)\coredll_listbkg.obj \
 	$(OBJS)\coredll_logg.obj \
 	$(OBJS)\coredll_numdlgg.obj \
@@ -3685,6 +3687,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_dragimgg.obj \
 	$(OBJS)\corelib_filectrlg.obj \
 	$(OBJS)\corelib_headerctrlg.obj \
+	$(OBJS)\corelib_infobar.obj \
 	$(OBJS)\corelib_listbkg.obj \
 	$(OBJS)\corelib_logg.obj \
 	$(OBJS)\corelib_numdlgg.obj \
@@ -3930,6 +3933,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_dragimgg.obj \
 	$(OBJS)\corelib_filectrlg.obj \
 	$(OBJS)\corelib_headerctrlg.obj \
+	$(OBJS)\corelib_infobar.obj \
 	$(OBJS)\corelib_listbkg.obj \
 	$(OBJS)\corelib_logg.obj \
 	$(OBJS)\corelib_numdlgg.obj \
@@ -3981,7 +3985,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_gridsel.obj \
 	$(OBJS)\advdll_helpext.obj \
 	$(OBJS)\advdll_hyperlinkg.obj \
-	$(OBJS)\advdll_infobar.obj \
 	$(OBJS)\advdll_laywin.obj \
 	$(OBJS)\advdll_notifmsgg.obj \
 	$(OBJS)\advdll_odcombo.obj \
@@ -4021,7 +4024,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_gridsel.obj \
 	$(OBJS)\advdll_helpext.obj \
 	$(OBJS)\advdll_hyperlinkg.obj \
-	$(OBJS)\advdll_infobar.obj \
 	$(OBJS)\advdll_laywin.obj \
 	$(OBJS)\advdll_notifmsgg.obj \
 	$(OBJS)\advdll_odcombo.obj \
@@ -4061,7 +4063,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_gridsel.obj \
 	$(OBJS)\advlib_helpext.obj \
 	$(OBJS)\advlib_hyperlinkg.obj \
-	$(OBJS)\advlib_infobar.obj \
 	$(OBJS)\advlib_laywin.obj \
 	$(OBJS)\advlib_notifmsgg.obj \
 	$(OBJS)\advlib_odcombo.obj \
@@ -4101,7 +4102,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_gridsel.obj \
 	$(OBJS)\advlib_helpext.obj \
 	$(OBJS)\advlib_hyperlinkg.obj \
-	$(OBJS)\advlib_infobar.obj \
 	$(OBJS)\advlib_laywin.obj \
 	$(OBJS)\advlib_notifmsgg.obj \
 	$(OBJS)\advlib_odcombo.obj \
@@ -7604,6 +7604,11 @@ $(OBJS)\monodll_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_infobar.obj: ..\..\src\generic\infobar.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\infobar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_listbkg.obj: ..\..\src\generic\listbkg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\listbkg.cpp
 !endif
@@ -7793,11 +7798,6 @@ $(OBJS)\monodll_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_infobar.obj: ..\..\src\generic\infobar.cpp
-	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\infobar.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_laywin.obj: ..\..\src\generic\laywin.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\laywin.cpp
@@ -9805,6 +9805,11 @@ $(OBJS)\monolib_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_infobar.obj: ..\..\src\generic\infobar.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\infobar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_listbkg.obj: ..\..\src\generic\listbkg.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\listbkg.cpp
 !endif
@@ -9994,11 +9999,6 @@ $(OBJS)\monolib_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_infobar.obj: ..\..\src\generic\infobar.cpp
-	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\infobar.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_laywin.obj: ..\..\src\generic\laywin.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\laywin.cpp
@@ -12015,6 +12015,11 @@ $(OBJS)\coredll_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_infobar.obj: ..\..\src\generic\infobar.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\infobar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_listbkg.obj: ..\..\src\generic\listbkg.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\listbkg.cpp
 !endif
@@ -13307,6 +13312,11 @@ $(OBJS)\corelib_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_infobar.obj: ..\..\src\generic\infobar.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\infobar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_listbkg.obj: ..\..\src\generic\listbkg.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\listbkg.cpp
 !endif
@@ -13480,9 +13490,6 @@ $(OBJS)\advdll_helpext.obj: ..\..\src\generic\helpext.cpp
 $(OBJS)\advdll_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp
 
-$(OBJS)\advdll_infobar.obj: ..\..\src\generic\infobar.cpp
-	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\infobar.cpp
-
 $(OBJS)\advdll_laywin.obj: ..\..\src\generic\laywin.cpp
 	$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\laywin.cpp
 
@@ -13594,9 +13601,6 @@ $(OBJS)\advlib_helpext.obj: ..\..\src\generic\helpext.cpp
 $(OBJS)\advlib_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp
 
-$(OBJS)\advlib_infobar.obj: ..\..\src\generic\infobar.cpp
-	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\infobar.cpp
-
 $(OBJS)\advlib_laywin.obj: ..\..\src\generic\laywin.cpp
 	$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\laywin.cpp
 
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 43b72a1402..43f759382b 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1892,6 +1892,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_dragimgg.o \
 	$(OBJS)\monodll_filectrlg.o \
 	$(OBJS)\monodll_headerctrlg.o \
+	$(OBJS)\monodll_infobar.o \
 	$(OBJS)\monodll_listbkg.o \
 	$(OBJS)\monodll_logg.o \
 	$(OBJS)\monodll_numdlgg.o \
@@ -2139,6 +2140,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_dragimgg.o \
 	$(OBJS)\monodll_filectrlg.o \
 	$(OBJS)\monodll_headerctrlg.o \
+	$(OBJS)\monodll_infobar.o \
 	$(OBJS)\monodll_listbkg.o \
 	$(OBJS)\monodll_logg.o \
 	$(OBJS)\monodll_numdlgg.o \
@@ -2181,7 +2183,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_gridsel.o \
 	$(OBJS)\monodll_helpext.o \
 	$(OBJS)\monodll_hyperlinkg.o \
-	$(OBJS)\monodll_infobar.o \
 	$(OBJS)\monodll_laywin.o \
 	$(OBJS)\monodll_notifmsgg.o \
 	$(OBJS)\monodll_odcombo.o \
@@ -2221,7 +2222,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_gridsel.o \
 	$(OBJS)\monodll_helpext.o \
 	$(OBJS)\monodll_hyperlinkg.o \
-	$(OBJS)\monodll_infobar.o \
 	$(OBJS)\monodll_laywin.o \
 	$(OBJS)\monodll_notifmsgg.o \
 	$(OBJS)\monodll_odcombo.o \
@@ -2605,6 +2605,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_dragimgg.o \
 	$(OBJS)\monolib_filectrlg.o \
 	$(OBJS)\monolib_headerctrlg.o \
+	$(OBJS)\monolib_infobar.o \
 	$(OBJS)\monolib_listbkg.o \
 	$(OBJS)\monolib_logg.o \
 	$(OBJS)\monolib_numdlgg.o \
@@ -2852,6 +2853,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_dragimgg.o \
 	$(OBJS)\monolib_filectrlg.o \
 	$(OBJS)\monolib_headerctrlg.o \
+	$(OBJS)\monolib_infobar.o \
 	$(OBJS)\monolib_listbkg.o \
 	$(OBJS)\monolib_logg.o \
 	$(OBJS)\monolib_numdlgg.o \
@@ -2894,7 +2896,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_gridsel.o \
 	$(OBJS)\monolib_helpext.o \
 	$(OBJS)\monolib_hyperlinkg.o \
-	$(OBJS)\monolib_infobar.o \
 	$(OBJS)\monolib_laywin.o \
 	$(OBJS)\monolib_notifmsgg.o \
 	$(OBJS)\monolib_odcombo.o \
@@ -2934,7 +2935,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_gridsel.o \
 	$(OBJS)\monolib_helpext.o \
 	$(OBJS)\monolib_hyperlinkg.o \
-	$(OBJS)\monolib_infobar.o \
 	$(OBJS)\monolib_laywin.o \
 	$(OBJS)\monolib_notifmsgg.o \
 	$(OBJS)\monolib_odcombo.o \
@@ -3221,6 +3221,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_dragimgg.o \
 	$(OBJS)\coredll_filectrlg.o \
 	$(OBJS)\coredll_headerctrlg.o \
+	$(OBJS)\coredll_infobar.o \
 	$(OBJS)\coredll_listbkg.o \
 	$(OBJS)\coredll_logg.o \
 	$(OBJS)\coredll_numdlgg.o \
@@ -3468,6 +3469,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_dragimgg.o \
 	$(OBJS)\coredll_filectrlg.o \
 	$(OBJS)\coredll_headerctrlg.o \
+	$(OBJS)\coredll_infobar.o \
 	$(OBJS)\coredll_listbkg.o \
 	$(OBJS)\coredll_logg.o \
 	$(OBJS)\coredll_numdlgg.o \
@@ -3725,6 +3727,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_dragimgg.o \
 	$(OBJS)\corelib_filectrlg.o \
 	$(OBJS)\corelib_headerctrlg.o \
+	$(OBJS)\corelib_infobar.o \
 	$(OBJS)\corelib_listbkg.o \
 	$(OBJS)\corelib_logg.o \
 	$(OBJS)\corelib_numdlgg.o \
@@ -3972,6 +3975,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_dragimgg.o \
 	$(OBJS)\corelib_filectrlg.o \
 	$(OBJS)\corelib_headerctrlg.o \
+	$(OBJS)\corelib_infobar.o \
 	$(OBJS)\corelib_listbkg.o \
 	$(OBJS)\corelib_logg.o \
 	$(OBJS)\corelib_numdlgg.o \
@@ -4028,7 +4032,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_gridsel.o \
 	$(OBJS)\advdll_helpext.o \
 	$(OBJS)\advdll_hyperlinkg.o \
-	$(OBJS)\advdll_infobar.o \
 	$(OBJS)\advdll_laywin.o \
 	$(OBJS)\advdll_notifmsgg.o \
 	$(OBJS)\advdll_odcombo.o \
@@ -4068,7 +4071,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_gridsel.o \
 	$(OBJS)\advdll_helpext.o \
 	$(OBJS)\advdll_hyperlinkg.o \
-	$(OBJS)\advdll_infobar.o \
 	$(OBJS)\advdll_laywin.o \
 	$(OBJS)\advdll_notifmsgg.o \
 	$(OBJS)\advdll_odcombo.o \
@@ -4112,7 +4114,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_gridsel.o \
 	$(OBJS)\advlib_helpext.o \
 	$(OBJS)\advlib_hyperlinkg.o \
-	$(OBJS)\advlib_infobar.o \
 	$(OBJS)\advlib_laywin.o \
 	$(OBJS)\advlib_notifmsgg.o \
 	$(OBJS)\advlib_odcombo.o \
@@ -4152,7 +4153,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_gridsel.o \
 	$(OBJS)\advlib_helpext.o \
 	$(OBJS)\advlib_hyperlinkg.o \
-	$(OBJS)\advlib_infobar.o \
 	$(OBJS)\advlib_laywin.o \
 	$(OBJS)\advlib_notifmsgg.o \
 	$(OBJS)\advlib_odcombo.o \
@@ -7753,6 +7753,11 @@ $(OBJS)\monodll_headerctrlg.o: ../../src/generic/headerctrlg.cpp
 endif
 
 ifeq ($(USE_GUI),1)
+$(OBJS)\monodll_infobar.o: ../../src/generic/infobar.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_listbkg.o: ../../src/generic/listbkg.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
@@ -7942,11 +7947,6 @@ $(OBJS)\monodll_hyperlinkg.o: ../../src/generic/hyperlinkg.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_infobar.o: ../../src/generic/infobar.cpp
-	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_laywin.o: ../../src/generic/laywin.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -9954,6 +9954,11 @@ $(OBJS)\monolib_headerctrlg.o: ../../src/generic/headerctrlg.cpp
 endif
 
 ifeq ($(USE_GUI),1)
+$(OBJS)\monolib_infobar.o: ../../src/generic/infobar.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_listbkg.o: ../../src/generic/listbkg.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
@@ -10143,11 +10148,6 @@ $(OBJS)\monolib_hyperlinkg.o: ../../src/generic/hyperlinkg.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_infobar.o: ../../src/generic/infobar.cpp
-	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_laywin.o: ../../src/generic/laywin.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -12164,6 +12164,11 @@ $(OBJS)\coredll_headerctrlg.o: ../../src/generic/headerctrlg.cpp
 endif
 
 ifeq ($(USE_GUI),1)
+$(OBJS)\coredll_infobar.o: ../../src/generic/infobar.cpp
+	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_listbkg.o: ../../src/generic/listbkg.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 endif
@@ -13456,6 +13461,11 @@ $(OBJS)\corelib_headerctrlg.o: ../../src/generic/headerctrlg.cpp
 endif
 
 ifeq ($(USE_GUI),1)
+$(OBJS)\corelib_infobar.o: ../../src/generic/infobar.cpp
+	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
+endif
+
+ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_listbkg.o: ../../src/generic/listbkg.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 endif
@@ -13629,9 +13639,6 @@ $(OBJS)\advdll_helpext.o: ../../src/generic/helpext.cpp
 $(OBJS)\advdll_hyperlinkg.o: ../../src/generic/hyperlinkg.cpp
 	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\advdll_infobar.o: ../../src/generic/infobar.cpp
-	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\advdll_laywin.o: ../../src/generic/laywin.cpp
 	$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -13743,9 +13750,6 @@ $(OBJS)\advlib_helpext.o: ../../src/generic/helpext.cpp
 $(OBJS)\advlib_hyperlinkg.o: ../../src/generic/hyperlinkg.cpp
 	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\advlib_infobar.o: ../../src/generic/infobar.cpp
-	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
-
 $(OBJS)\advlib_laywin.o: ../../src/generic/laywin.cpp
 	$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
 
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 5d0440076b..18d4a68ea2 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -2090,6 +2090,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_dragimgg.obj \
 	$(OBJS)\monodll_filectrlg.obj \
 	$(OBJS)\monodll_headerctrlg.obj \
+	$(OBJS)\monodll_infobar.obj \
 	$(OBJS)\monodll_listbkg.obj \
 	$(OBJS)\monodll_logg.obj \
 	$(OBJS)\monodll_numdlgg.obj \
@@ -2335,6 +2336,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_dragimgg.obj \
 	$(OBJS)\monodll_filectrlg.obj \
 	$(OBJS)\monodll_headerctrlg.obj \
+	$(OBJS)\monodll_infobar.obj \
 	$(OBJS)\monodll_listbkg.obj \
 	$(OBJS)\monodll_logg.obj \
 	$(OBJS)\monodll_numdlgg.obj \
@@ -2376,7 +2378,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_gridsel.obj \
 	$(OBJS)\monodll_helpext.obj \
 	$(OBJS)\monodll_hyperlinkg.obj \
-	$(OBJS)\monodll_infobar.obj \
 	$(OBJS)\monodll_laywin.obj \
 	$(OBJS)\monodll_notifmsgg.obj \
 	$(OBJS)\monodll_odcombo.obj \
@@ -2416,7 +2417,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_gridsel.obj \
 	$(OBJS)\monodll_helpext.obj \
 	$(OBJS)\monodll_hyperlinkg.obj \
-	$(OBJS)\monodll_infobar.obj \
 	$(OBJS)\monodll_laywin.obj \
 	$(OBJS)\monodll_notifmsgg.obj \
 	$(OBJS)\monodll_odcombo.obj \
@@ -2803,6 +2803,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_dragimgg.obj \
 	$(OBJS)\monolib_filectrlg.obj \
 	$(OBJS)\monolib_headerctrlg.obj \
+	$(OBJS)\monolib_infobar.obj \
 	$(OBJS)\monolib_listbkg.obj \
 	$(OBJS)\monolib_logg.obj \
 	$(OBJS)\monolib_numdlgg.obj \
@@ -3048,6 +3049,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_dragimgg.obj \
 	$(OBJS)\monolib_filectrlg.obj \
 	$(OBJS)\monolib_headerctrlg.obj \
+	$(OBJS)\monolib_infobar.obj \
 	$(OBJS)\monolib_listbkg.obj \
 	$(OBJS)\monolib_logg.obj \
 	$(OBJS)\monolib_numdlgg.obj \
@@ -3089,7 +3091,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_gridsel.obj \
 	$(OBJS)\monolib_helpext.obj \
 	$(OBJS)\monolib_hyperlinkg.obj \
-	$(OBJS)\monolib_infobar.obj \
 	$(OBJS)\monolib_laywin.obj \
 	$(OBJS)\monolib_notifmsgg.obj \
 	$(OBJS)\monolib_odcombo.obj \
@@ -3129,7 +3130,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_gridsel.obj \
 	$(OBJS)\monolib_helpext.obj \
 	$(OBJS)\monolib_hyperlinkg.obj \
-	$(OBJS)\monolib_infobar.obj \
 	$(OBJS)\monolib_laywin.obj \
 	$(OBJS)\monolib_notifmsgg.obj \
 	$(OBJS)\monolib_odcombo.obj \
@@ -3469,6 +3469,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_dragimgg.obj \
 	$(OBJS)\coredll_filectrlg.obj \
 	$(OBJS)\coredll_headerctrlg.obj \
+	$(OBJS)\coredll_infobar.obj \
 	$(OBJS)\coredll_listbkg.obj \
 	$(OBJS)\coredll_logg.obj \
 	$(OBJS)\coredll_numdlgg.obj \
@@ -3714,6 +3715,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_dragimgg.obj \
 	$(OBJS)\coredll_filectrlg.obj \
 	$(OBJS)\coredll_headerctrlg.obj \
+	$(OBJS)\coredll_infobar.obj \
 	$(OBJS)\coredll_listbkg.obj \
 	$(OBJS)\coredll_logg.obj \
 	$(OBJS)\coredll_numdlgg.obj \
@@ -3971,6 +3973,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_dragimgg.obj \
 	$(OBJS)\corelib_filectrlg.obj \
 	$(OBJS)\corelib_headerctrlg.obj \
+	$(OBJS)\corelib_infobar.obj \
 	$(OBJS)\corelib_listbkg.obj \
 	$(OBJS)\corelib_logg.obj \
 	$(OBJS)\corelib_numdlgg.obj \
@@ -4216,6 +4219,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_dragimgg.obj \
 	$(OBJS)\corelib_filectrlg.obj \
 	$(OBJS)\corelib_headerctrlg.obj \
+	$(OBJS)\corelib_infobar.obj \
 	$(OBJS)\corelib_listbkg.obj \
 	$(OBJS)\corelib_logg.obj \
 	$(OBJS)\corelib_numdlgg.obj \
@@ -4285,7 +4289,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_gridsel.obj \
 	$(OBJS)\advdll_helpext.obj \
 	$(OBJS)\advdll_hyperlinkg.obj \
-	$(OBJS)\advdll_infobar.obj \
 	$(OBJS)\advdll_laywin.obj \
 	$(OBJS)\advdll_notifmsgg.obj \
 	$(OBJS)\advdll_odcombo.obj \
@@ -4325,7 +4328,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\advdll_gridsel.obj \
 	$(OBJS)\advdll_helpext.obj \
 	$(OBJS)\advdll_hyperlinkg.obj \
-	$(OBJS)\advdll_infobar.obj \
 	$(OBJS)\advdll_laywin.obj \
 	$(OBJS)\advdll_notifmsgg.obj \
 	$(OBJS)\advdll_odcombo.obj \
@@ -4371,7 +4373,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_gridsel.obj \
 	$(OBJS)\advlib_helpext.obj \
 	$(OBJS)\advlib_hyperlinkg.obj \
-	$(OBJS)\advlib_infobar.obj \
 	$(OBJS)\advlib_laywin.obj \
 	$(OBJS)\advlib_notifmsgg.obj \
 	$(OBJS)\advlib_odcombo.obj \
@@ -4411,7 +4412,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\advlib_gridsel.obj \
 	$(OBJS)\advlib_helpext.obj \
 	$(OBJS)\advlib_hyperlinkg.obj \
-	$(OBJS)\advlib_infobar.obj \
 	$(OBJS)\advlib_laywin.obj \
 	$(OBJS)\advlib_notifmsgg.obj \
 	$(OBJS)\advlib_odcombo.obj \
@@ -8184,6 +8184,11 @@ $(OBJS)\monodll_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_infobar.obj: ..\..\src\generic\infobar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\infobar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_listbkg.obj: ..\..\src\generic\listbkg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\listbkg.cpp
 !endif
@@ -8373,11 +8378,6 @@ $(OBJS)\monodll_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_infobar.obj: ..\..\src\generic\infobar.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\infobar.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_laywin.obj: ..\..\src\generic\laywin.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\laywin.cpp
@@ -10385,6 +10385,11 @@ $(OBJS)\monolib_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_infobar.obj: ..\..\src\generic\infobar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\infobar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_listbkg.obj: ..\..\src\generic\listbkg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\listbkg.cpp
 !endif
@@ -10574,11 +10579,6 @@ $(OBJS)\monolib_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp
 !endif
 
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_infobar.obj: ..\..\src\generic\infobar.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\infobar.cpp
-!endif
-
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_laywin.obj: ..\..\src\generic\laywin.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\laywin.cpp
@@ -12595,6 +12595,11 @@ $(OBJS)\coredll_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_infobar.obj: ..\..\src\generic\infobar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\infobar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_listbkg.obj: ..\..\src\generic\listbkg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\listbkg.cpp
 !endif
@@ -13887,6 +13892,11 @@ $(OBJS)\corelib_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp
 !endif
 
 !if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_infobar.obj: ..\..\src\generic\infobar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\infobar.cpp
+!endif
+
+!if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_listbkg.obj: ..\..\src\generic\listbkg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\listbkg.cpp
 !endif
@@ -14060,9 +14070,6 @@ $(OBJS)\advdll_helpext.obj: ..\..\src\generic\helpext.cpp
 $(OBJS)\advdll_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp
 
-$(OBJS)\advdll_infobar.obj: ..\..\src\generic\infobar.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\infobar.cpp
-
 $(OBJS)\advdll_laywin.obj: ..\..\src\generic\laywin.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\laywin.cpp
 
@@ -14174,9 +14181,6 @@ $(OBJS)\advlib_helpext.obj: ..\..\src\generic\helpext.cpp
 $(OBJS)\advlib_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp
 
-$(OBJS)\advlib_infobar.obj: ..\..\src\generic\infobar.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\infobar.cpp
-
 $(OBJS)\advlib_laywin.obj: ..\..\src\generic\laywin.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\laywin.cpp
 
diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index 931ba6fc53..c3157cdfb8 100644
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -454,6 +454,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_dragimgg.obj &
 	$(OBJS)\monodll_filectrlg.obj &
 	$(OBJS)\monodll_headerctrlg.obj &
+	$(OBJS)\monodll_infobar.obj &
 	$(OBJS)\monodll_listbkg.obj &
 	$(OBJS)\monodll_logg.obj &
 	$(OBJS)\monodll_numdlgg.obj &
@@ -701,6 +702,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_dragimgg.obj &
 	$(OBJS)\monodll_filectrlg.obj &
 	$(OBJS)\monodll_headerctrlg.obj &
+	$(OBJS)\monodll_infobar.obj &
 	$(OBJS)\monodll_listbkg.obj &
 	$(OBJS)\monodll_logg.obj &
 	$(OBJS)\monodll_numdlgg.obj &
@@ -744,7 +746,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_gridsel.obj &
 	$(OBJS)\monodll_helpext.obj &
 	$(OBJS)\monodll_hyperlinkg.obj &
-	$(OBJS)\monodll_infobar.obj &
 	$(OBJS)\monodll_laywin.obj &
 	$(OBJS)\monodll_notifmsgg.obj &
 	$(OBJS)\monodll_odcombo.obj &
@@ -784,7 +785,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_gridsel.obj &
 	$(OBJS)\monodll_helpext.obj &
 	$(OBJS)\monodll_hyperlinkg.obj &
-	$(OBJS)\monodll_infobar.obj &
 	$(OBJS)\monodll_laywin.obj &
 	$(OBJS)\monodll_notifmsgg.obj &
 	$(OBJS)\monodll_odcombo.obj &
@@ -1172,6 +1172,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_dragimgg.obj &
 	$(OBJS)\monolib_filectrlg.obj &
 	$(OBJS)\monolib_headerctrlg.obj &
+	$(OBJS)\monolib_infobar.obj &
 	$(OBJS)\monolib_listbkg.obj &
 	$(OBJS)\monolib_logg.obj &
 	$(OBJS)\monolib_numdlgg.obj &
@@ -1419,6 +1420,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_dragimgg.obj &
 	$(OBJS)\monolib_filectrlg.obj &
 	$(OBJS)\monolib_headerctrlg.obj &
+	$(OBJS)\monolib_infobar.obj &
 	$(OBJS)\monolib_listbkg.obj &
 	$(OBJS)\monolib_logg.obj &
 	$(OBJS)\monolib_numdlgg.obj &
@@ -1462,7 +1464,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_gridsel.obj &
 	$(OBJS)\monolib_helpext.obj &
 	$(OBJS)\monolib_hyperlinkg.obj &
-	$(OBJS)\monolib_infobar.obj &
 	$(OBJS)\monolib_laywin.obj &
 	$(OBJS)\monolib_notifmsgg.obj &
 	$(OBJS)\monolib_odcombo.obj &
@@ -1502,7 +1503,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_gridsel.obj &
 	$(OBJS)\monolib_helpext.obj &
 	$(OBJS)\monolib_hyperlinkg.obj &
-	$(OBJS)\monolib_infobar.obj &
 	$(OBJS)\monolib_laywin.obj &
 	$(OBJS)\monolib_notifmsgg.obj &
 	$(OBJS)\monolib_odcombo.obj &
@@ -1799,6 +1799,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_dragimgg.obj &
 	$(OBJS)\coredll_filectrlg.obj &
 	$(OBJS)\coredll_headerctrlg.obj &
+	$(OBJS)\coredll_infobar.obj &
 	$(OBJS)\coredll_listbkg.obj &
 	$(OBJS)\coredll_logg.obj &
 	$(OBJS)\coredll_numdlgg.obj &
@@ -2046,6 +2047,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_dragimgg.obj &
 	$(OBJS)\coredll_filectrlg.obj &
 	$(OBJS)\coredll_headerctrlg.obj &
+	$(OBJS)\coredll_infobar.obj &
 	$(OBJS)\coredll_listbkg.obj &
 	$(OBJS)\coredll_logg.obj &
 	$(OBJS)\coredll_numdlgg.obj &
@@ -2305,6 +2307,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_dragimgg.obj &
 	$(OBJS)\corelib_filectrlg.obj &
 	$(OBJS)\corelib_headerctrlg.obj &
+	$(OBJS)\corelib_infobar.obj &
 	$(OBJS)\corelib_listbkg.obj &
 	$(OBJS)\corelib_logg.obj &
 	$(OBJS)\corelib_numdlgg.obj &
@@ -2552,6 +2555,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_dragimgg.obj &
 	$(OBJS)\corelib_filectrlg.obj &
 	$(OBJS)\corelib_headerctrlg.obj &
+	$(OBJS)\corelib_infobar.obj &
 	$(OBJS)\corelib_listbkg.obj &
 	$(OBJS)\corelib_logg.obj &
 	$(OBJS)\corelib_numdlgg.obj &
@@ -2612,7 +2616,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\advdll_gridsel.obj &
 	$(OBJS)\advdll_helpext.obj &
 	$(OBJS)\advdll_hyperlinkg.obj &
-	$(OBJS)\advdll_infobar.obj &
 	$(OBJS)\advdll_laywin.obj &
 	$(OBJS)\advdll_notifmsgg.obj &
 	$(OBJS)\advdll_odcombo.obj &
@@ -2652,7 +2655,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\advdll_gridsel.obj &
 	$(OBJS)\advdll_helpext.obj &
 	$(OBJS)\advdll_hyperlinkg.obj &
-	$(OBJS)\advdll_infobar.obj &
 	$(OBJS)\advdll_laywin.obj &
 	$(OBJS)\advdll_notifmsgg.obj &
 	$(OBJS)\advdll_odcombo.obj &
@@ -2698,7 +2700,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\advlib_gridsel.obj &
 	$(OBJS)\advlib_helpext.obj &
 	$(OBJS)\advlib_hyperlinkg.obj &
-	$(OBJS)\advlib_infobar.obj &
 	$(OBJS)\advlib_laywin.obj &
 	$(OBJS)\advlib_notifmsgg.obj &
 	$(OBJS)\advlib_odcombo.obj &
@@ -2738,7 +2739,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\advlib_gridsel.obj &
 	$(OBJS)\advlib_helpext.obj &
 	$(OBJS)\advlib_hyperlinkg.obj &
-	$(OBJS)\advlib_infobar.obj &
 	$(OBJS)\advlib_laywin.obj &
 	$(OBJS)\advlib_notifmsgg.obj &
 	$(OBJS)\advlib_odcombo.obj &
@@ -8011,6 +8011,11 @@ $(OBJS)\monodll_headerctrlg.obj :  .AUTODEPEND ..\..\src\generic\headerctrlg.cpp
 !endif
 
 !ifeq USE_GUI 1
+$(OBJS)\monodll_infobar.obj :  .AUTODEPEND ..\..\src\generic\infobar.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
 $(OBJS)\monodll_listbkg.obj :  .AUTODEPEND ..\..\src\generic\listbkg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
@@ -8200,11 +8205,6 @@ $(OBJS)\monodll_hyperlinkg.obj :  .AUTODEPEND ..\..\src\generic\hyperlinkg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monodll_infobar.obj :  .AUTODEPEND ..\..\src\generic\infobar.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\monodll_laywin.obj :  .AUTODEPEND ..\..\src\generic\laywin.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -10212,6 +10212,11 @@ $(OBJS)\monolib_headerctrlg.obj :  .AUTODEPEND ..\..\src\generic\headerctrlg.cpp
 !endif
 
 !ifeq USE_GUI 1
+$(OBJS)\monolib_infobar.obj :  .AUTODEPEND ..\..\src\generic\infobar.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
 $(OBJS)\monolib_listbkg.obj :  .AUTODEPEND ..\..\src\generic\listbkg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
@@ -10401,11 +10406,6 @@ $(OBJS)\monolib_hyperlinkg.obj :  .AUTODEPEND ..\..\src\generic\hyperlinkg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
-!ifeq USE_GUI 1
-$(OBJS)\monolib_infobar.obj :  .AUTODEPEND ..\..\src\generic\infobar.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
 !ifeq USE_GUI 1
 $(OBJS)\monolib_laywin.obj :  .AUTODEPEND ..\..\src\generic\laywin.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -12422,6 +12422,11 @@ $(OBJS)\coredll_headerctrlg.obj :  .AUTODEPEND ..\..\src\generic\headerctrlg.cpp
 !endif
 
 !ifeq USE_GUI 1
+$(OBJS)\coredll_infobar.obj :  .AUTODEPEND ..\..\src\generic\infobar.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
 $(OBJS)\coredll_listbkg.obj :  .AUTODEPEND ..\..\src\generic\listbkg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
@@ -13714,6 +13719,11 @@ $(OBJS)\corelib_headerctrlg.obj :  .AUTODEPEND ..\..\src\generic\headerctrlg.cpp
 !endif
 
 !ifeq USE_GUI 1
+$(OBJS)\corelib_infobar.obj :  .AUTODEPEND ..\..\src\generic\infobar.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
 $(OBJS)\corelib_listbkg.obj :  .AUTODEPEND ..\..\src\generic\listbkg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
@@ -13887,9 +13897,6 @@ $(OBJS)\advdll_helpext.obj :  .AUTODEPEND ..\..\src\generic\helpext.cpp
 $(OBJS)\advdll_hyperlinkg.obj :  .AUTODEPEND ..\..\src\generic\hyperlinkg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
-$(OBJS)\advdll_infobar.obj :  .AUTODEPEND ..\..\src\generic\infobar.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
 $(OBJS)\advdll_laywin.obj :  .AUTODEPEND ..\..\src\generic\laywin.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
 
@@ -14001,9 +14008,6 @@ $(OBJS)\advlib_helpext.obj :  .AUTODEPEND ..\..\src\generic\helpext.cpp
 $(OBJS)\advlib_hyperlinkg.obj :  .AUTODEPEND ..\..\src\generic\hyperlinkg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
-$(OBJS)\advlib_infobar.obj :  .AUTODEPEND ..\..\src\generic\infobar.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
 $(OBJS)\advlib_laywin.obj :  .AUTODEPEND ..\..\src\generic\laywin.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
 
diff --git a/build/msw/wx_adv.dsp b/build/msw/wx_adv.dsp
index abd1f2fbe7..098f2c5adb 100644
--- a/build/msw/wx_adv.dsp
+++ b/build/msw/wx_adv.dsp
@@ -529,10 +529,6 @@ SOURCE=..\..\src\generic\hyperlinkg.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\generic\infobar.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\generic\laywin.cpp
 # End Source File
 # Begin Source File
@@ -890,10 +886,6 @@ SOURCE=..\..\include\wx\generic\hyperlink.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\generic\infobar.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\generic\laywin.h
 # End Source File
 # Begin Source File
@@ -970,10 +962,6 @@ SOURCE=..\..\include\wx\hyperlink.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\include\wx\infobar.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\include\wx\joystick.h
 # End Source File
 # Begin Source File
diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index 6fb98417bd..b2604f04c8 100644
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -2969,6 +2969,10 @@ SOURCE=..\..\src\generic\headerctrlg.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\generic\infobar.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\generic\listbkg.cpp
 # End Source File
 # Begin Source File
diff --git a/build/msw/wx_vc7_adv.vcproj b/build/msw/wx_vc7_adv.vcproj
index bb7e65fed6..9b6a48705d 100644
--- a/build/msw/wx_vc7_adv.vcproj
+++ b/build/msw/wx_vc7_adv.vcproj
@@ -734,9 +734,6 @@
 			<File
 				RelativePath="..\..\src\generic\hyperlinkg.cpp">
 			</File>
-			<File
-				RelativePath="..\..\src\generic\infobar.cpp">
-			</File>
 			<File
 				RelativePath="..\..\src\generic\laywin.cpp">
 			</File>
@@ -1005,9 +1002,6 @@
 			<File
 				RelativePath="..\..\include\wx\generic\hyperlink.h">
 			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\infobar.h">
-			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\laywin.h">
 			</File>
@@ -1066,9 +1060,6 @@
 			<File
 				RelativePath="..\..\include\wx\hyperlink.h">
 			</File>
-			<File
-				RelativePath="..\..\include\wx\infobar.h">
-			</File>
 			<File
 				RelativePath="..\..\include\wx\joystick.h">
 			</File>
diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index 37ff331afc..cd2af40d46 100644
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -2676,6 +2676,9 @@
 				RelativePath="..\..\src\generic\headerctrlg.cpp">
 			</File>
 			<File
+				RelativePath="..\..\src\generic\infobar.cpp">
+			</File>
+			<File
 				RelativePath="..\..\src\generic\listbkg.cpp">
 			</File>
 			<File
diff --git a/build/msw/wx_vc8_adv.vcproj b/build/msw/wx_vc8_adv.vcproj
index 68b3a89ce6..9467c0c809 100644
--- a/build/msw/wx_vc8_adv.vcproj
+++ b/build/msw/wx_vc8_adv.vcproj
@@ -1012,10 +1012,6 @@
 				RelativePath="..\..\src\generic\hyperlinkg.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\generic\infobar.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\generic\laywin.cpp"
 				>
@@ -1359,10 +1355,6 @@
 				RelativePath="..\..\include\wx\generic\hyperlink.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\infobar.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\laywin.h"
 				>
@@ -1440,10 +1432,6 @@
 				RelativePath="..\..\include\wx\hyperlink.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\infobar.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\wx\joystick.h"
 				>
diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index 7d3946603d..d041620ae3 100644
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -3601,6 +3601,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\src\generic\infobar.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\src\generic\listbkg.cpp"
 				>
 			</File>
diff --git a/build/msw/wx_vc9_adv.vcproj b/build/msw/wx_vc9_adv.vcproj
index 3c86e9777e..526c407833 100644
--- a/build/msw/wx_vc9_adv.vcproj
+++ b/build/msw/wx_vc9_adv.vcproj
@@ -1008,10 +1008,6 @@
 				RelativePath="..\..\src\generic\hyperlinkg.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\src\generic\infobar.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\src\generic\laywin.cpp"
 				>
@@ -1355,10 +1351,6 @@
 				RelativePath="..\..\include\wx\generic\hyperlink.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\generic\infobar.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\wx\generic\laywin.h"
 				>
@@ -1436,10 +1428,6 @@
 				RelativePath="..\..\include\wx\hyperlink.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\wx\infobar.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\wx\joystick.h"
 				>
diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj
index f509727aba..3ed038c9b8 100644
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -3597,6 +3597,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\src\generic\infobar.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\src\generic\listbkg.cpp"
 				>
 			</File>
diff --git a/include/wx/generic/infobar.h b/include/wx/generic/infobar.h
index 2134b74454..7beb08ad04 100644
--- a/include/wx/generic/infobar.h
+++ b/include/wx/generic/infobar.h
@@ -19,7 +19,7 @@ class WXDLLIMPEXP_FWD_CORE wxStaticText;
 // wxInfoBar
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_ADV wxInfoBarGeneric : public wxInfoBarBase
+class WXDLLIMPEXP_CORE wxInfoBarGeneric : public wxInfoBarBase
 {
 public:
     // the usual ctors and Create() but remember that info bar is created
diff --git a/include/wx/gtk/infobar.h b/include/wx/gtk/infobar.h
index bd7bdb7f72..5c1ee290bb 100644
--- a/include/wx/gtk/infobar.h
+++ b/include/wx/gtk/infobar.h
@@ -20,7 +20,7 @@
 // notice that the native GTK+ implementation is only available since
 // (relatively recent) 2.18 so we inherit from the generic one to be able to
 // fall back to it if GTK+ version is determined to be too old during run-time
-class WXDLLIMPEXP_ADV wxInfoBar : public wxInfoBarGeneric
+class WXDLLIMPEXP_CORE wxInfoBar : public wxInfoBarGeneric
 {
 public:
     wxInfoBar() { Init(); }
diff --git a/include/wx/infobar.h b/include/wx/infobar.h
index 5480b798e6..4ae10cb568 100644
--- a/include/wx/infobar.h
+++ b/include/wx/infobar.h
@@ -21,7 +21,7 @@
 // wxInfoBar shows non-critical but important information to the user
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_ADV wxInfoBarBase : public wxControl
+class WXDLLIMPEXP_CORE wxInfoBarBase : public wxControl
 {
 public:
     // real ctors are provided by the derived classes, just notice that unlike
diff --git a/interface/wx/infobar.h b/interface/wx/infobar.h
index d5e4676bde..e1c18a0ca7 100644
--- a/interface/wx/infobar.h
+++ b/interface/wx/infobar.h
@@ -64,7 +64,7 @@
     native implementation requires a recent -- as of this writing -- GTK+ 2.18
     version.
 
-    @library{wxadv}
+    @library{wxcore}
     @category{miscwnd}
 
     @see wxStatusBar, wxMessageDialog
-- 
2.45.2