From d6fc5230e0ed2bef9a0891a8be5ff25957549727 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 12 Apr 2023 17:27:31 +0200 Subject: [PATCH] Remove src/msw/gdiobj.cpp which seems to have been never used Somewhat incredibly, this file, added back in 2bda0e1738 (added some wxMSW stuff, 1998-05-20), never contained anything but some commented out code and so was always totally useless. Finally remove it. --- Makefile.in | 44 +++++++----------------- build/bakefiles/files.bkl | 1 - build/cmake/files.cmake | 1 - build/files | 1 - build/msw/makefile.gcc | 28 ---------------- build/msw/makefile.vc | 28 ---------------- build/msw/wx_core.vcxproj | 1 - build/msw/wx_core.vcxproj.filters | 3 -- src/msw/gdiobj.cpp | 56 ------------------------------- 9 files changed, 12 insertions(+), 151 deletions(-) delete mode 100644 src/msw/gdiobj.cpp diff --git a/Makefile.in b/Makefile.in index d28d4e5cbe..e8b1581da1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -4994,7 +4994,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \ monodll_msw_fontenum.o \ monodll_msw_fontutil.o \ monodll_gdiimage.o \ - monodll_msw_gdiobj.o \ monodll_gdiplus.o \ monodll_msw_graphics.o \ monodll_msw_icon.o \ @@ -5723,7 +5722,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_msw_fontenum.o \ monodll_msw_fontutil.o \ monodll_gdiimage.o \ - monodll_msw_gdiobj.o \ monodll_gdiplus.o \ monodll_msw_graphics.o \ monodll_msw_icon.o \ @@ -6754,7 +6752,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_msw_fontenum.o \ monolib_msw_fontutil.o \ monolib_gdiimage.o \ - monolib_msw_gdiobj.o \ monolib_gdiplus.o \ monolib_msw_graphics.o \ monolib_msw_icon.o \ @@ -7483,7 +7480,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_msw_fontenum.o \ monolib_msw_fontutil.o \ monolib_gdiimage.o \ - monolib_msw_gdiobj.o \ monolib_gdiplus.o \ monolib_msw_graphics.o \ monolib_msw_icon.o \ @@ -8666,7 +8662,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_msw_fontenum.o \ coredll_msw_fontutil.o \ coredll_gdiimage.o \ - coredll_msw_gdiobj.o \ coredll_gdiplus.o \ coredll_msw_graphics.o \ coredll_msw_icon.o \ @@ -9395,7 +9390,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_msw_fontenum.o \ coredll_msw_fontutil.o \ coredll_gdiimage.o \ - coredll_msw_gdiobj.o \ coredll_gdiplus.o \ coredll_msw_graphics.o \ coredll_msw_icon.o \ @@ -10154,7 +10148,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_msw_fontenum.o \ corelib_msw_fontutil.o \ corelib_gdiimage.o \ - corelib_msw_gdiobj.o \ corelib_gdiplus.o \ corelib_msw_graphics.o \ corelib_msw_icon.o \ @@ -10883,7 +10876,6 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_msw_fontenum.o \ corelib_msw_fontutil.o \ corelib_gdiimage.o \ - corelib_msw_gdiobj.o \ corelib_gdiplus.o \ corelib_msw_graphics.o \ corelib_msw_icon.o \ @@ -12233,7 +12225,7 @@ COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS = \ monodll_carbon_clipbrd.o \ monodll_carbon_cursor.o \ monodll_carbon_fontdlg.o \ - monodll_carbon_gdiobj.o \ + monodll_gdiobj.o \ monodll_carbon_app.o \ monodll_carbon_control.o \ monodll_carbon_dataobj.o \ @@ -12370,7 +12362,7 @@ COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_0 = \ monolib_carbon_clipbrd.o \ monolib_carbon_cursor.o \ monolib_carbon_fontdlg.o \ - monolib_carbon_gdiobj.o \ + monolib_gdiobj.o \ monolib_carbon_app.o \ monolib_carbon_control.o \ monolib_carbon_dataobj.o \ @@ -12506,7 +12498,7 @@ COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_8 = \ coredll_carbon_clipbrd.o \ coredll_carbon_cursor.o \ coredll_carbon_fontdlg.o \ - coredll_carbon_gdiobj.o \ + coredll_gdiobj.o \ coredll_carbon_app.o \ coredll_carbon_control.o \ coredll_carbon_dataobj.o \ @@ -12642,7 +12634,7 @@ COND_PLATFORM_MACOSX_1___OSX_COMMON_SRC_OBJECTS_9 = \ corelib_carbon_clipbrd.o \ corelib_carbon_cursor.o \ corelib_carbon_fontdlg.o \ - corelib_carbon_gdiobj.o \ + corelib_gdiobj.o \ corelib_carbon_app.o \ corelib_carbon_control.o \ corelib_carbon_dataobj.o \ @@ -17384,9 +17376,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monodll_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp - @COND_TOOLKIT_MSW_USE_GUI_1@monodll_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp @@ -18680,10 +18669,10 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_carbon_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_carbon_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(MONODLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monodll_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(MONODLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monodll_carbon_app.o: $(srcdir)/src/osx/carbon/app.cpp $(MONODLL_ODEP) @@ -22151,9 +22140,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@monolib_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp - @COND_TOOLKIT_MSW_USE_GUI_1@monolib_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp @@ -23447,10 +23433,10 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_carbon_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_carbon_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(MONOLIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@monolib_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(MONOLIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@monolib_carbon_app.o: $(srcdir)/src/osx/carbon/app.cpp $(MONOLIB_ODEP) @@ -27017,9 +27003,6 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@coredll_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@coredll_msw_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp - @COND_TOOLKIT_MSW_USE_GUI_1@coredll_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp @@ -28313,10 +28296,10 @@ coredll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(COREDLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(COREDLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(COREDLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_carbon_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(COREDLL_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@coredll_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(COREDLL_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@coredll_carbon_app.o: $(srcdir)/src/osx/carbon/app.cpp $(COREDLL_ODEP) @@ -30755,9 +30738,6 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@corelib_gdiimage.o: $(srcdir)/src/msw/gdiimage.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiimage.cpp -@COND_TOOLKIT_MSW_USE_GUI_1@corelib_msw_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp - @COND_TOOLKIT_MSW_USE_GUI_1@corelib_gdiplus.o: $(srcdir)/src/msw/gdiplus.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiplus.cpp @@ -32051,10 +32031,10 @@ corelib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(CORELIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_fontdlg.o: $(srcdir)/src/osx/carbon/fontdlg.cpp $(CORELIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/fontdlg.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(CORELIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp -@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_carbon_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(CORELIB_ODEP) +@COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@corelib_gdiobj.o: $(srcdir)/src/osx/carbon/gdiobj.cpp $(CORELIB_ODEP) @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/osx/carbon/gdiobj.cpp @COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0@corelib_carbon_app.o: $(srcdir)/src/osx/carbon/app.cpp $(CORELIB_ODEP) diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index a220f99df2..c509ba3483 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -1718,7 +1718,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/msw/fontenum.cpp src/msw/fontutil.cpp src/msw/gdiimage.cpp - src/msw/gdiobj.cpp src/msw/gdiplus.cpp src/msw/graphics.cpp src/msw/icon.cpp diff --git a/build/cmake/files.cmake b/build/cmake/files.cmake index aa0be8d920..c2c4c53a2a 100644 --- a/build/cmake/files.cmake +++ b/build/cmake/files.cmake @@ -1594,7 +1594,6 @@ set(MSW_LOWLEVEL_SRC src/msw/fontenum.cpp src/msw/fontutil.cpp src/msw/gdiimage.cpp - src/msw/gdiobj.cpp src/msw/gdiplus.cpp src/msw/graphics.cpp src/msw/graphicsd2d.cpp diff --git a/build/files b/build/files index b297523e25..3d5b95ba16 100644 --- a/build/files +++ b/build/files @@ -1604,7 +1604,6 @@ MSW_LOWLEVEL_SRC = src/msw/fontenum.cpp src/msw/fontutil.cpp src/msw/gdiimage.cpp - src/msw/gdiobj.cpp src/msw/gdiplus.cpp src/msw/graphics.cpp src/msw/graphicsd2d.cpp diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 651944e2a2..c0847c68d2 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1893,7 +1893,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_fontenum.o \ $(OBJS)\monodll_fontutil.o \ $(OBJS)\monodll_gdiimage.o \ - $(OBJS)\monodll_gdiobj.o \ $(OBJS)\monodll_gdiplus.o \ $(OBJS)\monodll_graphics.o \ $(OBJS)\monodll_icon.o \ @@ -2242,7 +2241,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_fontenum.o \ $(OBJS)\monodll_fontutil.o \ $(OBJS)\monodll_gdiimage.o \ - $(OBJS)\monodll_gdiobj.o \ $(OBJS)\monodll_gdiplus.o \ $(OBJS)\monodll_graphics.o \ $(OBJS)\monodll_icon.o \ @@ -2747,7 +2745,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_fontenum.o \ $(OBJS)\monolib_fontutil.o \ $(OBJS)\monolib_gdiimage.o \ - $(OBJS)\monolib_gdiobj.o \ $(OBJS)\monolib_gdiplus.o \ $(OBJS)\monolib_graphics.o \ $(OBJS)\monolib_icon.o \ @@ -3096,7 +3093,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_fontenum.o \ $(OBJS)\monolib_fontutil.o \ $(OBJS)\monolib_gdiimage.o \ - $(OBJS)\monolib_gdiobj.o \ $(OBJS)\monolib_gdiplus.o \ $(OBJS)\monolib_graphics.o \ $(OBJS)\monolib_icon.o \ @@ -3480,7 +3476,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_fontenum.o \ $(OBJS)\coredll_fontutil.o \ $(OBJS)\coredll_gdiimage.o \ - $(OBJS)\coredll_gdiobj.o \ $(OBJS)\coredll_gdiplus.o \ $(OBJS)\coredll_graphics.o \ $(OBJS)\coredll_icon.o \ @@ -3829,7 +3824,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_fontenum.o \ $(OBJS)\coredll_fontutil.o \ $(OBJS)\coredll_gdiimage.o \ - $(OBJS)\coredll_gdiobj.o \ $(OBJS)\coredll_gdiplus.o \ $(OBJS)\coredll_graphics.o \ $(OBJS)\coredll_icon.o \ @@ -4170,7 +4164,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_fontenum.o \ $(OBJS)\corelib_fontutil.o \ $(OBJS)\corelib_gdiimage.o \ - $(OBJS)\corelib_gdiobj.o \ $(OBJS)\corelib_gdiplus.o \ $(OBJS)\corelib_graphics.o \ $(OBJS)\corelib_icon.o \ @@ -4519,7 +4512,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_fontenum.o \ $(OBJS)\corelib_fontutil.o \ $(OBJS)\corelib_gdiimage.o \ - $(OBJS)\corelib_gdiobj.o \ $(OBJS)\corelib_gdiplus.o \ $(OBJS)\corelib_graphics.o \ $(OBJS)\corelib_icon.o \ @@ -8278,11 +8270,6 @@ $(OBJS)\monodll_gdiimage.o: ../../src/msw/gdiimage.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_gdiobj.o: ../../src/msw/gdiobj.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\monodll_gdiplus.o: ../../src/msw/gdiplus.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -10870,11 +10857,6 @@ $(OBJS)\monolib_gdiimage.o: ../../src/msw/gdiimage.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_gdiobj.o: ../../src/msw/gdiobj.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\monolib_gdiplus.o: ../../src/msw/gdiplus.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -13423,11 +13405,6 @@ $(OBJS)\coredll_gdiimage.o: ../../src/msw/gdiimage.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_gdiobj.o: ../../src/msw/gdiobj.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\coredll_gdiplus.o: ../../src/msw/gdiplus.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -15181,11 +15158,6 @@ $(OBJS)\corelib_gdiimage.o: ../../src/msw/gdiimage.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_gdiobj.o: ../../src/msw/gdiobj.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - ifeq ($(USE_GUI),1) $(OBJS)\corelib_gdiplus.o: ../../src/msw/gdiplus.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 900437659e..bd339d93d5 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -2226,7 +2226,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_fontenum.obj \ $(OBJS)\monodll_fontutil.obj \ $(OBJS)\monodll_gdiimage.obj \ - $(OBJS)\monodll_gdiobj.obj \ $(OBJS)\monodll_gdiplus.obj \ $(OBJS)\monodll_graphics.obj \ $(OBJS)\monodll_icon.obj \ @@ -2573,7 +2572,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_fontenum.obj \ $(OBJS)\monodll_fontutil.obj \ $(OBJS)\monodll_gdiimage.obj \ - $(OBJS)\monodll_gdiobj.obj \ $(OBJS)\monodll_gdiplus.obj \ $(OBJS)\monodll_graphics.obj \ $(OBJS)\monodll_icon.obj \ @@ -3080,7 +3078,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_fontenum.obj \ $(OBJS)\monolib_fontutil.obj \ $(OBJS)\monolib_gdiimage.obj \ - $(OBJS)\monolib_gdiobj.obj \ $(OBJS)\monolib_gdiplus.obj \ $(OBJS)\monolib_graphics.obj \ $(OBJS)\monolib_icon.obj \ @@ -3427,7 +3424,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_fontenum.obj \ $(OBJS)\monolib_fontutil.obj \ $(OBJS)\monolib_gdiimage.obj \ - $(OBJS)\monolib_gdiobj.obj \ $(OBJS)\monolib_gdiplus.obj \ $(OBJS)\monolib_graphics.obj \ $(OBJS)\monolib_icon.obj \ @@ -3863,7 +3859,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_fontenum.obj \ $(OBJS)\coredll_fontutil.obj \ $(OBJS)\coredll_gdiimage.obj \ - $(OBJS)\coredll_gdiobj.obj \ $(OBJS)\coredll_gdiplus.obj \ $(OBJS)\coredll_graphics.obj \ $(OBJS)\coredll_icon.obj \ @@ -4210,7 +4205,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_fontenum.obj \ $(OBJS)\coredll_fontutil.obj \ $(OBJS)\coredll_gdiimage.obj \ - $(OBJS)\coredll_gdiobj.obj \ $(OBJS)\coredll_gdiplus.obj \ $(OBJS)\coredll_graphics.obj \ $(OBJS)\coredll_icon.obj \ @@ -4551,7 +4545,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_fontenum.obj \ $(OBJS)\corelib_fontutil.obj \ $(OBJS)\corelib_gdiimage.obj \ - $(OBJS)\corelib_gdiobj.obj \ $(OBJS)\corelib_gdiplus.obj \ $(OBJS)\corelib_graphics.obj \ $(OBJS)\corelib_icon.obj \ @@ -4898,7 +4891,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_fontenum.obj \ $(OBJS)\corelib_fontutil.obj \ $(OBJS)\corelib_gdiimage.obj \ - $(OBJS)\corelib_gdiobj.obj \ $(OBJS)\corelib_gdiplus.obj \ $(OBJS)\corelib_graphics.obj \ $(OBJS)\corelib_icon.obj \ @@ -8735,11 +8727,6 @@ $(OBJS)\monodll_gdiimage.obj: ..\..\src\msw\gdiimage.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gdiimage.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gdiobj.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monodll_gdiplus.obj: ..\..\src\msw\gdiplus.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gdiplus.cpp @@ -11327,11 +11314,6 @@ $(OBJS)\monolib_gdiimage.obj: ..\..\src\msw\gdiimage.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gdiimage.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gdiobj.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\monolib_gdiplus.obj: ..\..\src\msw\gdiplus.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gdiplus.cpp @@ -13880,11 +13862,6 @@ $(OBJS)\coredll_gdiimage.obj: ..\..\src\msw\gdiimage.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gdiimage.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gdiobj.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\coredll_gdiplus.obj: ..\..\src\msw\gdiplus.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gdiplus.cpp @@ -15638,11 +15615,6 @@ $(OBJS)\corelib_gdiimage.obj: ..\..\src\msw\gdiimage.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gdiimage.cpp !endif -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gdiobj.cpp -!endif - !if "$(USE_GUI)" == "1" $(OBJS)\corelib_gdiplus.obj: ..\..\src\msw\gdiplus.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gdiplus.cpp diff --git a/build/msw/wx_core.vcxproj b/build/msw/wx_core.vcxproj index 87efc6a62b..5ff159b0b2 100644 --- a/build/msw/wx_core.vcxproj +++ b/build/msw/wx_core.vcxproj @@ -754,7 +754,6 @@ $(IntDir)msw_%(Filename).obj - diff --git a/build/msw/wx_core.vcxproj.filters b/build/msw/wx_core.vcxproj.filters index cacae8a320..3d8baa65f3 100644 --- a/build/msw/wx_core.vcxproj.filters +++ b/build/msw/wx_core.vcxproj.filters @@ -834,9 +834,6 @@ MSW Sources - - MSW Sources - MSW Sources diff --git a/src/msw/gdiobj.cpp b/src/msw/gdiobj.cpp deleted file mode 100644 index f8b9a9f222..0000000000 --- a/src/msw/gdiobj.cpp +++ /dev/null @@ -1,56 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/msw/gdiobj.cpp -// Purpose: wxGDIObject class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - - -#include "wx/gdiobj.h" - -#ifndef WX_PRECOMP - #include - #include "wx/list.h" - #include "wx/utils.h" - #include "wx/app.h" -#endif - -#include "wx/msw/private.h" - -#define M_GDIDATA static_cast(m_refData) - -/* -void wxGDIObject::IncrementResourceUsage() -{ - if ( !M_GDIDATA ) - return; - -// wxDebugMsg("Object %ld about to be incremented: %d\n", (long)this, m_usageCount); - M_GDIDATA->m_usageCount ++; -}; - -void wxGDIObject::DecrementResourceUsage() -{ - if ( !M_GDIDATA ) - return; - - M_GDIDATA->m_usageCount --; - if (wxTheApp) - wxTheApp->SetPendingCleanup(true); -// wxDebugMsg("Object %ld decremented: %d\n", (long)this, M_GDIDATA->m_usageCount); - if (M_GDIDATA->m_usageCount < 0) - { - char buf[80]; - sprintf(buf, "Object %ld usage count is %d\n", (long)this, M_GDIDATA->m_usageCount); - wxDebugMsg(buf); - } -// assert(M_GDIDATA->m_usageCount >= 0); -}; - -*/