From 5819f832e6fc616ea3e365376ce71ed3c69e023a Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Wed, 16 Aug 2006 14:53:49 +0000 Subject: [PATCH] moved IMPLEMENT_DYNAMIC_CLASS(wxGDIObject,wxObject) line to gdicmn.cpp so that we don't have to have several identical gdiobj.cpp files containing only it git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 208 +++++++++---------------------------- build/bakefiles/files.bkl | 6 -- src/cocoa/gdiobj.cpp | 19 ---- src/common/gdicmn.cpp | 5 + src/gtk/gdiobj.cpp | 15 --- src/gtk1/gdiobj.cpp | 15 --- src/mac/carbon/gdiobj.cpp | 2 - src/mac/classic/gdiobj.cpp | 2 - src/mgl/gdiobj.cpp | 27 ----- src/motif/gdiobj.cpp | 18 ---- src/msw/gdiobj.cpp | 2 - src/os2/gdiobj.cpp | 2 - src/palmos/gdiobj.cpp | 28 ----- src/x11/gdiobj.cpp | 14 --- 14 files changed, 53 insertions(+), 310 deletions(-) delete mode 100644 src/cocoa/gdiobj.cpp delete mode 100644 src/gtk/gdiobj.cpp delete mode 100644 src/gtk1/gdiobj.cpp delete mode 100644 src/mgl/gdiobj.cpp delete mode 100644 src/motif/gdiobj.cpp delete mode 100644 src/palmos/gdiobj.cpp delete mode 100644 src/x11/gdiobj.cpp diff --git a/Makefile.in b/Makefile.in index 2baf1ff836..8da6552163 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3557,7 +3557,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS = \ monodll_dnd.o \ monodll_evtloop.o \ monodll_font.o \ - monodll_gdiobj.o \ monodll_gsockgtk.o \ monodll_main.o \ monodll_minifram.o \ @@ -3597,7 +3596,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS = \ monodll_dnd.o \ monodll_evtloop.o \ monodll_font.o \ - monodll_gdiobj.o \ monodll_gsockgtk.o \ monodll_main.o \ monodll_minifram.o \ @@ -3634,7 +3632,6 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS = \ monodll_font.o \ monodll_fontenum.o \ monodll_fontutil.o \ - monodll_gdiobj.o \ monodll_palette.o \ monodll_pen.o \ monodll_region.o \ @@ -3776,7 +3773,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS = \ monodll_dcscreen.o \ monodll_evtloop.o \ monodll_font.o \ - monodll_gdiobj.o \ monodll_gsockx11.o \ monodll_minifram.o \ monodll_nanox.o \ @@ -3836,7 +3832,6 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS = \ monodll_fontutil.o \ monodll_frame.o \ monodll_gauge.o \ - monodll_gdiobj.o \ monodll_icon.o \ monodll_listbox.o \ monodll_main.o \ @@ -4090,7 +4085,6 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS = \ monodll_font.o \ monodll_frame.o \ monodll_gauge.o \ - monodll_gdiobj.o \ monodll_gsockmot.o \ monodll_icon.o \ monodll_listbox.o \ @@ -4356,7 +4350,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_1 = \ monodll_dnd.o \ monodll_evtloop.o \ monodll_font.o \ - monodll_gdiobj.o \ monodll_gsockgtk.o \ monodll_main.o \ monodll_minifram.o \ @@ -4396,7 +4389,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_dnd.o \ monodll_evtloop.o \ monodll_font.o \ - monodll_gdiobj.o \ monodll_gsockgtk.o \ monodll_main.o \ monodll_minifram.o \ @@ -4433,7 +4425,6 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_font.o \ monodll_fontenum.o \ monodll_fontutil.o \ - monodll_gdiobj.o \ monodll_palette.o \ monodll_pen.o \ monodll_region.o \ @@ -4575,7 +4566,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_dcscreen.o \ monodll_evtloop.o \ monodll_font.o \ - monodll_gdiobj.o \ monodll_gsockx11.o \ monodll_minifram.o \ monodll_nanox.o \ @@ -5219,7 +5209,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_2 = \ monolib_dnd.o \ monolib_evtloop.o \ monolib_font.o \ - monolib_gdiobj.o \ monolib_gsockgtk.o \ monolib_main.o \ monolib_minifram.o \ @@ -5259,7 +5248,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_dnd.o \ monolib_evtloop.o \ monolib_font.o \ - monolib_gdiobj.o \ monolib_gsockgtk.o \ monolib_main.o \ monolib_minifram.o \ @@ -5297,7 +5285,6 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_font.o \ monolib_fontenum.o \ monolib_fontutil.o \ - monolib_gdiobj.o \ monolib_palette.o \ monolib_pen.o \ monolib_region.o \ @@ -5439,7 +5426,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_dcscreen.o \ monolib_evtloop.o \ monolib_font.o \ - monolib_gdiobj.o \ monolib_gsockx11.o \ monolib_minifram.o \ monolib_nanox.o \ @@ -5499,7 +5485,6 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_1 = \ monolib_fontutil.o \ monolib_frame.o \ monolib_gauge.o \ - monolib_gdiobj.o \ monolib_icon.o \ monolib_listbox.o \ monolib_main.o \ @@ -5753,7 +5738,6 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_1 = \ monolib_font.o \ monolib_frame.o \ monolib_gauge.o \ - monolib_gdiobj.o \ monolib_gsockmot.o \ monolib_icon.o \ monolib_listbox.o \ @@ -6019,7 +6003,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_3 = \ monolib_dnd.o \ monolib_evtloop.o \ monolib_font.o \ - monolib_gdiobj.o \ monolib_gsockgtk.o \ monolib_main.o \ monolib_minifram.o \ @@ -6059,7 +6042,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_dnd.o \ monolib_evtloop.o \ monolib_font.o \ - monolib_gdiobj.o \ monolib_gsockgtk.o \ monolib_main.o \ monolib_minifram.o \ @@ -6097,7 +6079,6 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_font.o \ monolib_fontenum.o \ monolib_fontutil.o \ - monolib_gdiobj.o \ monolib_palette.o \ monolib_pen.o \ monolib_region.o \ @@ -6239,7 +6220,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_dcscreen.o \ monolib_evtloop.o \ monolib_font.o \ - monolib_gdiobj.o \ monolib_gsockx11.o \ monolib_minifram.o \ monolib_nanox.o \ @@ -7100,7 +7080,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_4 = \ coredll_dnd.o \ coredll_evtloop.o \ coredll_font.o \ - coredll_gdiobj.o \ coredll_gsockgtk.o \ coredll_main.o \ coredll_minifram.o \ @@ -7140,7 +7119,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_dnd.o \ coredll_evtloop.o \ coredll_font.o \ - coredll_gdiobj.o \ coredll_gsockgtk.o \ coredll_main.o \ coredll_minifram.o \ @@ -7178,7 +7156,6 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_font.o \ coredll_fontenum.o \ coredll_fontutil.o \ - coredll_gdiobj.o \ coredll_palette.o \ coredll_pen.o \ coredll_region.o \ @@ -7320,7 +7297,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_dcscreen.o \ coredll_evtloop.o \ coredll_font.o \ - coredll_gdiobj.o \ coredll_gsockx11.o \ coredll_minifram.o \ coredll_nanox.o \ @@ -7380,7 +7356,6 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_2 = \ coredll_fontutil.o \ coredll_frame.o \ coredll_gauge.o \ - coredll_gdiobj.o \ coredll_icon.o \ coredll_listbox.o \ coredll_main.o \ @@ -7634,7 +7609,6 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_2 = \ coredll_font.o \ coredll_frame.o \ coredll_gauge.o \ - coredll_gdiobj.o \ coredll_gsockmot.o \ coredll_icon.o \ coredll_listbox.o \ @@ -7900,7 +7874,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_5 = \ coredll_dnd.o \ coredll_evtloop.o \ coredll_font.o \ - coredll_gdiobj.o \ coredll_gsockgtk.o \ coredll_main.o \ coredll_minifram.o \ @@ -7940,7 +7913,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_dnd.o \ coredll_evtloop.o \ coredll_font.o \ - coredll_gdiobj.o \ coredll_gsockgtk.o \ coredll_main.o \ coredll_minifram.o \ @@ -7978,7 +7950,6 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_font.o \ coredll_fontenum.o \ coredll_fontutil.o \ - coredll_gdiobj.o \ coredll_palette.o \ coredll_pen.o \ coredll_region.o \ @@ -8120,7 +8091,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_dcscreen.o \ coredll_evtloop.o \ coredll_font.o \ - coredll_gdiobj.o \ coredll_gsockx11.o \ coredll_minifram.o \ coredll_nanox.o \ @@ -8459,7 +8429,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_6 = \ corelib_dnd.o \ corelib_evtloop.o \ corelib_font.o \ - corelib_gdiobj.o \ corelib_gsockgtk.o \ corelib_main.o \ corelib_minifram.o \ @@ -8499,7 +8468,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_dnd.o \ corelib_evtloop.o \ corelib_font.o \ - corelib_gdiobj.o \ corelib_gsockgtk.o \ corelib_main.o \ corelib_minifram.o \ @@ -8537,7 +8505,6 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_font.o \ corelib_fontenum.o \ corelib_fontutil.o \ - corelib_gdiobj.o \ corelib_palette.o \ corelib_pen.o \ corelib_region.o \ @@ -8679,7 +8646,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_dcscreen.o \ corelib_evtloop.o \ corelib_font.o \ - corelib_gdiobj.o \ corelib_gsockx11.o \ corelib_minifram.o \ corelib_nanox.o \ @@ -8739,7 +8705,6 @@ COND_TOOLKIT_COCOA___GUI_SRC_OBJECTS_3 = \ corelib_fontutil.o \ corelib_frame.o \ corelib_gauge.o \ - corelib_gdiobj.o \ corelib_icon.o \ corelib_listbox.o \ corelib_main.o \ @@ -8993,7 +8958,6 @@ COND_TOOLKIT_MOTIF___GUI_SRC_OBJECTS_3 = \ corelib_font.o \ corelib_frame.o \ corelib_gauge.o \ - corelib_gdiobj.o \ corelib_gsockmot.o \ corelib_icon.o \ corelib_listbox.o \ @@ -9259,7 +9223,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION____LOWLEVEL_SRC_OBJECTS_7 = \ corelib_dnd.o \ corelib_evtloop.o \ corelib_font.o \ - corelib_gdiobj.o \ corelib_gsockgtk.o \ corelib_main.o \ corelib_minifram.o \ @@ -9299,7 +9262,6 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_dnd.o \ corelib_evtloop.o \ corelib_font.o \ - corelib_gdiobj.o \ corelib_gsockgtk.o \ corelib_main.o \ corelib_minifram.o \ @@ -9337,7 +9299,6 @@ COND_TOOLKIT_MGL___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_font.o \ corelib_fontenum.o \ corelib_fontutil.o \ - corelib_gdiobj.o \ corelib_palette.o \ corelib_pen.o \ corelib_region.o \ @@ -9479,7 +9440,6 @@ COND_TOOLKIT_X11___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_dcscreen.o \ corelib_evtloop.o \ corelib_font.o \ - corelib_gdiobj.o \ corelib_gsockx11.o \ corelib_minifram.o \ corelib_nanox.o \ @@ -13246,36 +13206,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_font.o: $(srcdir)/src/os2/font.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/font.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gdiobj.o: $(srcdir)/src/gtk/gdiobj.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/gdiobj.cpp - -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monodll_gdiobj.o: $(srcdir)/src/gtk1/gdiobj.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk1/gdiobj.cpp - -@COND_TOOLKIT_MSW_USE_GUI_1@monodll_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_WINCE_USE_GUI_1@monodll_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp - -@COND_TOOLKIT_X11_USE_GUI_1@monodll_gdiobj.o: $(srcdir)/src/x11/gdiobj.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/x11/gdiobj.cpp - -@COND_TOOLKIT_MGL_USE_GUI_1@monodll_gdiobj.o: $(srcdir)/src/mgl/gdiobj.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mgl/gdiobj.cpp - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monodll_gdiobj.o: $(srcdir)/src/motif/gdiobj.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/motif/gdiobj.cpp - -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_gdiobj.o: $(srcdir)/src/mac/carbon/gdiobj.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/gdiobj.cpp - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monodll_gdiobj.o: $(srcdir)/src/cocoa/gdiobj.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/cocoa/gdiobj.cpp - -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_gdiobj.o: $(srcdir)/src/os2/gdiobj.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/gdiobj.cpp - @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monodll_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.cpp $(MONODLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/gsockgtk.cpp @@ -13603,6 +13533,18 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/gdiimage.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@monodll_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_WINCE_USE_GUI_1@monodll_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp + +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_gdiobj.o: $(srcdir)/src/mac/carbon/gdiobj.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/gdiobj.cpp + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_gdiobj.o: $(srcdir)/src/os2/gdiobj.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/gdiobj.cpp + @COND_TOOLKIT_MSW_USE_GUI_1@monodll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/gsockmsw.cpp @@ -17131,36 +17073,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_font.o: $(srcdir)/src/os2/font.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/font.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gdiobj.o: $(srcdir)/src/gtk/gdiobj.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/gdiobj.cpp - -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@monolib_gdiobj.o: $(srcdir)/src/gtk1/gdiobj.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk1/gdiobj.cpp - -@COND_TOOLKIT_MSW_USE_GUI_1@monolib_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_WINCE_USE_GUI_1@monolib_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp - -@COND_TOOLKIT_X11_USE_GUI_1@monolib_gdiobj.o: $(srcdir)/src/x11/gdiobj.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/x11/gdiobj.cpp - -@COND_TOOLKIT_MGL_USE_GUI_1@monolib_gdiobj.o: $(srcdir)/src/mgl/gdiobj.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mgl/gdiobj.cpp - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@monolib_gdiobj.o: $(srcdir)/src/motif/gdiobj.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/motif/gdiobj.cpp - -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_gdiobj.o: $(srcdir)/src/mac/carbon/gdiobj.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/gdiobj.cpp - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@monolib_gdiobj.o: $(srcdir)/src/cocoa/gdiobj.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/cocoa/gdiobj.cpp - -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_gdiobj.o: $(srcdir)/src/os2/gdiobj.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/gdiobj.cpp - @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@monolib_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/gsockgtk.cpp @@ -17488,6 +17400,18 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/gdiimage.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@monolib_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_WINCE_USE_GUI_1@monolib_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp + +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_gdiobj.o: $(srcdir)/src/mac/carbon/gdiobj.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/gdiobj.cpp + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_gdiobj.o: $(srcdir)/src/os2/gdiobj.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/gdiobj.cpp + @COND_TOOLKIT_MSW_USE_GUI_1@monolib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/gsockmsw.cpp @@ -21397,36 +21321,6 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_font.o: $(srcdir)/src/os2/font.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/font.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gdiobj.o: $(srcdir)/src/gtk/gdiobj.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/gdiobj.cpp - -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@coredll_gdiobj.o: $(srcdir)/src/gtk1/gdiobj.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk1/gdiobj.cpp - -@COND_TOOLKIT_MSW_USE_GUI_1@coredll_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_WINCE_USE_GUI_1@coredll_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp - -@COND_TOOLKIT_X11_USE_GUI_1@coredll_gdiobj.o: $(srcdir)/src/x11/gdiobj.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/x11/gdiobj.cpp - -@COND_TOOLKIT_MGL_USE_GUI_1@coredll_gdiobj.o: $(srcdir)/src/mgl/gdiobj.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mgl/gdiobj.cpp - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@coredll_gdiobj.o: $(srcdir)/src/motif/gdiobj.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/motif/gdiobj.cpp - -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_gdiobj.o: $(srcdir)/src/mac/carbon/gdiobj.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/gdiobj.cpp - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@coredll_gdiobj.o: $(srcdir)/src/cocoa/gdiobj.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/cocoa/gdiobj.cpp - -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_gdiobj.o: $(srcdir)/src/os2/gdiobj.cpp $(COREDLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/gdiobj.cpp - @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@coredll_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.cpp $(COREDLL_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/gsockgtk.cpp @@ -21754,6 +21648,18 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(COREDLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/gdiimage.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@coredll_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_WINCE_USE_GUI_1@coredll_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp + +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_gdiobj.o: $(srcdir)/src/mac/carbon/gdiobj.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/gdiobj.cpp + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@coredll_gdiobj.o: $(srcdir)/src/os2/gdiobj.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/os2/gdiobj.cpp + @COND_TOOLKIT_MSW_USE_GUI_1@coredll_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(COREDLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/gsockmsw.cpp @@ -24217,36 +24123,6 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_font.o: $(srcdir)/src/os2/font.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/font.cpp -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gdiobj.o: $(srcdir)/src/gtk/gdiobj.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/gdiobj.cpp - -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@corelib_gdiobj.o: $(srcdir)/src/gtk1/gdiobj.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk1/gdiobj.cpp - -@COND_TOOLKIT_MSW_USE_GUI_1@corelib_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_WINCE_USE_GUI_1@corelib_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp - -@COND_TOOLKIT_X11_USE_GUI_1@corelib_gdiobj.o: $(srcdir)/src/x11/gdiobj.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/x11/gdiobj.cpp - -@COND_TOOLKIT_MGL_USE_GUI_1@corelib_gdiobj.o: $(srcdir)/src/mgl/gdiobj.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MGL_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mgl/gdiobj.cpp - -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@corelib_gdiobj.o: $(srcdir)/src/motif/gdiobj.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/motif/gdiobj.cpp - -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_gdiobj.o: $(srcdir)/src/mac/carbon/gdiobj.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/gdiobj.cpp - -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@corelib_gdiobj.o: $(srcdir)/src/cocoa/gdiobj.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/cocoa/gdiobj.cpp - -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_gdiobj.o: $(srcdir)/src/os2/gdiobj.cpp $(CORELIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/gdiobj.cpp - @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@corelib_gsockgtk.o: $(srcdir)/src/gtk/gsockgtk.cpp $(CORELIB_ODEP) @COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/gsockgtk.cpp @@ -24574,6 +24450,18 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_gdiimage.o: $(srcdir)/src/os2/gdiimage.cpp $(CORELIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/gdiimage.cpp +@COND_TOOLKIT_MSW_USE_GUI_1@corelib_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_WINCE_USE_GUI_1@corelib_gdiobj.o: $(srcdir)/src/msw/gdiobj.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gdiobj.cpp + +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_gdiobj.o: $(srcdir)/src/mac/carbon/gdiobj.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/gdiobj.cpp + +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@corelib_gdiobj.o: $(srcdir)/src/os2/gdiobj.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/os2/gdiobj.cpp + @COND_TOOLKIT_MSW_USE_GUI_1@corelib_gsockmsw.o: $(srcdir)/src/msw/gsockmsw.cpp $(CORELIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/gsockmsw.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 2e1a14d6d7..1234898ad7 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -892,7 +892,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/gtk/dnd.cpp src/gtk/evtloop.cpp src/gtk/font.cpp - src/gtk/gdiobj.cpp src/gtk/gsockgtk.cpp src/gtk/main.cpp src/gtk/minifram.cpp @@ -1070,7 +1069,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/gtk1/dnd.cpp src/gtk1/evtloop.cpp src/gtk1/font.cpp - src/gtk1/gdiobj.cpp src/gtk1/gsockgtk.cpp src/gtk1/main.cpp src/gtk1/minifram.cpp @@ -1253,7 +1251,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/motif/font.cpp src/motif/frame.cpp src/motif/gauge.cpp - src/motif/gdiobj.cpp src/motif/gsockmot.cpp src/motif/icon.cpp src/motif/listbox.cpp @@ -1385,7 +1382,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/x11/dcscreen.cpp src/x11/evtloop.cpp src/x11/font.cpp - src/x11/gdiobj.cpp src/x11/gsockx11.cpp src/x11/minifram.cpp src/x11/nanox.c @@ -1742,7 +1738,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/mgl/font.cpp src/mgl/fontenum.cpp src/mgl/fontutil.cpp - src/mgl/gdiobj.cpp src/mgl/palette.cpp src/mgl/pen.cpp src/mgl/region.cpp @@ -2301,7 +2296,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/cocoa/fontutil.cpp src/cocoa/frame.mm src/cocoa/gauge.mm - src/cocoa/gdiobj.cpp src/cocoa/icon.mm src/cocoa/listbox.mm src/cocoa/main.cpp diff --git a/src/cocoa/gdiobj.cpp b/src/cocoa/gdiobj.cpp deleted file mode 100644 index 4d0b2a9b60..0000000000 --- a/src/cocoa/gdiobj.cpp +++ /dev/null @@ -1,19 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/cocoa/gdiobj.cpp -// Purpose: wxGDIObject class -// Author: AUTHOR -// Modified by: -// Created: ??/??/98 -// RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/gdiobj.h" - -IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject) - -// TODO: Nothing to do, unless you want to. diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index d8cb754632..d7314afc0c 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -17,6 +17,7 @@ #endif #include "wx/gdicmn.h" +#include "wx/gdiobj.h" #ifndef WX_PRECOMP #include "wx/log.h" @@ -31,6 +32,10 @@ #include "wx/font.h" #endif + +IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject) + + WXDLLIMPEXP_DATA_CORE(wxBrushList*) wxTheBrushList; WXDLLIMPEXP_DATA_CORE(wxFontList*) wxTheFontList; WXDLLIMPEXP_DATA_CORE(wxPenList*) wxThePenList; diff --git a/src/gtk/gdiobj.cpp b/src/gtk/gdiobj.cpp deleted file mode 100644 index c01f42930f..0000000000 --- a/src/gtk/gdiobj.cpp +++ /dev/null @@ -1,15 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk/gdiobj.cpp -// Purpose: wxGDIObject class -// Author: Julian Smart -// RCS-ID: $Id$ -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/gdiobj.h" - -IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject) diff --git a/src/gtk1/gdiobj.cpp b/src/gtk1/gdiobj.cpp deleted file mode 100644 index 72ca341ea8..0000000000 --- a/src/gtk1/gdiobj.cpp +++ /dev/null @@ -1,15 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/gtk1/gdiobj.cpp -// Purpose: wxGDIObject class -// Author: Julian Smart -// RCS-ID: $Id$ -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/gdiobj.h" - -IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject) diff --git a/src/mac/carbon/gdiobj.cpp b/src/mac/carbon/gdiobj.cpp index 163429e27f..abd6b9da06 100644 --- a/src/mac/carbon/gdiobj.cpp +++ b/src/mac/carbon/gdiobj.cpp @@ -19,8 +19,6 @@ #include "wx/mac/private.h" -IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject) - class wxStockGDIMac: public wxStockGDI { public: diff --git a/src/mac/classic/gdiobj.cpp b/src/mac/classic/gdiobj.cpp index 5ba78d3934..4f450527f3 100644 --- a/src/mac/classic/gdiobj.cpp +++ b/src/mac/classic/gdiobj.cpp @@ -19,8 +19,6 @@ #include "wx/mac/private.h" -IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject) - class wxStockGDIMac: public wxStockGDI { public: diff --git a/src/mgl/gdiobj.cpp b/src/mgl/gdiobj.cpp deleted file mode 100644 index 97bf181d83..0000000000 --- a/src/mgl/gdiobj.cpp +++ /dev/null @@ -1,27 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/mgl/gdiobj.cpp -// Purpose: wxGDIObject class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// RCS-ID: $Id$ -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#include "wx/gdiobj.h" - -#ifndef WX_PRECOMP - #include - #include "wx/list.h" - #include "wx/utils.h" -#endif - -IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject) diff --git a/src/motif/gdiobj.cpp b/src/motif/gdiobj.cpp deleted file mode 100644 index 77985aa1ad..0000000000 --- a/src/motif/gdiobj.cpp +++ /dev/null @@ -1,18 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/motif/gdiobj.cpp -// Purpose: wxGDIObject class -// Author: Julian Smart -// Modified by: -// Created: 17/09/98 -// RCS-ID: $Id$ -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#include "wx/gdiobj.h" - -IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject) diff --git a/src/msw/gdiobj.cpp b/src/msw/gdiobj.cpp index 46ef0dc8a2..7a3f65e4d8 100644 --- a/src/msw/gdiobj.cpp +++ b/src/msw/gdiobj.cpp @@ -27,8 +27,6 @@ #include "wx/msw/private.h" -IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject) - #define M_GDIDATA wx_static_cast(wxGDIRefData*, m_refData) /* diff --git a/src/os2/gdiobj.cpp b/src/os2/gdiobj.cpp index 0177d3c82d..85d8e902fb 100644 --- a/src/os2/gdiobj.cpp +++ b/src/os2/gdiobj.cpp @@ -18,8 +18,6 @@ #include "wx/gdicmn.h" #endif -IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject) - class wxStockGDIPM: public wxStockGDI { public: diff --git a/src/palmos/gdiobj.cpp b/src/palmos/gdiobj.cpp deleted file mode 100644 index df63fdcb93..0000000000 --- a/src/palmos/gdiobj.cpp +++ /dev/null @@ -1,28 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/palmos/gdiobj.cpp -// Purpose: wxGDIObject class -// Author: William Osborne - minimal working wxPalmOS port -// Modified by: -// Created: 10/13/04 -// RCS-ID: $Id$ -// Copyright: (c) William Osborne -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// For compilers that support precompilation, includes "wx.h". -#include "wx/wxprec.h" - -#ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include - #include "wx/list.h" - #include "wx/utils.h" - #include "wx/app.h" -#endif - -#include "wx/gdiobj.h" - -IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject) diff --git a/src/x11/gdiobj.cpp b/src/x11/gdiobj.cpp deleted file mode 100644 index b6dede210f..0000000000 --- a/src/x11/gdiobj.cpp +++ /dev/null @@ -1,14 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: src/x11/gdiobj.cpp -// Purpose: wxGDIObject class -// Author: Julian Smart -// Modified by: -// Created: 17/09/98 -// RCS-ID: $Id$ -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#include "wx/gdiobj.h" - -IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject) -- 2.45.2