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

Integrate with GNOME's Recent Documents menu.

Browse Source 
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
This commit is contained in:
Václav Slavík
2010-05-07 06:45:48 +00:00
parent 8122745571
commit 690ddfec6e
14 changed files with 260 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile.in
View File

@@ -2509,6 +2509,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_LOWLEVEL_HDR = \
wx/gtk/evtloop.h \ wx/gtk/evtloop.h \
wx/gtk/evtloopsrc.h \ wx/gtk/evtloopsrc.h \
wx/gtk/font.h \ wx/gtk/font.h \
wx/gtk/filehistory.h \
wx/gtk/minifram.h \ wx/gtk/minifram.h \
wx/gtk/pen.h \ wx/gtk/pen.h \
wx/gtk/popupwin.h \ wx/gtk/popupwin.h \
@@ -4694,6 +4695,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS = \
monodll_gtk_dnd.o \ monodll_gtk_dnd.o \
monodll_gtk_evtloop.o \ monodll_gtk_evtloop.o \
monodll_filectrl.o \ monodll_filectrl.o \
monodll_filehistory.o \
monodll_gtk_font.o \ monodll_gtk_font.o \
monodll_gtk_sockgtk.o \ monodll_gtk_sockgtk.o \
monodll_gtk_minifram.o \ monodll_gtk_minifram.o \
@@ -5543,6 +5545,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_1 = \
monodll_gtk_dnd.o \ monodll_gtk_dnd.o \
monodll_gtk_evtloop.o \ monodll_gtk_evtloop.o \
monodll_filectrl.o \ monodll_filectrl.o \
monodll_filehistory.o \
monodll_gtk_font.o \ monodll_gtk_font.o \
monodll_gtk_sockgtk.o \ monodll_gtk_sockgtk.o \
monodll_gtk_minifram.o \ monodll_gtk_minifram.o \
@@ -6533,6 +6536,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_2 = \
monolib_gtk_dnd.o \ monolib_gtk_dnd.o \
monolib_gtk_evtloop.o \ monolib_gtk_evtloop.o \
monolib_filectrl.o \ monolib_filectrl.o \
monolib_filehistory.o \
monolib_gtk_font.o \ monolib_gtk_font.o \
monolib_gtk_sockgtk.o \ monolib_gtk_sockgtk.o \
monolib_gtk_minifram.o \ monolib_gtk_minifram.o \
@@ -7382,6 +7386,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_3 = \
monolib_gtk_dnd.o \ monolib_gtk_dnd.o \
monolib_gtk_evtloop.o \ monolib_gtk_evtloop.o \
monolib_filectrl.o \ monolib_filectrl.o \
monolib_filehistory.o \
monolib_gtk_font.o \ monolib_gtk_font.o \
monolib_gtk_sockgtk.o \ monolib_gtk_sockgtk.o \
monolib_gtk_minifram.o \ monolib_gtk_minifram.o \
@@ -8561,6 +8566,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_4 = \
coredll_gtk_dnd.o \ coredll_gtk_dnd.o \
coredll_gtk_evtloop.o \ coredll_gtk_evtloop.o \
coredll_filectrl.o \ coredll_filectrl.o \
coredll_filehistory.o \
coredll_gtk_font.o \ coredll_gtk_font.o \
coredll_gtk_sockgtk.o \ coredll_gtk_sockgtk.o \
coredll_gtk_minifram.o \ coredll_gtk_minifram.o \
@@ -9410,6 +9416,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_5 = \
coredll_gtk_dnd.o \ coredll_gtk_dnd.o \
coredll_gtk_evtloop.o \ coredll_gtk_evtloop.o \
coredll_filectrl.o \ coredll_filectrl.o \
coredll_filehistory.o \
coredll_gtk_font.o \ coredll_gtk_font.o \
coredll_gtk_sockgtk.o \ coredll_gtk_sockgtk.o \
coredll_gtk_minifram.o \ coredll_gtk_minifram.o \
@@ -10076,6 +10083,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_6 = \
corelib_gtk_dnd.o \ corelib_gtk_dnd.o \
corelib_gtk_evtloop.o \ corelib_gtk_evtloop.o \
corelib_filectrl.o \ corelib_filectrl.o \
corelib_filehistory.o \
corelib_gtk_font.o \ corelib_gtk_font.o \
corelib_gtk_sockgtk.o \ corelib_gtk_sockgtk.o \
corelib_gtk_minifram.o \ corelib_gtk_minifram.o \
@@ -10925,6 +10933,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_7 = \
corelib_gtk_dnd.o \ corelib_gtk_dnd.o \
corelib_gtk_evtloop.o \ corelib_gtk_evtloop.o \
corelib_filectrl.o \ corelib_filectrl.o \
corelib_filehistory.o \
corelib_gtk_font.o \ corelib_gtk_font.o \
corelib_gtk_sockgtk.o \ corelib_gtk_sockgtk.o \
corelib_gtk_minifram.o \ corelib_gtk_minifram.o \
@@ -17101,6 +17110,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_filectrl.o: $(srcdir)/src/gtk/filectrl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_filectrl.o: $(srcdir)/src/gtk/filectrl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/filectrl.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/filectrl.cpp
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_filehistory.o: $(srcdir)/src/gtk/filehistory.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/filehistory.cpp
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_font.o: $(srcdir)/src/gtk/font.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gtk_font.o: $(srcdir)/src/gtk/font.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/font.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/font.cpp
@@ -21961,6 +21973,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_filectrl.o: $(srcdir)/src/gtk/filectrl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_filectrl.o: $(srcdir)/src/gtk/filectrl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/filectrl.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/filectrl.cpp
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_filehistory.o: $(srcdir)/src/gtk/filehistory.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/filehistory.cpp
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_font.o: $(srcdir)/src/gtk/font.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gtk_font.o: $(srcdir)/src/gtk/font.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/font.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/font.cpp
@@ -27013,6 +27028,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_filectrl.o: $(srcdir)/src/gtk/filectrl.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_filectrl.o: $(srcdir)/src/gtk/filectrl.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/filectrl.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/filectrl.cpp
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_filehistory.o: $(srcdir)/src/gtk/filehistory.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/filehistory.cpp
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_font.o: $(srcdir)/src/gtk/font.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gtk_font.o: $(srcdir)/src/gtk/font.cpp $(COREDLL_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/font.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/font.cpp
@@ -30604,6 +30622,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_filectrl.o: $(srcdir)/src/gtk/filectrl.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_filectrl.o: $(srcdir)/src/gtk/filectrl.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/filectrl.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/filectrl.cpp
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_filehistory.o: $(srcdir)/src/gtk/filehistory.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/filehistory.cpp
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_font.o: $(srcdir)/src/gtk/font.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gtk_font.o: $(srcdir)/src/gtk/font.cpp $(CORELIB_ODEP)
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/font.cpp @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/font.cpp

2
build/bakefiles/files.bkl
View File

@@ -1039,6 +1039,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/gtk/dnd.cpp src/gtk/dnd.cpp
src/gtk/evtloop.cpp src/gtk/evtloop.cpp
src/gtk/filectrl.cpp src/gtk/filectrl.cpp
src/gtk/filehistory.cpp
src/gtk/font.cpp src/gtk/font.cpp
src/gtk/sockgtk.cpp src/gtk/sockgtk.cpp
src/gtk/minifram.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/evtloop.h
wx/gtk/evtloopsrc.h wx/gtk/evtloopsrc.h
wx/gtk/font.h wx/gtk/font.h
wx/gtk/filehistory.h
wx/gtk/minifram.h wx/gtk/minifram.h
wx/gtk/pen.h wx/gtk/pen.h
wx/gtk/popupwin.h wx/gtk/popupwin.h

56
build/msw/makefile.bcc
View File

@@ -1882,7 +1882,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_dragimgg.obj \ $(OBJS)\monodll_dragimgg.obj \
$(OBJS)\monodll_filectrlg.obj \ $(OBJS)\monodll_filectrlg.obj \
$(OBJS)\monodll_headerctrlg.obj \ $(OBJS)\monodll_headerctrlg.obj \
$(OBJS)\monodll_infobar.obj \ $(OBJS)\monodll_infobar.obj \
$(OBJS)\monodll_listbkg.obj \ $(OBJS)\monodll_listbkg.obj \
$(OBJS)\monodll_logg.obj \ $(OBJS)\monodll_logg.obj \
$(OBJS)\monodll_numdlgg.obj \ $(OBJS)\monodll_numdlgg.obj \
@@ -2128,7 +2128,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_dragimgg.obj \ $(OBJS)\monodll_dragimgg.obj \
$(OBJS)\monodll_filectrlg.obj \ $(OBJS)\monodll_filectrlg.obj \
$(OBJS)\monodll_headerctrlg.obj \ $(OBJS)\monodll_headerctrlg.obj \
$(OBJS)\monodll_infobar.obj \ $(OBJS)\monodll_infobar.obj \
$(OBJS)\monodll_listbkg.obj \ $(OBJS)\monodll_listbkg.obj \
$(OBJS)\monodll_logg.obj \ $(OBJS)\monodll_logg.obj \
$(OBJS)\monodll_numdlgg.obj \ $(OBJS)\monodll_numdlgg.obj \
@@ -2589,7 +2589,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_dragimgg.obj \ $(OBJS)\monolib_dragimgg.obj \
$(OBJS)\monolib_filectrlg.obj \ $(OBJS)\monolib_filectrlg.obj \
$(OBJS)\monolib_headerctrlg.obj \ $(OBJS)\monolib_headerctrlg.obj \
$(OBJS)\monolib_infobar.obj \ $(OBJS)\monolib_infobar.obj \
$(OBJS)\monolib_listbkg.obj \ $(OBJS)\monolib_listbkg.obj \
$(OBJS)\monolib_logg.obj \ $(OBJS)\monolib_logg.obj \
$(OBJS)\monolib_numdlgg.obj \ $(OBJS)\monolib_numdlgg.obj \
@@ -2835,7 +2835,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_dragimgg.obj \ $(OBJS)\monolib_dragimgg.obj \
$(OBJS)\monolib_filectrlg.obj \ $(OBJS)\monolib_filectrlg.obj \
$(OBJS)\monolib_headerctrlg.obj \ $(OBJS)\monolib_headerctrlg.obj \
$(OBJS)\monolib_infobar.obj \ $(OBJS)\monolib_infobar.obj \
$(OBJS)\monolib_listbkg.obj \ $(OBJS)\monolib_listbkg.obj \
$(OBJS)\monolib_logg.obj \ $(OBJS)\monolib_logg.obj \
$(OBJS)\monolib_numdlgg.obj \ $(OBJS)\monolib_numdlgg.obj \
@@ -3189,7 +3189,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_dragimgg.obj \ $(OBJS)\coredll_dragimgg.obj \
$(OBJS)\coredll_filectrlg.obj \ $(OBJS)\coredll_filectrlg.obj \
$(OBJS)\coredll_headerctrlg.obj \ $(OBJS)\coredll_headerctrlg.obj \
$(OBJS)\coredll_infobar.obj \ $(OBJS)\coredll_infobar.obj \
$(OBJS)\coredll_listbkg.obj \ $(OBJS)\coredll_listbkg.obj \
$(OBJS)\coredll_logg.obj \ $(OBJS)\coredll_logg.obj \
$(OBJS)\coredll_numdlgg.obj \ $(OBJS)\coredll_numdlgg.obj \
@@ -3435,7 +3435,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_dragimgg.obj \ $(OBJS)\coredll_dragimgg.obj \
$(OBJS)\coredll_filectrlg.obj \ $(OBJS)\coredll_filectrlg.obj \
$(OBJS)\coredll_headerctrlg.obj \ $(OBJS)\coredll_headerctrlg.obj \
$(OBJS)\coredll_infobar.obj \ $(OBJS)\coredll_infobar.obj \
$(OBJS)\coredll_listbkg.obj \ $(OBJS)\coredll_listbkg.obj \
$(OBJS)\coredll_logg.obj \ $(OBJS)\coredll_logg.obj \
$(OBJS)\coredll_numdlgg.obj \ $(OBJS)\coredll_numdlgg.obj \
@@ -3687,7 +3687,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_dragimgg.obj \ $(OBJS)\corelib_dragimgg.obj \
$(OBJS)\corelib_filectrlg.obj \ $(OBJS)\corelib_filectrlg.obj \
$(OBJS)\corelib_headerctrlg.obj \ $(OBJS)\corelib_headerctrlg.obj \
$(OBJS)\corelib_infobar.obj \ $(OBJS)\corelib_infobar.obj \
$(OBJS)\corelib_listbkg.obj \ $(OBJS)\corelib_listbkg.obj \
$(OBJS)\corelib_logg.obj \ $(OBJS)\corelib_logg.obj \
$(OBJS)\corelib_numdlgg.obj \ $(OBJS)\corelib_numdlgg.obj \
@@ -3933,7 +3933,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_dragimgg.obj \ $(OBJS)\corelib_dragimgg.obj \
$(OBJS)\corelib_filectrlg.obj \ $(OBJS)\corelib_filectrlg.obj \
$(OBJS)\corelib_headerctrlg.obj \ $(OBJS)\corelib_headerctrlg.obj \
$(OBJS)\corelib_infobar.obj \ $(OBJS)\corelib_infobar.obj \
$(OBJS)\corelib_listbkg.obj \ $(OBJS)\corelib_listbkg.obj \
$(OBJS)\corelib_logg.obj \ $(OBJS)\corelib_logg.obj \
$(OBJS)\corelib_numdlgg.obj \ $(OBJS)\corelib_numdlgg.obj \
@@ -7604,11 +7604,11 @@ $(OBJS)\monodll_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
$(OBJS)\monodll_infobar.obj: ..\..\src\generic\infobar.cpp $(OBJS)\monodll_infobar.obj: ..\..\src\generic\infobar.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\infobar.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\infobar.cpp
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
$(OBJS)\monodll_listbkg.obj: ..\..\src\generic\listbkg.cpp $(OBJS)\monodll_listbkg.obj: ..\..\src\generic\listbkg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\listbkg.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\listbkg.cpp
!endif !endif
@@ -9805,11 +9805,11 @@ $(OBJS)\monolib_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
$(OBJS)\monolib_infobar.obj: ..\..\src\generic\infobar.cpp $(OBJS)\monolib_infobar.obj: ..\..\src\generic\infobar.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\infobar.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\infobar.cpp
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
$(OBJS)\monolib_listbkg.obj: ..\..\src\generic\listbkg.cpp $(OBJS)\monolib_listbkg.obj: ..\..\src\generic\listbkg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\listbkg.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\listbkg.cpp
!endif !endif
@@ -12015,11 +12015,11 @@ $(OBJS)\coredll_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
$(OBJS)\coredll_infobar.obj: ..\..\src\generic\infobar.cpp $(OBJS)\coredll_infobar.obj: ..\..\src\generic\infobar.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\infobar.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\infobar.cpp
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
$(OBJS)\coredll_listbkg.obj: ..\..\src\generic\listbkg.cpp $(OBJS)\coredll_listbkg.obj: ..\..\src\generic\listbkg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\listbkg.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\listbkg.cpp
!endif !endif
@@ -13312,11 +13312,11 @@ $(OBJS)\corelib_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
$(OBJS)\corelib_infobar.obj: ..\..\src\generic\infobar.cpp $(OBJS)\corelib_infobar.obj: ..\..\src\generic\infobar.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\infobar.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\infobar.cpp
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
$(OBJS)\corelib_listbkg.obj: ..\..\src\generic\listbkg.cpp $(OBJS)\corelib_listbkg.obj: ..\..\src\generic\listbkg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\listbkg.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\listbkg.cpp
!endif !endif

56
build/msw/makefile.gcc
View File

@@ -1892,7 +1892,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_dragimgg.o \ $(OBJS)\monodll_dragimgg.o \
$(OBJS)\monodll_filectrlg.o \ $(OBJS)\monodll_filectrlg.o \
$(OBJS)\monodll_headerctrlg.o \ $(OBJS)\monodll_headerctrlg.o \
$(OBJS)\monodll_infobar.o \ $(OBJS)\monodll_infobar.o \
$(OBJS)\monodll_listbkg.o \ $(OBJS)\monodll_listbkg.o \
$(OBJS)\monodll_logg.o \ $(OBJS)\monodll_logg.o \
$(OBJS)\monodll_numdlgg.o \ $(OBJS)\monodll_numdlgg.o \
@@ -2140,7 +2140,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_dragimgg.o \ $(OBJS)\monodll_dragimgg.o \
$(OBJS)\monodll_filectrlg.o \ $(OBJS)\monodll_filectrlg.o \
$(OBJS)\monodll_headerctrlg.o \ $(OBJS)\monodll_headerctrlg.o \
$(OBJS)\monodll_infobar.o \ $(OBJS)\monodll_infobar.o \
$(OBJS)\monodll_listbkg.o \ $(OBJS)\monodll_listbkg.o \
$(OBJS)\monodll_logg.o \ $(OBJS)\monodll_logg.o \
$(OBJS)\monodll_numdlgg.o \ $(OBJS)\monodll_numdlgg.o \
@@ -2605,7 +2605,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_dragimgg.o \ $(OBJS)\monolib_dragimgg.o \
$(OBJS)\monolib_filectrlg.o \ $(OBJS)\monolib_filectrlg.o \
$(OBJS)\monolib_headerctrlg.o \ $(OBJS)\monolib_headerctrlg.o \
$(OBJS)\monolib_infobar.o \ $(OBJS)\monolib_infobar.o \
$(OBJS)\monolib_listbkg.o \ $(OBJS)\monolib_listbkg.o \
$(OBJS)\monolib_logg.o \ $(OBJS)\monolib_logg.o \
$(OBJS)\monolib_numdlgg.o \ $(OBJS)\monolib_numdlgg.o \
@@ -2853,7 +2853,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_dragimgg.o \ $(OBJS)\monolib_dragimgg.o \
$(OBJS)\monolib_filectrlg.o \ $(OBJS)\monolib_filectrlg.o \
$(OBJS)\monolib_headerctrlg.o \ $(OBJS)\monolib_headerctrlg.o \
$(OBJS)\monolib_infobar.o \ $(OBJS)\monolib_infobar.o \
$(OBJS)\monolib_listbkg.o \ $(OBJS)\monolib_listbkg.o \
$(OBJS)\monolib_logg.o \ $(OBJS)\monolib_logg.o \
$(OBJS)\monolib_numdlgg.o \ $(OBJS)\monolib_numdlgg.o \
@@ -3221,7 +3221,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_dragimgg.o \ $(OBJS)\coredll_dragimgg.o \
$(OBJS)\coredll_filectrlg.o \ $(OBJS)\coredll_filectrlg.o \
$(OBJS)\coredll_headerctrlg.o \ $(OBJS)\coredll_headerctrlg.o \
$(OBJS)\coredll_infobar.o \ $(OBJS)\coredll_infobar.o \
$(OBJS)\coredll_listbkg.o \ $(OBJS)\coredll_listbkg.o \
$(OBJS)\coredll_logg.o \ $(OBJS)\coredll_logg.o \
$(OBJS)\coredll_numdlgg.o \ $(OBJS)\coredll_numdlgg.o \
@@ -3469,7 +3469,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_dragimgg.o \ $(OBJS)\coredll_dragimgg.o \
$(OBJS)\coredll_filectrlg.o \ $(OBJS)\coredll_filectrlg.o \
$(OBJS)\coredll_headerctrlg.o \ $(OBJS)\coredll_headerctrlg.o \
$(OBJS)\coredll_infobar.o \ $(OBJS)\coredll_infobar.o \
$(OBJS)\coredll_listbkg.o \ $(OBJS)\coredll_listbkg.o \
$(OBJS)\coredll_logg.o \ $(OBJS)\coredll_logg.o \
$(OBJS)\coredll_numdlgg.o \ $(OBJS)\coredll_numdlgg.o \
@@ -3727,7 +3727,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_dragimgg.o \ $(OBJS)\corelib_dragimgg.o \
$(OBJS)\corelib_filectrlg.o \ $(OBJS)\corelib_filectrlg.o \
$(OBJS)\corelib_headerctrlg.o \ $(OBJS)\corelib_headerctrlg.o \
$(OBJS)\corelib_infobar.o \ $(OBJS)\corelib_infobar.o \
$(OBJS)\corelib_listbkg.o \ $(OBJS)\corelib_listbkg.o \
$(OBJS)\corelib_logg.o \ $(OBJS)\corelib_logg.o \
$(OBJS)\corelib_numdlgg.o \ $(OBJS)\corelib_numdlgg.o \
@@ -3975,7 +3975,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_dragimgg.o \ $(OBJS)\corelib_dragimgg.o \
$(OBJS)\corelib_filectrlg.o \ $(OBJS)\corelib_filectrlg.o \
$(OBJS)\corelib_headerctrlg.o \ $(OBJS)\corelib_headerctrlg.o \
$(OBJS)\corelib_infobar.o \ $(OBJS)\corelib_infobar.o \
$(OBJS)\corelib_listbkg.o \ $(OBJS)\corelib_listbkg.o \
$(OBJS)\corelib_logg.o \ $(OBJS)\corelib_logg.o \
$(OBJS)\corelib_numdlgg.o \ $(OBJS)\corelib_numdlgg.o \
@@ -7753,11 +7753,11 @@ $(OBJS)\monodll_headerctrlg.o: ../../src/generic/headerctrlg.cpp
endif endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
$(OBJS)\monodll_infobar.o: ../../src/generic/infobar.cpp $(OBJS)\monodll_infobar.o: ../../src/generic/infobar.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
$(OBJS)\monodll_listbkg.o: ../../src/generic/listbkg.cpp $(OBJS)\monodll_listbkg.o: ../../src/generic/listbkg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif endif
@@ -9954,11 +9954,11 @@ $(OBJS)\monolib_headerctrlg.o: ../../src/generic/headerctrlg.cpp
endif endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
$(OBJS)\monolib_infobar.o: ../../src/generic/infobar.cpp $(OBJS)\monolib_infobar.o: ../../src/generic/infobar.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
$(OBJS)\monolib_listbkg.o: ../../src/generic/listbkg.cpp $(OBJS)\monolib_listbkg.o: ../../src/generic/listbkg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif endif
@@ -12164,11 +12164,11 @@ $(OBJS)\coredll_headerctrlg.o: ../../src/generic/headerctrlg.cpp
endif endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
$(OBJS)\coredll_infobar.o: ../../src/generic/infobar.cpp $(OBJS)\coredll_infobar.o: ../../src/generic/infobar.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
$(OBJS)\coredll_listbkg.o: ../../src/generic/listbkg.cpp $(OBJS)\coredll_listbkg.o: ../../src/generic/listbkg.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif endif
@@ -13461,11 +13461,11 @@ $(OBJS)\corelib_headerctrlg.o: ../../src/generic/headerctrlg.cpp
endif endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
$(OBJS)\corelib_infobar.o: ../../src/generic/infobar.cpp $(OBJS)\corelib_infobar.o: ../../src/generic/infobar.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif endif
ifeq ($(USE_GUI),1) ifeq ($(USE_GUI),1)
$(OBJS)\corelib_listbkg.o: ../../src/generic/listbkg.cpp $(OBJS)\corelib_listbkg.o: ../../src/generic/listbkg.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif endif

56
build/msw/makefile.vc
View File

@@ -2090,7 +2090,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_dragimgg.obj \ $(OBJS)\monodll_dragimgg.obj \
$(OBJS)\monodll_filectrlg.obj \ $(OBJS)\monodll_filectrlg.obj \
$(OBJS)\monodll_headerctrlg.obj \ $(OBJS)\monodll_headerctrlg.obj \
$(OBJS)\monodll_infobar.obj \ $(OBJS)\monodll_infobar.obj \
$(OBJS)\monodll_listbkg.obj \ $(OBJS)\monodll_listbkg.obj \
$(OBJS)\monodll_logg.obj \ $(OBJS)\monodll_logg.obj \
$(OBJS)\monodll_numdlgg.obj \ $(OBJS)\monodll_numdlgg.obj \
@@ -2336,7 +2336,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_dragimgg.obj \ $(OBJS)\monodll_dragimgg.obj \
$(OBJS)\monodll_filectrlg.obj \ $(OBJS)\monodll_filectrlg.obj \
$(OBJS)\monodll_headerctrlg.obj \ $(OBJS)\monodll_headerctrlg.obj \
$(OBJS)\monodll_infobar.obj \ $(OBJS)\monodll_infobar.obj \
$(OBJS)\monodll_listbkg.obj \ $(OBJS)\monodll_listbkg.obj \
$(OBJS)\monodll_logg.obj \ $(OBJS)\monodll_logg.obj \
$(OBJS)\monodll_numdlgg.obj \ $(OBJS)\monodll_numdlgg.obj \
@@ -2803,7 +2803,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_dragimgg.obj \ $(OBJS)\monolib_dragimgg.obj \
$(OBJS)\monolib_filectrlg.obj \ $(OBJS)\monolib_filectrlg.obj \
$(OBJS)\monolib_headerctrlg.obj \ $(OBJS)\monolib_headerctrlg.obj \
$(OBJS)\monolib_infobar.obj \ $(OBJS)\monolib_infobar.obj \
$(OBJS)\monolib_listbkg.obj \ $(OBJS)\monolib_listbkg.obj \
$(OBJS)\monolib_logg.obj \ $(OBJS)\monolib_logg.obj \
$(OBJS)\monolib_numdlgg.obj \ $(OBJS)\monolib_numdlgg.obj \
@@ -3049,7 +3049,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_dragimgg.obj \ $(OBJS)\monolib_dragimgg.obj \
$(OBJS)\monolib_filectrlg.obj \ $(OBJS)\monolib_filectrlg.obj \
$(OBJS)\monolib_headerctrlg.obj \ $(OBJS)\monolib_headerctrlg.obj \
$(OBJS)\monolib_infobar.obj \ $(OBJS)\monolib_infobar.obj \
$(OBJS)\monolib_listbkg.obj \ $(OBJS)\monolib_listbkg.obj \
$(OBJS)\monolib_logg.obj \ $(OBJS)\monolib_logg.obj \
$(OBJS)\monolib_numdlgg.obj \ $(OBJS)\monolib_numdlgg.obj \
@@ -3469,7 +3469,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_dragimgg.obj \ $(OBJS)\coredll_dragimgg.obj \
$(OBJS)\coredll_filectrlg.obj \ $(OBJS)\coredll_filectrlg.obj \
$(OBJS)\coredll_headerctrlg.obj \ $(OBJS)\coredll_headerctrlg.obj \
$(OBJS)\coredll_infobar.obj \ $(OBJS)\coredll_infobar.obj \
$(OBJS)\coredll_listbkg.obj \ $(OBJS)\coredll_listbkg.obj \
$(OBJS)\coredll_logg.obj \ $(OBJS)\coredll_logg.obj \
$(OBJS)\coredll_numdlgg.obj \ $(OBJS)\coredll_numdlgg.obj \
@@ -3715,7 +3715,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_dragimgg.obj \ $(OBJS)\coredll_dragimgg.obj \
$(OBJS)\coredll_filectrlg.obj \ $(OBJS)\coredll_filectrlg.obj \
$(OBJS)\coredll_headerctrlg.obj \ $(OBJS)\coredll_headerctrlg.obj \
$(OBJS)\coredll_infobar.obj \ $(OBJS)\coredll_infobar.obj \
$(OBJS)\coredll_listbkg.obj \ $(OBJS)\coredll_listbkg.obj \
$(OBJS)\coredll_logg.obj \ $(OBJS)\coredll_logg.obj \
$(OBJS)\coredll_numdlgg.obj \ $(OBJS)\coredll_numdlgg.obj \
@@ -3973,7 +3973,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_dragimgg.obj \ $(OBJS)\corelib_dragimgg.obj \
$(OBJS)\corelib_filectrlg.obj \ $(OBJS)\corelib_filectrlg.obj \
$(OBJS)\corelib_headerctrlg.obj \ $(OBJS)\corelib_headerctrlg.obj \
$(OBJS)\corelib_infobar.obj \ $(OBJS)\corelib_infobar.obj \
$(OBJS)\corelib_listbkg.obj \ $(OBJS)\corelib_listbkg.obj \
$(OBJS)\corelib_logg.obj \ $(OBJS)\corelib_logg.obj \
$(OBJS)\corelib_numdlgg.obj \ $(OBJS)\corelib_numdlgg.obj \
@@ -4219,7 +4219,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_dragimgg.obj \ $(OBJS)\corelib_dragimgg.obj \
$(OBJS)\corelib_filectrlg.obj \ $(OBJS)\corelib_filectrlg.obj \
$(OBJS)\corelib_headerctrlg.obj \ $(OBJS)\corelib_headerctrlg.obj \
$(OBJS)\corelib_infobar.obj \ $(OBJS)\corelib_infobar.obj \
$(OBJS)\corelib_listbkg.obj \ $(OBJS)\corelib_listbkg.obj \
$(OBJS)\corelib_logg.obj \ $(OBJS)\corelib_logg.obj \
$(OBJS)\corelib_numdlgg.obj \ $(OBJS)\corelib_numdlgg.obj \
@@ -8184,11 +8184,11 @@ $(OBJS)\monodll_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
$(OBJS)\monodll_infobar.obj: ..\..\src\generic\infobar.cpp $(OBJS)\monodll_infobar.obj: ..\..\src\generic\infobar.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\infobar.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\infobar.cpp
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
$(OBJS)\monodll_listbkg.obj: ..\..\src\generic\listbkg.cpp $(OBJS)\monodll_listbkg.obj: ..\..\src\generic\listbkg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\listbkg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\listbkg.cpp
!endif !endif
@@ -10385,11 +10385,11 @@ $(OBJS)\monolib_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
$(OBJS)\monolib_infobar.obj: ..\..\src\generic\infobar.cpp $(OBJS)\monolib_infobar.obj: ..\..\src\generic\infobar.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\infobar.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\infobar.cpp
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
$(OBJS)\monolib_listbkg.obj: ..\..\src\generic\listbkg.cpp $(OBJS)\monolib_listbkg.obj: ..\..\src\generic\listbkg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\listbkg.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\listbkg.cpp
!endif !endif
@@ -12595,11 +12595,11 @@ $(OBJS)\coredll_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
$(OBJS)\coredll_infobar.obj: ..\..\src\generic\infobar.cpp $(OBJS)\coredll_infobar.obj: ..\..\src\generic\infobar.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\infobar.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\infobar.cpp
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
$(OBJS)\coredll_listbkg.obj: ..\..\src\generic\listbkg.cpp $(OBJS)\coredll_listbkg.obj: ..\..\src\generic\listbkg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\listbkg.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\listbkg.cpp
!endif !endif
@@ -13892,11 +13892,11 @@ $(OBJS)\corelib_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
$(OBJS)\corelib_infobar.obj: ..\..\src\generic\infobar.cpp $(OBJS)\corelib_infobar.obj: ..\..\src\generic\infobar.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\infobar.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\infobar.cpp
!endif !endif
!if "$(USE_GUI)" == "1" !if "$(USE_GUI)" == "1"
$(OBJS)\corelib_listbkg.obj: ..\..\src\generic\listbkg.cpp $(OBJS)\corelib_listbkg.obj: ..\..\src\generic\listbkg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\listbkg.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\listbkg.cpp
!endif !endif

56
build/msw/makefile.wat
View File

@@ -454,7 +454,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_dragimgg.obj & $(OBJS)\monodll_dragimgg.obj &
$(OBJS)\monodll_filectrlg.obj & $(OBJS)\monodll_filectrlg.obj &
$(OBJS)\monodll_headerctrlg.obj & $(OBJS)\monodll_headerctrlg.obj &
$(OBJS)\monodll_infobar.obj & $(OBJS)\monodll_infobar.obj &
$(OBJS)\monodll_listbkg.obj & $(OBJS)\monodll_listbkg.obj &
$(OBJS)\monodll_logg.obj & $(OBJS)\monodll_logg.obj &
$(OBJS)\monodll_numdlgg.obj & $(OBJS)\monodll_numdlgg.obj &
@@ -702,7 +702,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_dragimgg.obj & $(OBJS)\monodll_dragimgg.obj &
$(OBJS)\monodll_filectrlg.obj & $(OBJS)\monodll_filectrlg.obj &
$(OBJS)\monodll_headerctrlg.obj & $(OBJS)\monodll_headerctrlg.obj &
$(OBJS)\monodll_infobar.obj & $(OBJS)\monodll_infobar.obj &
$(OBJS)\monodll_listbkg.obj & $(OBJS)\monodll_listbkg.obj &
$(OBJS)\monodll_logg.obj & $(OBJS)\monodll_logg.obj &
$(OBJS)\monodll_numdlgg.obj & $(OBJS)\monodll_numdlgg.obj &
@@ -1172,7 +1172,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_dragimgg.obj & $(OBJS)\monolib_dragimgg.obj &
$(OBJS)\monolib_filectrlg.obj & $(OBJS)\monolib_filectrlg.obj &
$(OBJS)\monolib_headerctrlg.obj & $(OBJS)\monolib_headerctrlg.obj &
$(OBJS)\monolib_infobar.obj & $(OBJS)\monolib_infobar.obj &
$(OBJS)\monolib_listbkg.obj & $(OBJS)\monolib_listbkg.obj &
$(OBJS)\monolib_logg.obj & $(OBJS)\monolib_logg.obj &
$(OBJS)\monolib_numdlgg.obj & $(OBJS)\monolib_numdlgg.obj &
@@ -1420,7 +1420,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_dragimgg.obj & $(OBJS)\monolib_dragimgg.obj &
$(OBJS)\monolib_filectrlg.obj & $(OBJS)\monolib_filectrlg.obj &
$(OBJS)\monolib_headerctrlg.obj & $(OBJS)\monolib_headerctrlg.obj &
$(OBJS)\monolib_infobar.obj & $(OBJS)\monolib_infobar.obj &
$(OBJS)\monolib_listbkg.obj & $(OBJS)\monolib_listbkg.obj &
$(OBJS)\monolib_logg.obj & $(OBJS)\monolib_logg.obj &
$(OBJS)\monolib_numdlgg.obj & $(OBJS)\monolib_numdlgg.obj &
@@ -1799,7 +1799,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_dragimgg.obj & $(OBJS)\coredll_dragimgg.obj &
$(OBJS)\coredll_filectrlg.obj & $(OBJS)\coredll_filectrlg.obj &
$(OBJS)\coredll_headerctrlg.obj & $(OBJS)\coredll_headerctrlg.obj &
$(OBJS)\coredll_infobar.obj & $(OBJS)\coredll_infobar.obj &
$(OBJS)\coredll_listbkg.obj & $(OBJS)\coredll_listbkg.obj &
$(OBJS)\coredll_logg.obj & $(OBJS)\coredll_logg.obj &
$(OBJS)\coredll_numdlgg.obj & $(OBJS)\coredll_numdlgg.obj &
@@ -2047,7 +2047,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_dragimgg.obj & $(OBJS)\coredll_dragimgg.obj &
$(OBJS)\coredll_filectrlg.obj & $(OBJS)\coredll_filectrlg.obj &
$(OBJS)\coredll_headerctrlg.obj & $(OBJS)\coredll_headerctrlg.obj &
$(OBJS)\coredll_infobar.obj & $(OBJS)\coredll_infobar.obj &
$(OBJS)\coredll_listbkg.obj & $(OBJS)\coredll_listbkg.obj &
$(OBJS)\coredll_logg.obj & $(OBJS)\coredll_logg.obj &
$(OBJS)\coredll_numdlgg.obj & $(OBJS)\coredll_numdlgg.obj &
@@ -2307,7 +2307,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_dragimgg.obj & $(OBJS)\corelib_dragimgg.obj &
$(OBJS)\corelib_filectrlg.obj & $(OBJS)\corelib_filectrlg.obj &
$(OBJS)\corelib_headerctrlg.obj & $(OBJS)\corelib_headerctrlg.obj &
$(OBJS)\corelib_infobar.obj & $(OBJS)\corelib_infobar.obj &
$(OBJS)\corelib_listbkg.obj & $(OBJS)\corelib_listbkg.obj &
$(OBJS)\corelib_logg.obj & $(OBJS)\corelib_logg.obj &
$(OBJS)\corelib_numdlgg.obj & $(OBJS)\corelib_numdlgg.obj &
@@ -2555,7 +2555,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_dragimgg.obj & $(OBJS)\corelib_dragimgg.obj &
$(OBJS)\corelib_filectrlg.obj & $(OBJS)\corelib_filectrlg.obj &
$(OBJS)\corelib_headerctrlg.obj & $(OBJS)\corelib_headerctrlg.obj &
$(OBJS)\corelib_infobar.obj & $(OBJS)\corelib_infobar.obj &
$(OBJS)\corelib_listbkg.obj & $(OBJS)\corelib_listbkg.obj &
$(OBJS)\corelib_logg.obj & $(OBJS)\corelib_logg.obj &
$(OBJS)\corelib_numdlgg.obj & $(OBJS)\corelib_numdlgg.obj &
@@ -8011,11 +8011,11 @@ $(OBJS)\monodll_headerctrlg.obj : .AUTODEPEND ..\..\src\generic\headerctrlg.cpp
!endif !endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(OBJS)\monodll_infobar.obj : .AUTODEPEND ..\..\src\generic\infobar.cpp $(OBJS)\monodll_infobar.obj : .AUTODEPEND ..\..\src\generic\infobar.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif !endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(OBJS)\monodll_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp $(OBJS)\monodll_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif !endif
@@ -10212,11 +10212,11 @@ $(OBJS)\monolib_headerctrlg.obj : .AUTODEPEND ..\..\src\generic\headerctrlg.cpp
!endif !endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(OBJS)\monolib_infobar.obj : .AUTODEPEND ..\..\src\generic\infobar.cpp $(OBJS)\monolib_infobar.obj : .AUTODEPEND ..\..\src\generic\infobar.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif !endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(OBJS)\monolib_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp $(OBJS)\monolib_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif !endif
@@ -12422,11 +12422,11 @@ $(OBJS)\coredll_headerctrlg.obj : .AUTODEPEND ..\..\src\generic\headerctrlg.cpp
!endif !endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(OBJS)\coredll_infobar.obj : .AUTODEPEND ..\..\src\generic\infobar.cpp $(OBJS)\coredll_infobar.obj : .AUTODEPEND ..\..\src\generic\infobar.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif !endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(OBJS)\coredll_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp $(OBJS)\coredll_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif !endif
@@ -13719,11 +13719,11 @@ $(OBJS)\corelib_headerctrlg.obj : .AUTODEPEND ..\..\src\generic\headerctrlg.cpp
!endif !endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(OBJS)\corelib_infobar.obj : .AUTODEPEND ..\..\src\generic\infobar.cpp $(OBJS)\corelib_infobar.obj : .AUTODEPEND ..\..\src\generic\infobar.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif !endif
!ifeq USE_GUI 1 !ifeq USE_GUI 1
$(OBJS)\corelib_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp $(OBJS)\corelib_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif !endif

8
build/msw/wx_core.dsp
View File

@@ -2969,10 +2969,10 @@ SOURCE=..\..\src\generic\headerctrlg.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\generic\infobar.cpp SOURCE=..\..\src\generic\infobar.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\generic\listbkg.cpp SOURCE=..\..\src\generic\listbkg.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File

6
build/msw/wx_vc7_core.vcproj
View File

@@ -2676,9 +2676,9 @@
RelativePath="..\..\src\generic\headerctrlg.cpp"> RelativePath="..\..\src\generic\headerctrlg.cpp">
</File> </File>
<File <File
RelativePath="..\..\src\generic\infobar.cpp"> RelativePath="..\..\src\generic\infobar.cpp">
</File> </File>
<File <File
RelativePath="..\..\src\generic\listbkg.cpp"> RelativePath="..\..\src\generic\listbkg.cpp">
</File> </File>
<File <File

8
build/msw/wx_vc8_core.vcproj
View File

@@ -3601,10 +3601,10 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\generic\infobar.cpp" RelativePath="..\..\src\generic\infobar.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\generic\listbkg.cpp" RelativePath="..\..\src\generic\listbkg.cpp"
> >
</File> </File>

8
build/msw/wx_vc9_core.vcproj
View File

@@ -3597,10 +3597,10 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\generic\infobar.cpp" RelativePath="..\..\src\generic\infobar.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\generic\listbkg.cpp" RelativePath="..\..\src\generic\listbkg.cpp"
> >
</File> </File>

24
include/wx/filehistory.h
View File

@@ -28,10 +28,10 @@ class WXDLLIMPEXP_FWD_BASE wxConfigBase;
// File history management // File history management
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLIMPEXP_CORE wxFileHistory : public wxObject class WXDLLIMPEXP_CORE wxFileHistoryBase : public wxObject
{ {
public: public:
wxFileHistory(size_t maxFiles = 9, wxWindowID idBase = wxID_FILE1); wxFileHistoryBase(size_t maxFiles = 9, wxWindowID idBase = wxID_FILE1);
// Operations // Operations
virtual void AddFileToHistory(const wxString& file); virtual void AddFileToHistory(const wxString& file);
@@ -79,17 +79,31 @@ private:
// The ID of the first history menu item (Doesn't have to be wxID_FILE1) // The ID of the first history menu item (Doesn't have to be wxID_FILE1)
wxWindowID m_idBase; wxWindowID m_idBase;
DECLARE_DYNAMIC_CLASS(wxFileHistory) wxDECLARE_NO_COPY_CLASS(wxFileHistoryBase);
wxDECLARE_NO_COPY_CLASS(wxFileHistory);
}; };
#if WXWIN_COMPATIBILITY_2_6 #if WXWIN_COMPATIBILITY_2_6
inline size_t wxFileHistory::GetNoHistoryFiles() const inline size_t wxFileHistoryBase::GetNoHistoryFiles() const
{ {
return m_fileHistory.GetCount(); return m_fileHistory.GetCount();
} }
#endif // WXWIN_COMPATIBILITY_2_6 #endif // WXWIN_COMPATIBILITY_2_6
#if defined(__WXGTK20__)
#include "wx/gtk/filehistory.h"
#else
// no platform-specific implementation of wxFileHistory yet
class WXDLLIMPEXP_CORE wxFileHistory : public wxFileHistoryBase
{
public:
wxFileHistory(size_t maxFiles = 9, wxWindowID idBase = wxID_FILE1)
: wxFileHistoryBase(maxFiles, idBase) {}
DECLARE_DYNAMIC_CLASS(wxFileHistory)
};
#endif
#endif // wxUSE_FILE_HISTORY #endif // wxUSE_FILE_HISTORY
#endif // _WX_FILEHISTORY_H_ #endif // _WX_FILEHISTORY_H_

25
include/wx/gtk/filehistory.h Normal file
View File

@@ -0,0 +1,25 @@
/////////////////////////////////////////////////////////////////////////////
// Name: wx/gtk/filehistory.h
// Purpose: GTK+ bits for wxFileHistory
// Author: Vaclav Slavik
// Created: 2010-05-06
// RCS-ID: $Id$
// Copyright: (c) 2010 Vaclav Slavik
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_GTK_FILEHISTORY_H_
#define _WX_GTK_FILEHISTORY_H_
class WXDLLIMPEXP_CORE wxFileHistory : public wxFileHistoryBase
{
public:
wxFileHistory(size_t maxFiles = 9, wxWindowID idBase = wxID_FILE1)
: wxFileHistoryBase(maxFiles, idBase) {}
virtual void AddFileToHistory(const wxString& file);
DECLARE_DYNAMIC_CLASS(wxFileHistory)
};
#endif // _WX_GTK_FILEHISTORY_H_

20
src/common/filehistorycmn.cpp
View File

@@ -62,13 +62,13 @@ wxString GetMRUEntryLabel(int n, const wxString& path)
IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject)
wxFileHistory::wxFileHistory(size_t maxFiles, wxWindowID idBase) wxFileHistoryBase::wxFileHistoryBase(size_t maxFiles, wxWindowID idBase)
{ {
m_fileMaxFiles = maxFiles; m_fileMaxFiles = maxFiles;
m_idBase = idBase; m_idBase = idBase;
} }
void wxFileHistory::AddFileToHistory(const wxString& file) void wxFileHistoryBase::AddFileToHistory(const wxString& file)
{ {
// check if we don't already have this file // check if we don't already have this file
const wxFileName fnNew(file); const wxFileName fnNew(file);
@@ -138,11 +138,11 @@ void wxFileHistory::AddFileToHistory(const wxString& file)
} }
} }
void wxFileHistory::RemoveFileFromHistory(size_t i) void wxFileHistoryBase::RemoveFileFromHistory(size_t i)
{ {
size_t numFiles = m_fileHistory.size(); size_t numFiles = m_fileHistory.size();
wxCHECK_RET( i < numFiles, wxCHECK_RET( i < numFiles,
wxT("invalid index in wxFileHistory::RemoveFileFromHistory") ); wxT("invalid index in wxFileHistoryBase::RemoveFileFromHistory") );
// delete the element from the array // delete the element from the array
m_fileHistory.RemoveAt(i); m_fileHistory.RemoveAt(i);
@@ -181,19 +181,19 @@ void wxFileHistory::RemoveFileFromHistory(size_t i)
} }
} }
void wxFileHistory::UseMenu(wxMenu *menu) void wxFileHistoryBase::UseMenu(wxMenu *menu)
{ {
if ( !m_fileMenus.Member(menu) ) if ( !m_fileMenus.Member(menu) )
m_fileMenus.Append(menu); m_fileMenus.Append(menu);
} }
void wxFileHistory::RemoveMenu(wxMenu *menu) void wxFileHistoryBase::RemoveMenu(wxMenu *menu)
{ {
m_fileMenus.DeleteObject(menu); m_fileMenus.DeleteObject(menu);
} }
#if wxUSE_CONFIG #if wxUSE_CONFIG
void wxFileHistory::Load(const wxConfigBase& config) void wxFileHistoryBase::Load(const wxConfigBase& config)
{ {
m_fileHistory.Clear(); m_fileHistory.Clear();
@@ -213,7 +213,7 @@ void wxFileHistory::Load(const wxConfigBase& config)
AddFilesToMenu(); AddFilesToMenu();
} }
void wxFileHistory::Save(wxConfigBase& config) void wxFileHistoryBase::Save(wxConfigBase& config)
{ {
size_t i; size_t i;
for (i = 0; i < m_fileMaxFiles; i++) for (i = 0; i < m_fileMaxFiles; i++)
@@ -228,7 +228,7 @@ void wxFileHistory::Save(wxConfigBase& config)
} }
#endif // wxUSE_CONFIG #endif // wxUSE_CONFIG
void wxFileHistory::AddFilesToMenu() void wxFileHistoryBase::AddFilesToMenu()
{ {
if ( m_fileHistory.empty() ) if ( m_fileHistory.empty() )
return; return;
@@ -241,7 +241,7 @@ void wxFileHistory::AddFilesToMenu()
} }
} }
void wxFileHistory::AddFilesToMenu(wxMenu* menu) void wxFileHistoryBase::AddFilesToMenu(wxMenu* menu)
{ {
if ( m_fileHistory.empty() ) if ( m_fileHistory.empty() )
return; return;

56
src/gtk/filehistory.cpp Normal file
View File

@@ -0,0 +1,56 @@
/////////////////////////////////////////////////////////////////////////////
// Name: src/gtk/filehistory.cpp
// Purpose: GTK+ bits for wxFileHistory class
// Author: Vaclav Slavik
// Created: 2010-05-06
// RCS-ID: $Id$
// Copyright: (c) 2010 Vaclav Slavik
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// declarations
// ============================================================================
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#include "wx/filehistory.h"
#if wxUSE_FILE_HISTORY
#include "wx/filename.h"
#include <glib.h>
#include <gtk/gtk.h>
#include "wx/gtk/private/string.h"
// ============================================================================
// implementation
// ============================================================================
void wxFileHistory::AddFileToHistory(const wxString& file)
{
wxFileHistoryBase::AddFileToHistory(file);
#ifdef __WXGTK210__
const wxString fullPath = wxFileName(file).GetFullPath();
if ( !gtk_check_version(2,10,0) )
{
wxGtkString uri(g_filename_to_uri(fullPath.fn_str(), NULL, NULL));
if ( uri )
gtk_recent_manager_add_item(gtk_recent_manager_get_default(), uri);
}
#endif
}
#endif // wxUSE_FILE_HISTORY