Integrate with GNOME's Recent Documents menu.

GTK+ provides GtkRecentManager for this purpose since 2.10. Use it in wxFileHistory if available. Integration is simple, we just add a file to GtkRecentManager in addition to normal wxFileHistory handling. A well-behaved GNOME application would use GtkRecentManager as the primary store for recent files, so that it reflects when the user works with supported files in another editor(s) too. But for now, this is much better than no support at all. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-05-07 06:45:48 +00:00
parent 8122745571
commit 690ddfec6e
14 changed files with 260 additions and 142 deletions
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -1039,6 +1039,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/gtk/dnd.cpp
    src/gtk/evtloop.cpp
    src/gtk/filectrl.cpp
+    src/gtk/filehistory.cpp
    src/gtk/font.cpp
    src/gtk/sockgtk.cpp
    src/gtk/minifram.cpp
@@ -1077,6 +1078,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    wx/gtk/evtloop.h
    wx/gtk/evtloopsrc.h
    wx/gtk/font.h
+    wx/gtk/filehistory.h
    wx/gtk/minifram.h
    wx/gtk/pen.h
    wx/gtk/popupwin.h
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1882,7 +1882,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_dragimgg.obj \
 	$(OBJS)\monodll_filectrlg.obj \
 	$(OBJS)\monodll_headerctrlg.obj \
-	$(OBJS)\monodll_infobar.obj \
+	$(OBJS)\monodll_infobar.obj \
 	$(OBJS)\monodll_listbkg.obj \
 	$(OBJS)\monodll_logg.obj \
 	$(OBJS)\monodll_numdlgg.obj \
@@ -2128,7 +2128,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_dragimgg.obj \
 	$(OBJS)\monodll_filectrlg.obj \
 	$(OBJS)\monodll_headerctrlg.obj \
-	$(OBJS)\monodll_infobar.obj \
+	$(OBJS)\monodll_infobar.obj \
 	$(OBJS)\monodll_listbkg.obj \
 	$(OBJS)\monodll_logg.obj \
 	$(OBJS)\monodll_numdlgg.obj \
@@ -2589,7 +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_infobar.obj \
 	$(OBJS)\monolib_listbkg.obj \
 	$(OBJS)\monolib_logg.obj \
 	$(OBJS)\monolib_numdlgg.obj \
@@ -2835,7 +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_infobar.obj \
 	$(OBJS)\monolib_listbkg.obj \
 	$(OBJS)\monolib_logg.obj \
 	$(OBJS)\monolib_numdlgg.obj \
@@ -3189,7 +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_infobar.obj \
 	$(OBJS)\coredll_listbkg.obj \
 	$(OBJS)\coredll_logg.obj \
 	$(OBJS)\coredll_numdlgg.obj \
@@ -3435,7 +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_infobar.obj \
 	$(OBJS)\coredll_listbkg.obj \
 	$(OBJS)\coredll_logg.obj \
 	$(OBJS)\coredll_numdlgg.obj \
@@ -3687,7 +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_infobar.obj \
 	$(OBJS)\corelib_listbkg.obj \
 	$(OBJS)\corelib_logg.obj \
 	$(OBJS)\corelib_numdlgg.obj \
@@ -3933,7 +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_infobar.obj \
 	$(OBJS)\corelib_listbkg.obj \
 	$(OBJS)\corelib_logg.obj \
 	$(OBJS)\corelib_numdlgg.obj \
@@ -7604,11 +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_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
@@ -9805,11 +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_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
@@ -12015,11 +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_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
@@ -13312,11 +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_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
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1892,7 +1892,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_dragimgg.o \
 	$(OBJS)\monodll_filectrlg.o \
 	$(OBJS)\monodll_headerctrlg.o \
-	$(OBJS)\monodll_infobar.o \
+	$(OBJS)\monodll_infobar.o \
 	$(OBJS)\monodll_listbkg.o \
 	$(OBJS)\monodll_logg.o \
 	$(OBJS)\monodll_numdlgg.o \
@@ -2140,7 +2140,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_dragimgg.o \
 	$(OBJS)\monodll_filectrlg.o \
 	$(OBJS)\monodll_headerctrlg.o \
-	$(OBJS)\monodll_infobar.o \
+	$(OBJS)\monodll_infobar.o \
 	$(OBJS)\monodll_listbkg.o \
 	$(OBJS)\monodll_logg.o \
 	$(OBJS)\monodll_numdlgg.o \
@@ -2605,7 +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_infobar.o \
 	$(OBJS)\monolib_listbkg.o \
 	$(OBJS)\monolib_logg.o \
 	$(OBJS)\monolib_numdlgg.o \
@@ -2853,7 +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_infobar.o \
 	$(OBJS)\monolib_listbkg.o \
 	$(OBJS)\monolib_logg.o \
 	$(OBJS)\monolib_numdlgg.o \
@@ -3221,7 +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_infobar.o \
 	$(OBJS)\coredll_listbkg.o \
 	$(OBJS)\coredll_logg.o \
 	$(OBJS)\coredll_numdlgg.o \
@@ -3469,7 +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_infobar.o \
 	$(OBJS)\coredll_listbkg.o \
 	$(OBJS)\coredll_logg.o \
 	$(OBJS)\coredll_numdlgg.o \
@@ -3727,7 +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_infobar.o \
 	$(OBJS)\corelib_listbkg.o \
 	$(OBJS)\corelib_logg.o \
 	$(OBJS)\corelib_numdlgg.o \
@@ -3975,7 +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_infobar.o \
 	$(OBJS)\corelib_listbkg.o \
 	$(OBJS)\corelib_logg.o \
 	$(OBJS)\corelib_numdlgg.o \
@@ -7753,11 +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_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
@@ -9954,11 +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_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
@@ -12164,11 +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_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
@@ -13461,11 +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_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
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -2090,7 +2090,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_dragimgg.obj \
 	$(OBJS)\monodll_filectrlg.obj \
 	$(OBJS)\monodll_headerctrlg.obj \
-	$(OBJS)\monodll_infobar.obj \
+	$(OBJS)\monodll_infobar.obj \
 	$(OBJS)\monodll_listbkg.obj \
 	$(OBJS)\monodll_logg.obj \
 	$(OBJS)\monodll_numdlgg.obj \
@@ -2336,7 +2336,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_dragimgg.obj \
 	$(OBJS)\monodll_filectrlg.obj \
 	$(OBJS)\monodll_headerctrlg.obj \
-	$(OBJS)\monodll_infobar.obj \
+	$(OBJS)\monodll_infobar.obj \
 	$(OBJS)\monodll_listbkg.obj \
 	$(OBJS)\monodll_logg.obj \
 	$(OBJS)\monodll_numdlgg.obj \
@@ -2803,7 +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_infobar.obj \
 	$(OBJS)\monolib_listbkg.obj \
 	$(OBJS)\monolib_logg.obj \
 	$(OBJS)\monolib_numdlgg.obj \
@@ -3049,7 +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_infobar.obj \
 	$(OBJS)\monolib_listbkg.obj \
 	$(OBJS)\monolib_logg.obj \
 	$(OBJS)\monolib_numdlgg.obj \
@@ -3469,7 +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_infobar.obj \
 	$(OBJS)\coredll_listbkg.obj \
 	$(OBJS)\coredll_logg.obj \
 	$(OBJS)\coredll_numdlgg.obj \
@@ -3715,7 +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_infobar.obj \
 	$(OBJS)\coredll_listbkg.obj \
 	$(OBJS)\coredll_logg.obj \
 	$(OBJS)\coredll_numdlgg.obj \
@@ -3973,7 +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_infobar.obj \
 	$(OBJS)\corelib_listbkg.obj \
 	$(OBJS)\corelib_logg.obj \
 	$(OBJS)\corelib_numdlgg.obj \
@@ -4219,7 +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_infobar.obj \
 	$(OBJS)\corelib_listbkg.obj \
 	$(OBJS)\corelib_logg.obj \
 	$(OBJS)\corelib_numdlgg.obj \
@@ -8184,11 +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_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
@@ -10385,11 +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_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
@@ -12595,11 +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_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
@@ -13892,11 +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_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
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -454,7 +454,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_dragimgg.obj &
 	$(OBJS)\monodll_filectrlg.obj &
 	$(OBJS)\monodll_headerctrlg.obj &
-	$(OBJS)\monodll_infobar.obj &
+	$(OBJS)\monodll_infobar.obj &
 	$(OBJS)\monodll_listbkg.obj &
 	$(OBJS)\monodll_logg.obj &
 	$(OBJS)\monodll_numdlgg.obj &
@@ -702,7 +702,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_dragimgg.obj &
 	$(OBJS)\monodll_filectrlg.obj &
 	$(OBJS)\monodll_headerctrlg.obj &
-	$(OBJS)\monodll_infobar.obj &
+	$(OBJS)\monodll_infobar.obj &
 	$(OBJS)\monodll_listbkg.obj &
 	$(OBJS)\monodll_logg.obj &
 	$(OBJS)\monodll_numdlgg.obj &
@@ -1172,7 +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_infobar.obj &
 	$(OBJS)\monolib_listbkg.obj &
 	$(OBJS)\monolib_logg.obj &
 	$(OBJS)\monolib_numdlgg.obj &
@@ -1420,7 +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_infobar.obj &
 	$(OBJS)\monolib_listbkg.obj &
 	$(OBJS)\monolib_logg.obj &
 	$(OBJS)\monolib_numdlgg.obj &
@@ -1799,7 +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_infobar.obj &
 	$(OBJS)\coredll_listbkg.obj &
 	$(OBJS)\coredll_logg.obj &
 	$(OBJS)\coredll_numdlgg.obj &
@@ -2047,7 +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_infobar.obj &
 	$(OBJS)\coredll_listbkg.obj &
 	$(OBJS)\coredll_logg.obj &
 	$(OBJS)\coredll_numdlgg.obj &
@@ -2307,7 +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_infobar.obj &
 	$(OBJS)\corelib_listbkg.obj &
 	$(OBJS)\corelib_logg.obj &
 	$(OBJS)\corelib_numdlgg.obj &
@@ -2555,7 +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_infobar.obj &
 	$(OBJS)\corelib_listbkg.obj &
 	$(OBJS)\corelib_logg.obj &
 	$(OBJS)\corelib_numdlgg.obj &
@@ -8011,11 +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_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
@@ -10212,11 +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_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
@@ -12422,11 +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_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
@@ -13719,11 +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_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
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -2969,10 +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\infobar.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\generic\listbkg.cpp
 # End Source File
 # Begin Source File
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -2676,9 +2676,9 @@
 				RelativePath="..\..\src\generic\headerctrlg.cpp">
 			</File>
 			<File
-				RelativePath="..\..\src\generic\infobar.cpp">
-			</File>
-			<File
+				RelativePath="..\..\src\generic\infobar.cpp">
+			</File>
+			<File
 				RelativePath="..\..\src\generic\listbkg.cpp">
 			</File>
 			<File
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -3601,10 +3601,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\generic\infobar.cpp"
-				>
-			</File>
-			<File
+				RelativePath="..\..\src\generic\infobar.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\src\generic\listbkg.cpp"
 				>
 			</File>
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -3597,10 +3597,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\generic\infobar.cpp"
-				>
-			</File>
-			<File
+				RelativePath="..\..\src\generic\infobar.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\src\generic\listbkg.cpp"
 				>
 			</File>