From f43426c1b97fe120b04c9a65d855d6861404ac14 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 4 Oct 2006 03:13:03 +0000 Subject: [PATCH] Bakefile changes for building the graphics context modules, and setup/configure changes for setting wxUSE_GRAPHICS_CONTEXT. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 93 ++++++++++++++++++++++++++++++++++++ build/bakefiles/files.bkl | 5 ++ build/msw/makefile.bcc | 56 ++++++++++++++++++++++ build/msw/makefile.gcc | 56 ++++++++++++++++++++++ build/msw/makefile.vc | 56 ++++++++++++++++++++++ build/msw/makefile.wat | 56 ++++++++++++++++++++++ build/msw/wx_core.dsp | 12 +++++ configure | 59 +++++++++++++++++++++++ configure.in | 7 +++ include/wx/chkconf.h | 19 ++++++++ include/wx/graphics.h | 8 ---- include/wx/mac/setup0.h | 9 ++++ include/wx/motif/setup0.h | 9 ++++ include/wx/msw/setup0.h | 9 ++++ include/wx/msw/wince/setup.h | 9 ++++ include/wx/os2/setup0.h | 9 ++++ include/wx/palmos/setup0.h | 9 ++++ include/wx/setup_inc.h | 9 ++++ setup.h.in | 3 ++ src/mac/carbon/graphics.cpp | 2 +- src/wxWindows.dsp | 12 +++++ 21 files changed, 498 insertions(+), 9 deletions(-) diff --git a/Makefile.in b/Makefile.in index dc76d9d2f3..bfb898f40c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2777,6 +2777,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/generic/textdlgg.h \ wx/generic/timer.h \ wx/generic/treectlg.h \ + wx/graphics.h \ wx/helphtml.h \ wx/icon.h \ wx/layout.h \ @@ -3339,6 +3340,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_gdicmn.o \ monodll_geometry.o \ monodll_gifdecod.o \ + monodll_graphcmn.o \ monodll_helpbase.o \ monodll_iconbndl.o \ monodll_imagall.o \ @@ -3505,6 +3507,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_gdicmn.o \ monodll_geometry.o \ monodll_gifdecod.o \ + monodll_graphcmn.o \ monodll_helpbase.o \ monodll_iconbndl.o \ monodll_imagall.o \ @@ -3754,6 +3757,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS = \ monodll_fontutil.o \ monodll_gdiimage.o \ monodll_gdiobj.o \ + monodll_graphics.o \ monodll_gsockmsw.o \ monodll_icon.o \ monodll_imaglist.o \ @@ -3806,6 +3810,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS = \ monodll_fontutil.o \ monodll_gdiimage.o \ monodll_gdiobj.o \ + monodll_graphics.o \ monodll_gsockmsw.o \ monodll_icon.o \ monodll_imaglist.o \ @@ -4005,6 +4010,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS = \ monodll_dirdlgg.o \ monodll_fdrepdlg.o \ monodll_filedlgg.o \ + monodll_graphicc.o \ monodll_listctrl.o \ monodll_msgdlgg.o \ monodll_prntdlgg.o \ @@ -4091,6 +4097,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS = \ monodll_frame.o \ monodll_gauge.o \ monodll_gdiobj.o \ + monodll_graphics.o \ monodll_icon.o \ monodll_imaglist.o \ monodll_listbox.o \ @@ -4576,6 +4583,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_fontutil.o \ monodll_gdiimage.o \ monodll_gdiobj.o \ + monodll_graphics.o \ monodll_gsockmsw.o \ monodll_icon.o \ monodll_imaglist.o \ @@ -4628,6 +4636,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_1 = \ monodll_fontutil.o \ monodll_gdiimage.o \ monodll_gdiobj.o \ + monodll_graphics.o \ monodll_gsockmsw.o \ monodll_icon.o \ monodll_imaglist.o \ @@ -5060,6 +5069,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_gdicmn.o \ monolib_geometry.o \ monolib_gifdecod.o \ + monolib_graphcmn.o \ monolib_helpbase.o \ monolib_iconbndl.o \ monolib_imagall.o \ @@ -5226,6 +5236,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_gdicmn.o \ monolib_geometry.o \ monolib_gifdecod.o \ + monolib_graphcmn.o \ monolib_helpbase.o \ monolib_iconbndl.o \ monolib_imagall.o \ @@ -5476,6 +5487,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_fontutil.o \ monolib_gdiimage.o \ monolib_gdiobj.o \ + monolib_graphics.o \ monolib_gsockmsw.o \ monolib_icon.o \ monolib_imaglist.o \ @@ -5528,6 +5540,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_2 = \ monolib_fontutil.o \ monolib_gdiimage.o \ monolib_gdiobj.o \ + monolib_graphics.o \ monolib_gsockmsw.o \ monolib_icon.o \ monolib_imaglist.o \ @@ -5727,6 +5740,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_1 = \ monolib_dirdlgg.o \ monolib_fdrepdlg.o \ monolib_filedlgg.o \ + monolib_graphicc.o \ monolib_listctrl.o \ monolib_msgdlgg.o \ monolib_prntdlgg.o \ @@ -5813,6 +5827,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_1 = \ monolib_frame.o \ monolib_gauge.o \ monolib_gdiobj.o \ + monolib_graphics.o \ monolib_icon.o \ monolib_imaglist.o \ monolib_listbox.o \ @@ -6299,6 +6314,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_fontutil.o \ monolib_gdiimage.o \ monolib_gdiobj.o \ + monolib_graphics.o \ monolib_gsockmsw.o \ monolib_icon.o \ monolib_imaglist.o \ @@ -6351,6 +6367,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_3 = \ monolib_fontutil.o \ monolib_gdiimage.o \ monolib_gdiobj.o \ + monolib_graphics.o \ monolib_gsockmsw.o \ monolib_icon.o \ monolib_imaglist.o \ @@ -6999,6 +7016,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_gdicmn.o \ coredll_geometry.o \ coredll_gifdecod.o \ + coredll_graphcmn.o \ coredll_helpbase.o \ coredll_iconbndl.o \ coredll_imagall.o \ @@ -7165,6 +7183,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_gdicmn.o \ coredll_geometry.o \ coredll_gifdecod.o \ + coredll_graphcmn.o \ coredll_helpbase.o \ coredll_iconbndl.o \ coredll_imagall.o \ @@ -7415,6 +7434,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_fontutil.o \ coredll_gdiimage.o \ coredll_gdiobj.o \ + coredll_graphics.o \ coredll_gsockmsw.o \ coredll_icon.o \ coredll_imaglist.o \ @@ -7467,6 +7487,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_4 = \ coredll_fontutil.o \ coredll_gdiimage.o \ coredll_gdiobj.o \ + coredll_graphics.o \ coredll_gsockmsw.o \ coredll_icon.o \ coredll_imaglist.o \ @@ -7666,6 +7687,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_2 = \ coredll_dirdlgg.o \ coredll_fdrepdlg.o \ coredll_filedlgg.o \ + coredll_graphicc.o \ coredll_listctrl.o \ coredll_msgdlgg.o \ coredll_prntdlgg.o \ @@ -7752,6 +7774,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_2 = \ coredll_frame.o \ coredll_gauge.o \ coredll_gdiobj.o \ + coredll_graphics.o \ coredll_icon.o \ coredll_imaglist.o \ coredll_listbox.o \ @@ -8238,6 +8261,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_fontutil.o \ coredll_gdiimage.o \ coredll_gdiobj.o \ + coredll_graphics.o \ coredll_gsockmsw.o \ coredll_icon.o \ coredll_imaglist.o \ @@ -8290,6 +8314,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_5 = \ coredll_fontutil.o \ coredll_gdiimage.o \ coredll_gdiobj.o \ + coredll_graphics.o \ coredll_gsockmsw.o \ coredll_icon.o \ coredll_imaglist.o \ @@ -8414,6 +8439,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_gdicmn.o \ corelib_geometry.o \ corelib_gifdecod.o \ + corelib_graphcmn.o \ corelib_helpbase.o \ corelib_iconbndl.o \ corelib_imagall.o \ @@ -8580,6 +8606,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_gdicmn.o \ corelib_geometry.o \ corelib_gifdecod.o \ + corelib_graphcmn.o \ corelib_helpbase.o \ corelib_iconbndl.o \ corelib_imagall.o \ @@ -8830,6 +8857,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_fontutil.o \ corelib_gdiimage.o \ corelib_gdiobj.o \ + corelib_graphics.o \ corelib_gsockmsw.o \ corelib_icon.o \ corelib_imaglist.o \ @@ -8882,6 +8910,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_6 = \ corelib_fontutil.o \ corelib_gdiimage.o \ corelib_gdiobj.o \ + corelib_graphics.o \ corelib_gsockmsw.o \ corelib_icon.o \ corelib_imaglist.o \ @@ -9081,6 +9110,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2___GUI_SRC_OBJECTS_3 = \ corelib_dirdlgg.o \ corelib_fdrepdlg.o \ corelib_filedlgg.o \ + corelib_graphicc.o \ corelib_listctrl.o \ corelib_msgdlgg.o \ corelib_prntdlgg.o \ @@ -9167,6 +9197,7 @@ COND_TOOLKIT_MAC___GUI_SRC_OBJECTS_3 = \ corelib_frame.o \ corelib_gauge.o \ corelib_gdiobj.o \ + corelib_graphics.o \ corelib_icon.o \ corelib_imaglist.o \ corelib_listbox.o \ @@ -9653,6 +9684,7 @@ COND_TOOLKIT_MSW___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_fontutil.o \ corelib_gdiimage.o \ corelib_gdiobj.o \ + corelib_graphics.o \ corelib_gsockmsw.o \ corelib_icon.o \ corelib_imaglist.o \ @@ -9705,6 +9737,7 @@ COND_TOOLKIT_WINCE___LOWLEVEL_SRC_OBJECTS_7 = \ corelib_fontutil.o \ corelib_gdiimage.o \ corelib_gdiobj.o \ + corelib_graphics.o \ corelib_gsockmsw.o \ corelib_icon.o \ corelib_imaglist.o \ @@ -12106,6 +12139,9 @@ monodll_urlmsw.o: $(srcdir)/src/msw/urlmsw.cpp $(MONODLL_ODEP) monodll_net.o: $(srcdir)/src/msw/wince/net.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/wince/net.cpp +monodll_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp + monodll_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp @@ -13966,6 +14002,15 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @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_MSW_USE_GUI_1@monodll_graphics.o: $(srcdir)/src/msw/graphics.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_graphics.o: $(srcdir)/src/msw/graphics.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp + +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monodll_graphics.o: $(srcdir)/src/mac/carbon/graphics.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/mac/carbon/graphics.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 @@ -15388,6 +15433,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_gifdecod.o: $(srcdir)/src/common/gifdecod.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/gifdecod.cpp +@COND_USE_GUI_1@monodll_graphcmn.o: $(srcdir)/src/common/graphcmn.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/graphcmn.cpp + @COND_USE_GUI_1@monodll_helpbase.o: $(srcdir)/src/common/helpbase.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/helpbase.cpp @@ -16066,6 +16114,9 @@ monolib_urlmsw.o: $(srcdir)/src/msw/urlmsw.cpp $(MONOLIB_ODEP) monolib_net.o: $(srcdir)/src/msw/wince/net.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/wince/net.cpp +monolib_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp + monolib_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp @@ -17926,6 +17977,15 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @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_MSW_USE_GUI_1@monolib_graphics.o: $(srcdir)/src/msw/graphics.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_graphics.o: $(srcdir)/src/msw/graphics.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp + +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@monolib_graphics.o: $(srcdir)/src/mac/carbon/graphics.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/mac/carbon/graphics.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 @@ -19348,6 +19408,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_gifdecod.o: $(srcdir)/src/common/gifdecod.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/gifdecod.cpp +@COND_USE_GUI_1@monolib_graphcmn.o: $(srcdir)/src/common/graphcmn.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/graphcmn.cpp + @COND_USE_GUI_1@monolib_helpbase.o: $(srcdir)/src/common/helpbase.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/helpbase.cpp @@ -20998,6 +21061,9 @@ coredll_volume.o: $(srcdir)/src/msw/volume.cpp $(COREDLL_ODEP) coredll_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/uma.cpp +coredll_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(COREDLL_ODEP) + $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp + coredll_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(COREDLL_ODEP) $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp @@ -22264,6 +22330,15 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @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_MSW_USE_GUI_1@coredll_graphics.o: $(srcdir)/src/msw/graphics.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1@coredll_graphics.o: $(srcdir)/src/msw/graphics.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp + +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@coredll_graphics.o: $(srcdir)/src/mac/carbon/graphics.cpp $(COREDLL_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/mac/carbon/graphics.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 @@ -23653,6 +23728,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_gifdecod.o: $(srcdir)/src/common/gifdecod.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/gifdecod.cpp +@COND_USE_GUI_1@coredll_graphcmn.o: $(srcdir)/src/common/graphcmn.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/graphcmn.cpp + @COND_USE_GUI_1@coredll_helpbase.o: $(srcdir)/src/common/helpbase.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/helpbase.cpp @@ -23887,6 +23965,9 @@ corelib_volume.o: $(srcdir)/src/msw/volume.cpp $(CORELIB_ODEP) corelib_uma.o: $(srcdir)/src/mac/carbon/uma.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/uma.cpp +corelib_graphicc.o: $(srcdir)/src/generic/graphicc.cpp $(CORELIB_ODEP) + $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/graphicc.cpp + corelib_artgtk.o: $(srcdir)/src/gtk/artgtk.cpp $(CORELIB_ODEP) $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/gtk/artgtk.cpp @@ -25153,6 +25234,15 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @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_MSW_USE_GUI_1@corelib_graphics.o: $(srcdir)/src/msw/graphics.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp + +@COND_TOOLKIT_WINCE_USE_GUI_1@corelib_graphics.o: $(srcdir)/src/msw/graphics.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/msw/graphics.cpp + +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@corelib_graphics.o: $(srcdir)/src/mac/carbon/graphics.cpp $(CORELIB_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/mac/carbon/graphics.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 @@ -26542,6 +26632,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_gifdecod.o: $(srcdir)/src/common/gifdecod.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/gifdecod.cpp +@COND_USE_GUI_1@corelib_graphcmn.o: $(srcdir)/src/common/graphcmn.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/graphcmn.cpp + @COND_USE_GUI_1@corelib_helpbase.o: $(srcdir)/src/common/helpbase.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/helpbase.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 090d0628b9..ac677ec2ac 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -591,6 +591,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/common/gdicmn.cpp src/common/geometry.cpp src/common/gifdecod.cpp + src/common/graphcmn.cpp src/common/helpbase.cpp src/common/iconbndl.cpp src/common/imagall.cpp @@ -718,6 +719,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/generic/textdlgg.h wx/generic/timer.h wx/generic/treectlg.h + wx/graphics.h wx/helphtml.h wx/icon.h wx/layout.h @@ -946,6 +948,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/generic/dirdlgg.cpp src/generic/fdrepdlg.cpp src/generic/filedlgg.cpp + src/generic/graphicc.cpp src/generic/listctrl.cpp src/generic/msgdlgg.cpp src/generic/prntdlgg.cpp @@ -1459,6 +1462,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/msw/fontutil.cpp src/msw/gdiimage.cpp src/msw/gdiobj.cpp + src/msw/graphics.cpp src/msw/gsockmsw.cpp src/msw/icon.cpp src/msw/imaglist.cpp @@ -2076,6 +2080,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/mac/carbon/frame.cpp src/mac/carbon/gauge.cpp src/mac/carbon/gdiobj.cpp + src/mac/carbon/graphics.cpp src/mac/carbon/icon.cpp src/mac/carbon/imaglist.cpp src/mac/carbon/listbox.cpp diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 799a44365d..aa342b631e 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -1272,6 +1272,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_fontutil.obj \ $(OBJS)\monodll_gdiimage.obj \ $(OBJS)\monodll_gdiobj.obj \ + $(OBJS)\monodll_graphics.obj \ $(OBJS)\monodll_gsockmsw.obj \ $(OBJS)\monodll_icon.obj \ $(OBJS)\monodll_imaglist.obj \ @@ -1387,6 +1388,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_gdicmn.obj \ $(OBJS)\monodll_geometry.obj \ $(OBJS)\monodll_gifdecod.obj \ + $(OBJS)\monodll_graphcmn.obj \ $(OBJS)\monodll_helpbase.obj \ $(OBJS)\monodll_iconbndl.obj \ $(OBJS)\monodll_imagall.obj \ @@ -1484,6 +1486,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_fontutil.obj \ $(OBJS)\monodll_gdiimage.obj \ $(OBJS)\monodll_gdiobj.obj \ + $(OBJS)\monodll_graphics.obj \ $(OBJS)\monodll_gsockmsw.obj \ $(OBJS)\monodll_icon.obj \ $(OBJS)\monodll_imaglist.obj \ @@ -1602,6 +1605,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_gdicmn.obj \ $(OBJS)\monodll_geometry.obj \ $(OBJS)\monodll_gifdecod.obj \ + $(OBJS)\monodll_graphcmn.obj \ $(OBJS)\monodll_helpbase.obj \ $(OBJS)\monodll_iconbndl.obj \ $(OBJS)\monodll_imagall.obj \ @@ -1852,6 +1856,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_fontutil.obj \ $(OBJS)\monolib_gdiimage.obj \ $(OBJS)\monolib_gdiobj.obj \ + $(OBJS)\monolib_graphics.obj \ $(OBJS)\monolib_gsockmsw.obj \ $(OBJS)\monolib_icon.obj \ $(OBJS)\monolib_imaglist.obj \ @@ -1967,6 +1972,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_gdicmn.obj \ $(OBJS)\monolib_geometry.obj \ $(OBJS)\monolib_gifdecod.obj \ + $(OBJS)\monolib_graphcmn.obj \ $(OBJS)\monolib_helpbase.obj \ $(OBJS)\monolib_iconbndl.obj \ $(OBJS)\monolib_imagall.obj \ @@ -2064,6 +2070,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_fontutil.obj \ $(OBJS)\monolib_gdiimage.obj \ $(OBJS)\monolib_gdiobj.obj \ + $(OBJS)\monolib_graphics.obj \ $(OBJS)\monolib_gsockmsw.obj \ $(OBJS)\monolib_icon.obj \ $(OBJS)\monolib_imaglist.obj \ @@ -2182,6 +2189,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_gdicmn.obj \ $(OBJS)\monolib_geometry.obj \ $(OBJS)\monolib_gifdecod.obj \ + $(OBJS)\monolib_graphcmn.obj \ $(OBJS)\monolib_helpbase.obj \ $(OBJS)\monolib_iconbndl.obj \ $(OBJS)\monolib_imagall.obj \ @@ -2348,6 +2356,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_fontutil.obj \ $(OBJS)\coredll_gdiimage.obj \ $(OBJS)\coredll_gdiobj.obj \ + $(OBJS)\coredll_graphics.obj \ $(OBJS)\coredll_gsockmsw.obj \ $(OBJS)\coredll_icon.obj \ $(OBJS)\coredll_imaglist.obj \ @@ -2463,6 +2472,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_gdicmn.obj \ $(OBJS)\coredll_geometry.obj \ $(OBJS)\coredll_gifdecod.obj \ + $(OBJS)\coredll_graphcmn.obj \ $(OBJS)\coredll_helpbase.obj \ $(OBJS)\coredll_iconbndl.obj \ $(OBJS)\coredll_imagall.obj \ @@ -2560,6 +2570,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_fontutil.obj \ $(OBJS)\coredll_gdiimage.obj \ $(OBJS)\coredll_gdiobj.obj \ + $(OBJS)\coredll_graphics.obj \ $(OBJS)\coredll_gsockmsw.obj \ $(OBJS)\coredll_icon.obj \ $(OBJS)\coredll_imaglist.obj \ @@ -2678,6 +2689,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_gdicmn.obj \ $(OBJS)\coredll_geometry.obj \ $(OBJS)\coredll_gifdecod.obj \ + $(OBJS)\coredll_graphcmn.obj \ $(OBJS)\coredll_helpbase.obj \ $(OBJS)\coredll_iconbndl.obj \ $(OBJS)\coredll_imagall.obj \ @@ -2779,6 +2791,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_fontutil.obj \ $(OBJS)\corelib_gdiimage.obj \ $(OBJS)\corelib_gdiobj.obj \ + $(OBJS)\corelib_graphics.obj \ $(OBJS)\corelib_gsockmsw.obj \ $(OBJS)\corelib_icon.obj \ $(OBJS)\corelib_imaglist.obj \ @@ -2894,6 +2907,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_gdicmn.obj \ $(OBJS)\corelib_geometry.obj \ $(OBJS)\corelib_gifdecod.obj \ + $(OBJS)\corelib_graphcmn.obj \ $(OBJS)\corelib_helpbase.obj \ $(OBJS)\corelib_iconbndl.obj \ $(OBJS)\corelib_imagall.obj \ @@ -2991,6 +3005,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_fontutil.obj \ $(OBJS)\corelib_gdiimage.obj \ $(OBJS)\corelib_gdiobj.obj \ + $(OBJS)\corelib_graphics.obj \ $(OBJS)\corelib_gsockmsw.obj \ $(OBJS)\corelib_icon.obj \ $(OBJS)\corelib_imaglist.obj \ @@ -3109,6 +3124,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_gdicmn.obj \ $(OBJS)\corelib_geometry.obj \ $(OBJS)\corelib_gifdecod.obj \ + $(OBJS)\corelib_graphcmn.obj \ $(OBJS)\corelib_helpbase.obj \ $(OBJS)\corelib_iconbndl.obj \ $(OBJS)\corelib_imagall.obj \ @@ -5161,6 +5177,11 @@ $(OBJS)\monodll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_graphics.obj: ..\..\src\msw\graphics.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5751,6 +5772,11 @@ $(OBJS)\monodll_gifdecod.obj: ..\..\src\common\gifdecod.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_graphcmn.obj: ..\..\src\common\graphcmn.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_helpbase.obj: ..\..\src\common\helpbase.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -7043,6 +7069,11 @@ $(OBJS)\monolib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_graphics.obj: ..\..\src\msw\graphics.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -7633,6 +7664,11 @@ $(OBJS)\monolib_gifdecod.obj: ..\..\src\common\gifdecod.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_graphcmn.obj: ..\..\src\common\graphcmn.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_helpbase.obj: ..\..\src\common\helpbase.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -8952,6 +8988,11 @@ $(OBJS)\coredll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_graphics.obj: ..\..\src\msw\graphics.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -9542,6 +9583,11 @@ $(OBJS)\coredll_gifdecod.obj: ..\..\src\common\gifdecod.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_graphcmn.obj: ..\..\src\common\graphcmn.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_helpbase.obj: ..\..\src\common\helpbase.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -10177,6 +10223,11 @@ $(OBJS)\corelib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_graphics.obj: ..\..\src\msw\graphics.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** @@ -10767,6 +10818,11 @@ $(OBJS)\corelib_gifdecod.obj: ..\..\src\common\gifdecod.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_graphcmn.obj: ..\..\src\common\graphcmn.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_helpbase.obj: ..\..\src\common\helpbase.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 06ac36a2b7..b7cdea358e 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1286,6 +1286,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_fontutil.o \ $(OBJS)\monodll_gdiimage.o \ $(OBJS)\monodll_gdiobj.o \ + $(OBJS)\monodll_graphics.o \ $(OBJS)\monodll_gsockmsw.o \ $(OBJS)\monodll_icon.o \ $(OBJS)\monodll_imaglist.o \ @@ -1401,6 +1402,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_gdicmn.o \ $(OBJS)\monodll_geometry.o \ $(OBJS)\monodll_gifdecod.o \ + $(OBJS)\monodll_graphcmn.o \ $(OBJS)\monodll_helpbase.o \ $(OBJS)\monodll_iconbndl.o \ $(OBJS)\monodll_imagall.o \ @@ -1500,6 +1502,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_fontutil.o \ $(OBJS)\monodll_gdiimage.o \ $(OBJS)\monodll_gdiobj.o \ + $(OBJS)\monodll_graphics.o \ $(OBJS)\monodll_gsockmsw.o \ $(OBJS)\monodll_icon.o \ $(OBJS)\monodll_imaglist.o \ @@ -1618,6 +1621,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_gdicmn.o \ $(OBJS)\monodll_geometry.o \ $(OBJS)\monodll_gifdecod.o \ + $(OBJS)\monodll_graphcmn.o \ $(OBJS)\monodll_helpbase.o \ $(OBJS)\monodll_iconbndl.o \ $(OBJS)\monodll_imagall.o \ @@ -1872,6 +1876,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_fontutil.o \ $(OBJS)\monolib_gdiimage.o \ $(OBJS)\monolib_gdiobj.o \ + $(OBJS)\monolib_graphics.o \ $(OBJS)\monolib_gsockmsw.o \ $(OBJS)\monolib_icon.o \ $(OBJS)\monolib_imaglist.o \ @@ -1987,6 +1992,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_gdicmn.o \ $(OBJS)\monolib_geometry.o \ $(OBJS)\monolib_gifdecod.o \ + $(OBJS)\monolib_graphcmn.o \ $(OBJS)\monolib_helpbase.o \ $(OBJS)\monolib_iconbndl.o \ $(OBJS)\monolib_imagall.o \ @@ -2086,6 +2092,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_fontutil.o \ $(OBJS)\monolib_gdiimage.o \ $(OBJS)\monolib_gdiobj.o \ + $(OBJS)\monolib_graphics.o \ $(OBJS)\monolib_gsockmsw.o \ $(OBJS)\monolib_icon.o \ $(OBJS)\monolib_imaglist.o \ @@ -2204,6 +2211,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_gdicmn.o \ $(OBJS)\monolib_geometry.o \ $(OBJS)\monolib_gifdecod.o \ + $(OBJS)\monolib_graphcmn.o \ $(OBJS)\monolib_helpbase.o \ $(OBJS)\monolib_iconbndl.o \ $(OBJS)\monolib_imagall.o \ @@ -2384,6 +2392,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_fontutil.o \ $(OBJS)\coredll_gdiimage.o \ $(OBJS)\coredll_gdiobj.o \ + $(OBJS)\coredll_graphics.o \ $(OBJS)\coredll_gsockmsw.o \ $(OBJS)\coredll_icon.o \ $(OBJS)\coredll_imaglist.o \ @@ -2499,6 +2508,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_gdicmn.o \ $(OBJS)\coredll_geometry.o \ $(OBJS)\coredll_gifdecod.o \ + $(OBJS)\coredll_graphcmn.o \ $(OBJS)\coredll_helpbase.o \ $(OBJS)\coredll_iconbndl.o \ $(OBJS)\coredll_imagall.o \ @@ -2598,6 +2608,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_fontutil.o \ $(OBJS)\coredll_gdiimage.o \ $(OBJS)\coredll_gdiobj.o \ + $(OBJS)\coredll_graphics.o \ $(OBJS)\coredll_gsockmsw.o \ $(OBJS)\coredll_icon.o \ $(OBJS)\coredll_imaglist.o \ @@ -2716,6 +2727,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_gdicmn.o \ $(OBJS)\coredll_geometry.o \ $(OBJS)\coredll_gifdecod.o \ + $(OBJS)\coredll_graphcmn.o \ $(OBJS)\coredll_helpbase.o \ $(OBJS)\coredll_iconbndl.o \ $(OBJS)\coredll_imagall.o \ @@ -2823,6 +2835,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_fontutil.o \ $(OBJS)\corelib_gdiimage.o \ $(OBJS)\corelib_gdiobj.o \ + $(OBJS)\corelib_graphics.o \ $(OBJS)\corelib_gsockmsw.o \ $(OBJS)\corelib_icon.o \ $(OBJS)\corelib_imaglist.o \ @@ -2938,6 +2951,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_gdicmn.o \ $(OBJS)\corelib_geometry.o \ $(OBJS)\corelib_gifdecod.o \ + $(OBJS)\corelib_graphcmn.o \ $(OBJS)\corelib_helpbase.o \ $(OBJS)\corelib_iconbndl.o \ $(OBJS)\corelib_imagall.o \ @@ -3037,6 +3051,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_fontutil.o \ $(OBJS)\corelib_gdiimage.o \ $(OBJS)\corelib_gdiobj.o \ + $(OBJS)\corelib_graphics.o \ $(OBJS)\corelib_gsockmsw.o \ $(OBJS)\corelib_icon.o \ $(OBJS)\corelib_imaglist.o \ @@ -3155,6 +3170,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_gdicmn.o \ $(OBJS)\corelib_geometry.o \ $(OBJS)\corelib_gifdecod.o \ + $(OBJS)\corelib_graphcmn.o \ $(OBJS)\corelib_helpbase.o \ $(OBJS)\corelib_iconbndl.o \ $(OBJS)\corelib_imagall.o \ @@ -5282,6 +5298,11 @@ $(OBJS)\monodll_gdiobj.o: ../../src/msw/gdiobj.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_graphics.o: ../../src/msw/graphics.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_gsockmsw.o: ../../src/msw/gsockmsw.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -5972,6 +5993,11 @@ $(OBJS)\monodll_gifdecod.o: ../../src/common/gifdecod.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_graphcmn.o: ../../src/common/graphcmn.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_helpbase.o: ../../src/common/helpbase.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -7264,6 +7290,11 @@ $(OBJS)\monolib_gdiobj.o: ../../src/msw/gdiobj.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_graphics.o: ../../src/msw/graphics.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_gsockmsw.o: ../../src/msw/gsockmsw.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -7954,6 +7985,11 @@ $(OBJS)\monolib_gifdecod.o: ../../src/common/gifdecod.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_graphcmn.o: ../../src/common/graphcmn.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_helpbase.o: ../../src/common/helpbase.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -9273,6 +9309,11 @@ $(OBJS)\coredll_gdiobj.o: ../../src/msw/gdiobj.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_graphics.o: ../../src/msw/graphics.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\coredll_gsockmsw.o: ../../src/msw/gsockmsw.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -9963,6 +10004,11 @@ $(OBJS)\coredll_gifdecod.o: ../../src/common/gifdecod.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_graphcmn.o: ../../src/common/graphcmn.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\coredll_helpbase.o: ../../src/common/helpbase.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -10598,6 +10644,11 @@ $(OBJS)\corelib_gdiobj.o: ../../src/msw/gdiobj.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_graphics.o: ../../src/msw/graphics.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\corelib_gsockmsw.o: ../../src/msw/gsockmsw.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< @@ -11288,6 +11339,11 @@ $(OBJS)\corelib_gifdecod.o: ../../src/common/gifdecod.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_graphcmn.o: ../../src/common/graphcmn.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\corelib_helpbase.o: ../../src/common/helpbase.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 77205e47a2..7c806abc0c 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -1446,6 +1446,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_fontutil.obj \ $(OBJS)\monodll_gdiimage.obj \ $(OBJS)\monodll_gdiobj.obj \ + $(OBJS)\monodll_graphics.obj \ $(OBJS)\monodll_gsockmsw.obj \ $(OBJS)\monodll_icon.obj \ $(OBJS)\monodll_imaglist.obj \ @@ -1561,6 +1562,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_gdicmn.obj \ $(OBJS)\monodll_geometry.obj \ $(OBJS)\monodll_gifdecod.obj \ + $(OBJS)\monodll_graphcmn.obj \ $(OBJS)\monodll_helpbase.obj \ $(OBJS)\monodll_iconbndl.obj \ $(OBJS)\monodll_imagall.obj \ @@ -1658,6 +1660,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_fontutil.obj \ $(OBJS)\monodll_gdiimage.obj \ $(OBJS)\monodll_gdiobj.obj \ + $(OBJS)\monodll_graphics.obj \ $(OBJS)\monodll_gsockmsw.obj \ $(OBJS)\monodll_icon.obj \ $(OBJS)\monodll_imaglist.obj \ @@ -1776,6 +1779,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_gdicmn.obj \ $(OBJS)\monodll_geometry.obj \ $(OBJS)\monodll_gifdecod.obj \ + $(OBJS)\monodll_graphcmn.obj \ $(OBJS)\monodll_helpbase.obj \ $(OBJS)\monodll_iconbndl.obj \ $(OBJS)\monodll_imagall.obj \ @@ -2032,6 +2036,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_fontutil.obj \ $(OBJS)\monolib_gdiimage.obj \ $(OBJS)\monolib_gdiobj.obj \ + $(OBJS)\monolib_graphics.obj \ $(OBJS)\monolib_gsockmsw.obj \ $(OBJS)\monolib_icon.obj \ $(OBJS)\monolib_imaglist.obj \ @@ -2147,6 +2152,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_gdicmn.obj \ $(OBJS)\monolib_geometry.obj \ $(OBJS)\monolib_gifdecod.obj \ + $(OBJS)\monolib_graphcmn.obj \ $(OBJS)\monolib_helpbase.obj \ $(OBJS)\monolib_iconbndl.obj \ $(OBJS)\monolib_imagall.obj \ @@ -2244,6 +2250,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_fontutil.obj \ $(OBJS)\monolib_gdiimage.obj \ $(OBJS)\monolib_gdiobj.obj \ + $(OBJS)\monolib_graphics.obj \ $(OBJS)\monolib_gsockmsw.obj \ $(OBJS)\monolib_icon.obj \ $(OBJS)\monolib_imaglist.obj \ @@ -2362,6 +2369,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_gdicmn.obj \ $(OBJS)\monolib_geometry.obj \ $(OBJS)\monolib_gifdecod.obj \ + $(OBJS)\monolib_graphcmn.obj \ $(OBJS)\monolib_helpbase.obj \ $(OBJS)\monolib_iconbndl.obj \ $(OBJS)\monolib_imagall.obj \ @@ -2558,6 +2566,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_fontutil.obj \ $(OBJS)\coredll_gdiimage.obj \ $(OBJS)\coredll_gdiobj.obj \ + $(OBJS)\coredll_graphics.obj \ $(OBJS)\coredll_gsockmsw.obj \ $(OBJS)\coredll_icon.obj \ $(OBJS)\coredll_imaglist.obj \ @@ -2673,6 +2682,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_gdicmn.obj \ $(OBJS)\coredll_geometry.obj \ $(OBJS)\coredll_gifdecod.obj \ + $(OBJS)\coredll_graphcmn.obj \ $(OBJS)\coredll_helpbase.obj \ $(OBJS)\coredll_iconbndl.obj \ $(OBJS)\coredll_imagall.obj \ @@ -2770,6 +2780,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_fontutil.obj \ $(OBJS)\coredll_gdiimage.obj \ $(OBJS)\coredll_gdiobj.obj \ + $(OBJS)\coredll_graphics.obj \ $(OBJS)\coredll_gsockmsw.obj \ $(OBJS)\coredll_icon.obj \ $(OBJS)\coredll_imaglist.obj \ @@ -2888,6 +2899,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_gdicmn.obj \ $(OBJS)\coredll_geometry.obj \ $(OBJS)\coredll_gifdecod.obj \ + $(OBJS)\coredll_graphcmn.obj \ $(OBJS)\coredll_helpbase.obj \ $(OBJS)\coredll_iconbndl.obj \ $(OBJS)\coredll_imagall.obj \ @@ -2995,6 +3007,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_fontutil.obj \ $(OBJS)\corelib_gdiimage.obj \ $(OBJS)\corelib_gdiobj.obj \ + $(OBJS)\corelib_graphics.obj \ $(OBJS)\corelib_gsockmsw.obj \ $(OBJS)\corelib_icon.obj \ $(OBJS)\corelib_imaglist.obj \ @@ -3110,6 +3123,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_gdicmn.obj \ $(OBJS)\corelib_geometry.obj \ $(OBJS)\corelib_gifdecod.obj \ + $(OBJS)\corelib_graphcmn.obj \ $(OBJS)\corelib_helpbase.obj \ $(OBJS)\corelib_iconbndl.obj \ $(OBJS)\corelib_imagall.obj \ @@ -3207,6 +3221,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_fontutil.obj \ $(OBJS)\corelib_gdiimage.obj \ $(OBJS)\corelib_gdiobj.obj \ + $(OBJS)\corelib_graphics.obj \ $(OBJS)\corelib_gsockmsw.obj \ $(OBJS)\corelib_icon.obj \ $(OBJS)\corelib_imaglist.obj \ @@ -3325,6 +3340,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_gdicmn.obj \ $(OBJS)\corelib_geometry.obj \ $(OBJS)\corelib_gifdecod.obj \ + $(OBJS)\corelib_graphcmn.obj \ $(OBJS)\corelib_helpbase.obj \ $(OBJS)\corelib_iconbndl.obj \ $(OBJS)\corelib_imagall.obj \ @@ -5501,6 +5517,11 @@ $(OBJS)\monodll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_graphics.obj: ..\..\src\msw\graphics.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -6091,6 +6112,11 @@ $(OBJS)\monodll_gifdecod.obj: ..\..\src\common\gifdecod.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_graphcmn.obj: ..\..\src\common\graphcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_helpbase.obj: ..\..\src\common\helpbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -7383,6 +7409,11 @@ $(OBJS)\monolib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_graphics.obj: ..\..\src\msw\graphics.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -7973,6 +8004,11 @@ $(OBJS)\monolib_gifdecod.obj: ..\..\src\common\gifdecod.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_graphcmn.obj: ..\..\src\common\graphcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_helpbase.obj: ..\..\src\common\helpbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -9292,6 +9328,11 @@ $(OBJS)\coredll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_graphics.obj: ..\..\src\msw\graphics.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -9882,6 +9923,11 @@ $(OBJS)\coredll_gifdecod.obj: ..\..\src\common\gifdecod.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_graphcmn.obj: ..\..\src\common\graphcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_helpbase.obj: ..\..\src\common\helpbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -10517,6 +10563,11 @@ $(OBJS)\corelib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_graphics.obj: ..\..\src\msw\graphics.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_gsockmsw.obj: ..\..\src\msw\gsockmsw.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** @@ -11107,6 +11158,11 @@ $(OBJS)\corelib_gifdecod.obj: ..\..\src\common\gifdecod.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_graphcmn.obj: ..\..\src\common\graphcmn.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_helpbase.obj: ..\..\src\common\helpbase.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index 960d94786d..518fc21b45 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -223,6 +223,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_fontutil.obj & $(OBJS)\monodll_gdiimage.obj & $(OBJS)\monodll_gdiobj.obj & + $(OBJS)\monodll_graphics.obj & $(OBJS)\monodll_gsockmsw.obj & $(OBJS)\monodll_icon.obj & $(OBJS)\monodll_imaglist.obj & @@ -338,6 +339,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_gdicmn.obj & $(OBJS)\monodll_geometry.obj & $(OBJS)\monodll_gifdecod.obj & + $(OBJS)\monodll_graphcmn.obj & $(OBJS)\monodll_helpbase.obj & $(OBJS)\monodll_iconbndl.obj & $(OBJS)\monodll_imagall.obj & @@ -437,6 +439,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_fontutil.obj & $(OBJS)\monodll_gdiimage.obj & $(OBJS)\monodll_gdiobj.obj & + $(OBJS)\monodll_graphics.obj & $(OBJS)\monodll_gsockmsw.obj & $(OBJS)\monodll_icon.obj & $(OBJS)\monodll_imaglist.obj & @@ -555,6 +558,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_gdicmn.obj & $(OBJS)\monodll_geometry.obj & $(OBJS)\monodll_gifdecod.obj & + $(OBJS)\monodll_graphcmn.obj & $(OBJS)\monodll_helpbase.obj & $(OBJS)\monodll_iconbndl.obj & $(OBJS)\monodll_imagall.obj & @@ -813,6 +817,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_fontutil.obj & $(OBJS)\monolib_gdiimage.obj & $(OBJS)\monolib_gdiobj.obj & + $(OBJS)\monolib_graphics.obj & $(OBJS)\monolib_gsockmsw.obj & $(OBJS)\monolib_icon.obj & $(OBJS)\monolib_imaglist.obj & @@ -928,6 +933,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_gdicmn.obj & $(OBJS)\monolib_geometry.obj & $(OBJS)\monolib_gifdecod.obj & + $(OBJS)\monolib_graphcmn.obj & $(OBJS)\monolib_helpbase.obj & $(OBJS)\monolib_iconbndl.obj & $(OBJS)\monolib_imagall.obj & @@ -1027,6 +1033,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_fontutil.obj & $(OBJS)\monolib_gdiimage.obj & $(OBJS)\monolib_gdiobj.obj & + $(OBJS)\monolib_graphics.obj & $(OBJS)\monolib_gsockmsw.obj & $(OBJS)\monolib_icon.obj & $(OBJS)\monolib_imaglist.obj & @@ -1145,6 +1152,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_gdicmn.obj & $(OBJS)\monolib_geometry.obj & $(OBJS)\monolib_gifdecod.obj & + $(OBJS)\monolib_graphcmn.obj & $(OBJS)\monolib_helpbase.obj & $(OBJS)\monolib_iconbndl.obj & $(OBJS)\monolib_imagall.obj & @@ -1332,6 +1340,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_fontutil.obj & $(OBJS)\coredll_gdiimage.obj & $(OBJS)\coredll_gdiobj.obj & + $(OBJS)\coredll_graphics.obj & $(OBJS)\coredll_gsockmsw.obj & $(OBJS)\coredll_icon.obj & $(OBJS)\coredll_imaglist.obj & @@ -1447,6 +1456,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_gdicmn.obj & $(OBJS)\coredll_geometry.obj & $(OBJS)\coredll_gifdecod.obj & + $(OBJS)\coredll_graphcmn.obj & $(OBJS)\coredll_helpbase.obj & $(OBJS)\coredll_iconbndl.obj & $(OBJS)\coredll_imagall.obj & @@ -1546,6 +1556,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_fontutil.obj & $(OBJS)\coredll_gdiimage.obj & $(OBJS)\coredll_gdiobj.obj & + $(OBJS)\coredll_graphics.obj & $(OBJS)\coredll_gsockmsw.obj & $(OBJS)\coredll_icon.obj & $(OBJS)\coredll_imaglist.obj & @@ -1664,6 +1675,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_gdicmn.obj & $(OBJS)\coredll_geometry.obj & $(OBJS)\coredll_gifdecod.obj & + $(OBJS)\coredll_graphcmn.obj & $(OBJS)\coredll_helpbase.obj & $(OBJS)\coredll_iconbndl.obj & $(OBJS)\coredll_imagall.obj & @@ -1773,6 +1785,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_fontutil.obj & $(OBJS)\corelib_gdiimage.obj & $(OBJS)\corelib_gdiobj.obj & + $(OBJS)\corelib_graphics.obj & $(OBJS)\corelib_gsockmsw.obj & $(OBJS)\corelib_icon.obj & $(OBJS)\corelib_imaglist.obj & @@ -1888,6 +1901,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_gdicmn.obj & $(OBJS)\corelib_geometry.obj & $(OBJS)\corelib_gifdecod.obj & + $(OBJS)\corelib_graphcmn.obj & $(OBJS)\corelib_helpbase.obj & $(OBJS)\corelib_iconbndl.obj & $(OBJS)\corelib_imagall.obj & @@ -1987,6 +2001,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_fontutil.obj & $(OBJS)\corelib_gdiimage.obj & $(OBJS)\corelib_gdiobj.obj & + $(OBJS)\corelib_graphics.obj & $(OBJS)\corelib_gsockmsw.obj & $(OBJS)\corelib_icon.obj & $(OBJS)\corelib_imaglist.obj & @@ -2105,6 +2120,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_gdicmn.obj & $(OBJS)\corelib_geometry.obj & $(OBJS)\corelib_gifdecod.obj & + $(OBJS)\corelib_graphcmn.obj & $(OBJS)\corelib_helpbase.obj & $(OBJS)\corelib_iconbndl.obj & $(OBJS)\corelib_imagall.obj & @@ -5505,6 +5521,11 @@ $(OBJS)\monodll_gdiobj.obj : .AUTODEPEND ..\..\src\msw\gdiobj.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_graphics.obj : .AUTODEPEND ..\..\src\msw\graphics.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_gsockmsw.obj : .AUTODEPEND ..\..\src\msw\gsockmsw.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6195,6 +6216,11 @@ $(OBJS)\monodll_gifdecod.obj : .AUTODEPEND ..\..\src\common\gifdecod.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_graphcmn.obj : .AUTODEPEND ..\..\src\common\graphcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_helpbase.obj : .AUTODEPEND ..\..\src\common\helpbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -7487,6 +7513,11 @@ $(OBJS)\monolib_gdiobj.obj : .AUTODEPEND ..\..\src\msw\gdiobj.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_graphics.obj : .AUTODEPEND ..\..\src\msw\graphics.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_gsockmsw.obj : .AUTODEPEND ..\..\src\msw\gsockmsw.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -8177,6 +8208,11 @@ $(OBJS)\monolib_gifdecod.obj : .AUTODEPEND ..\..\src\common\gifdecod.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_graphcmn.obj : .AUTODEPEND ..\..\src\common\graphcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_helpbase.obj : .AUTODEPEND ..\..\src\common\helpbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -9496,6 +9532,11 @@ $(OBJS)\coredll_gdiobj.obj : .AUTODEPEND ..\..\src\msw\gdiobj.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_graphics.obj : .AUTODEPEND ..\..\src\msw\graphics.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\coredll_gsockmsw.obj : .AUTODEPEND ..\..\src\msw\gsockmsw.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -10186,6 +10227,11 @@ $(OBJS)\coredll_gifdecod.obj : .AUTODEPEND ..\..\src\common\gifdecod.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_graphcmn.obj : .AUTODEPEND ..\..\src\common\graphcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\coredll_helpbase.obj : .AUTODEPEND ..\..\src\common\helpbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -10821,6 +10867,11 @@ $(OBJS)\corelib_gdiobj.obj : .AUTODEPEND ..\..\src\msw\gdiobj.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_graphics.obj : .AUTODEPEND ..\..\src\msw\graphics.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\corelib_gsockmsw.obj : .AUTODEPEND ..\..\src\msw\gsockmsw.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< @@ -11511,6 +11562,11 @@ $(OBJS)\corelib_gifdecod.obj : .AUTODEPEND ..\..\src\common\gifdecod.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_graphcmn.obj : .AUTODEPEND ..\..\src\common\graphcmn.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\corelib_helpbase.obj : .AUTODEPEND ..\..\src\common\helpbase.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index dd60b18a6c..9e5a047b8b 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -630,6 +630,10 @@ SOURCE=..\..\src\common\gifdecod.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\graphcmn.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\helpbase.cpp # End Source File # Begin Source File @@ -2115,6 +2119,10 @@ SOURCE=..\..\src\msw\gdiobj.cpp # End Source File # Begin Source File +SOURCE=..\..\src\msw\graphics.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\msw\gsockmsw.cpp # End Source File # Begin Source File @@ -8873,6 +8881,10 @@ SOURCE=..\..\include\wx\glcanvas.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\graphics.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\grid.h # End Source File # Begin Source File diff --git a/configure b/configure index bce7aa2c2c..f7e7b26977 100755 --- a/configure +++ b/configure @@ -1032,6 +1032,7 @@ Optional Features: --enable-logdialog use wxLogDialog --enable-webkit use wxWebKitCtrl (Mac) --enable-richtext use wxRichTextCtrl + --enable-graphics_ctx use graphics context 2D drawing API --enable-postscript use wxPostscriptDC device context (default for gtk+) --enable-prologio not available; see contrib --enable-resources not available; see contrib @@ -2322,6 +2323,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_FILEPICKERCTRL=no DEFAULT_wxUSE_FONTPICKERCTRL=no DEFAULT_wxUSE_GAUGE=no + DEFAULT_wxUSE_GRAPHICS_CONTEXT=no DEFAULT_wxUSE_GRID=no DEFAULT_wxUSE_HYPERLINKCTRL=no DEFAULT_wxUSE_DATAVIEWCTRL=no @@ -2537,6 +2539,7 @@ else DEFAULT_wxUSE_FONTPICKERCTRL=yes DEFAULT_wxUSE_GAUGE=yes DEFAULT_wxUSE_GRID=yes + DEFAULT_wxUSE_GRAPHICS_CONTEXT=no DEFAULT_wxUSE_HYPERLINKCTRL=yes DEFAULT_wxUSE_DATAVIEWCTRL=no DEFAULT_wxUSE_IMAGLIST=yes @@ -7464,6 +7467,47 @@ echo "${ECHO_T}no" >&6 fi + enablestring= + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-graphics_ctx" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-graphics_ctx... $ECHO_C" >&6 + no_cache=0 + # Check whether --enable-graphics_ctx or --disable-graphics_ctx was given. +if test "${enable_graphics_ctx+set}" = set; then + enableval="$enable_graphics_ctx" + + if test "$enableval" = yes; then + ac_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=yes' + else + ac_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=no' + fi + +else + + LINE=`grep "wxUSE_GRAPHICS_CONTEXT" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT='$DEFAULT_wxUSE_GRAPHICS_CONTEXT + +fi; + + eval "$ac_cv_use_graphics_ctx" + if test "$no_cache" != 1; then + echo $ac_cv_use_graphics_ctx >> ${wx_arg_cache_file}.tmp + fi + + if test "$wxUSE_GRAPHICS_CONTEXT" = yes; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + fi + + enablestring= echo "$as_me:$LINENO: checking for --${enablestring:-enable}-postscript" >&5 @@ -44891,6 +44935,14 @@ rm -f conftest.err conftest.$ac_objext conftest.$ac_ext if test "$wxUSE_OLE" = "yes" ; then cat >>confdefs.h <<\_ACEOF #define wxUSE_OLE 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define wxUSE_OLE_AUTOMATION 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define wxUSE_OLE_ACTIVEX 1 _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS oleauto" @@ -45760,6 +45812,13 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS richtext" fi +if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_GRAPHICS_CONTEXT 1 +_ACEOF + +fi + if test "$wxUSE_IMAGE" = "yes" ; then cat >>confdefs.h <<\_ACEOF diff --git a/configure.in b/configure.in index c1d3cddfbf..4b4efc1eb6 100644 --- a/configure.in +++ b/configure.in @@ -527,6 +527,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_FILEPICKERCTRL=no DEFAULT_wxUSE_FONTPICKERCTRL=no DEFAULT_wxUSE_GAUGE=no + DEFAULT_wxUSE_GRAPHICS_CONTEXT=no DEFAULT_wxUSE_GRID=no DEFAULT_wxUSE_HYPERLINKCTRL=no DEFAULT_wxUSE_DATAVIEWCTRL=no @@ -742,6 +743,7 @@ else DEFAULT_wxUSE_FONTPICKERCTRL=yes DEFAULT_wxUSE_GAUGE=yes DEFAULT_wxUSE_GRID=yes + DEFAULT_wxUSE_GRAPHICS_CONTEXT=no DEFAULT_wxUSE_HYPERLINKCTRL=yes DEFAULT_wxUSE_DATAVIEWCTRL=no DEFAULT_wxUSE_IMAGLIST=yes @@ -1011,6 +1013,7 @@ WX_ARG_ENABLE(logwin, [ --enable-logwin use wxLogWindow], wxUSE_LO WX_ARG_ENABLE(logdialog, [ --enable-logdialog use wxLogDialog], wxUSE_LOGDIALOG) WX_ARG_ENABLE(webkit, [ --enable-webkit use wxWebKitCtrl (Mac)], wxUSE_WEBKIT) WX_ARG_ENABLE(html, [ --enable-richtext use wxRichTextCtrl], wxUSE_RICHTEXT) +WX_ARG_ENABLE(graphics_ctx, [ --enable-graphics_ctx use graphics context 2D drawing API], wxUSE_GRAPHICS_CONTEXT) dnl --------------------------------------------------------------------------- dnl PostScript options @@ -6909,6 +6912,10 @@ if test "$wxUSE_RICHTEXT" = "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS richtext" fi +if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then + AC_DEFINE(wxUSE_GRAPHICS_CONTEXT) +fi + dnl --------------------------------------------------------------------------- dnl wxImage options dnl --------------------------------------------------------------------------- diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h index 9642a39b8e..a7038ab7e2 100644 --- a/include/wx/chkconf.h +++ b/include/wx/chkconf.h @@ -536,6 +536,15 @@ # endif #endif /* !defined(wxUSE_GAUGE) */ +#ifndef wxUSE_GRAPHICS_CONTEXT +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_GRAPHICS_CONTEXT must be defined." +# else +# define wxUSE_GRAPHICS_CONTEXT 0 +# endif +#endif /* !defined(wxUSE_GRAPHICS_CONTEXT) */ + + #ifndef wxUSE_GRID # ifdef wxABORT_ON_CONFIG_ERROR # error "wxUSE_GRID must be defined." @@ -1246,6 +1255,16 @@ # endif #endif +#if wxUSE_GRAPHICS_CONTEXT && !wxUSE_GEOMETRY +# ifdef wxABORT_ON_CONFIG_ERROR +# error "wxUSE_GRAPHICS_CONTEXT requires wxUSE_GEOMETRY" +# else +# undef wxUSE_GRAPHICS_CONTEXT +# define wxUSE_GRAPHICS_CONTEXT 0 +# endif +#endif /* wxUSE_GRAPHICS_CONTEXT */ + + /* wxGTK-specific dependencies */ #ifdef __WXGTK__ # ifndef __WXUNIVERSAL__ diff --git a/include/wx/graphics.h b/include/wx/graphics.h index 9f4abde1ad..21fc47f1c9 100755 --- a/include/wx/graphics.h +++ b/include/wx/graphics.h @@ -12,14 +12,6 @@ #ifndef _WX_GRAPHICS_H_ #define _WX_GRAPHICS_H_ -#if wxMAC_USE_CORE_GRAPHICS -#undef wxUSE_GRAPHICS_CONTEXT -#define wxUSE_GRAPHICS_CONTEXT 1 -#endif - -#ifndef wxUSE_GRAPHICS_CONTEXT -#define wxUSE_GRAPHICS_CONTEXT 0 -#endif #if wxUSE_GRAPHICS_CONTEXT diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h index b43eaf53cd..6c8370a4de 100644 --- a/include/wx/mac/setup0.h +++ b/include/wx/mac/setup0.h @@ -549,6 +549,15 @@ // Recommended setting: 1 #define wxUSE_AUI 1 + +// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced +// 2D drawing API. (Still somewhat experimental) +// +// Default is 0 +// +// Recommended setting: 1 +#define wxUSE_GRAPHICS_CONTEXT 0 + // ---------------------------------------------------------------------------- // Individual GUI controls // ---------------------------------------------------------------------------- diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h index b83e5dde1e..315daf2dc2 100644 --- a/include/wx/motif/setup0.h +++ b/include/wx/motif/setup0.h @@ -548,6 +548,15 @@ // Recommended setting: 1 #define wxUSE_AUI 1 + +// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced +// 2D drawing API. (Still somewhat experimental) +// +// Default is 0 +// +// Recommended setting: 1 +#define wxUSE_GRAPHICS_CONTEXT 0 + // ---------------------------------------------------------------------------- // Individual GUI controls // ---------------------------------------------------------------------------- diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index 18c02c696d..b37dac80df 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -548,6 +548,15 @@ // Recommended setting: 1 #define wxUSE_AUI 1 + +// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced +// 2D drawing API. (Still somewhat experimental) +// +// Default is 0 +// +// Recommended setting: 1 +#define wxUSE_GRAPHICS_CONTEXT 0 + // ---------------------------------------------------------------------------- // Individual GUI controls // ---------------------------------------------------------------------------- diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h index 9ce9270e99..cadc00ada2 100644 --- a/include/wx/msw/wince/setup.h +++ b/include/wx/msw/wince/setup.h @@ -548,6 +548,15 @@ // Recommended setting: 1 #define wxUSE_AUI 1 + +// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced +// 2D drawing API. (Still somewhat experimental) +// +// Default is 0 +// +// Recommended setting: 1 +#define wxUSE_GRAPHICS_CONTEXT 0 + // ---------------------------------------------------------------------------- // Individual GUI controls // ---------------------------------------------------------------------------- diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h index 97b4256a8b..26d0a9c84e 100644 --- a/include/wx/os2/setup0.h +++ b/include/wx/os2/setup0.h @@ -548,6 +548,15 @@ // Recommended setting: 1 #define wxUSE_AUI 1 + +// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced +// 2D drawing API. (Still somewhat experimental) +// +// Default is 0 +// +// Recommended setting: 1 +#define wxUSE_GRAPHICS_CONTEXT 0 + // ---------------------------------------------------------------------------- // Individual GUI controls // ---------------------------------------------------------------------------- diff --git a/include/wx/palmos/setup0.h b/include/wx/palmos/setup0.h index c42e08e02f..9c48db9f73 100644 --- a/include/wx/palmos/setup0.h +++ b/include/wx/palmos/setup0.h @@ -548,6 +548,15 @@ // Recommended setting: 1 #define wxUSE_AUI 1 + +// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced +// 2D drawing API. (Still somewhat experimental) +// +// Default is 0 +// +// Recommended setting: 1 +#define wxUSE_GRAPHICS_CONTEXT 0 + // ---------------------------------------------------------------------------- // Individual GUI controls // ---------------------------------------------------------------------------- diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h index 62cc2a6a01..f8d4204416 100644 --- a/include/wx/setup_inc.h +++ b/include/wx/setup_inc.h @@ -544,6 +544,15 @@ // Recommended setting: 1 #define wxUSE_AUI 1 + +// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced +// 2D drawing API. (Still somewhat experimental) +// +// Default is 0 +// +// Recommended setting: 1 +#define wxUSE_GRAPHICS_CONTEXT 0 + // ---------------------------------------------------------------------------- // Individual GUI controls // ---------------------------------------------------------------------------- diff --git a/setup.h.in b/setup.h.in index 3195952c78..b8dc454d47 100644 --- a/setup.h.in +++ b/setup.h.in @@ -294,6 +294,9 @@ #define wxUSE_AUI 0 +#define wxUSE_GRAPHICS_CONTEXT 0 + + #define wxUSE_CONTROLS 0 #define wxUSE_POPUPWIN 0 diff --git a/src/mac/carbon/graphics.cpp b/src/mac/carbon/graphics.cpp index f219c1edc9..63a716c19b 100755 --- a/src/mac/carbon/graphics.cpp +++ b/src/mac/carbon/graphics.cpp @@ -13,7 +13,7 @@ #include "wx/graphics.h" -#if wxMAC_USE_CORE_GRAPHICS +#if wxUSE_GRAPHICS_CONTEXT && wxMAC_USE_CORE_GRAPHICS #ifndef WX_PRECOMP #include "wx/log.h" diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp index 2944fe52f1..96b0731e2e 100644 --- a/src/wxWindows.dsp +++ b/src/wxWindows.dsp @@ -591,6 +591,10 @@ SOURCE=.\common\gifdecod.cpp # End Source File # Begin Source File +SOURCE=.\common\graphcmn.cpp +# End Source File +# Begin Source File + SOURCE=.\common\hash.cpp # End Source File # Begin Source File @@ -1447,6 +1451,10 @@ SOURCE=.\msw\glcanvas.cpp # End Source File # Begin Source File +SOURCE=.\msw\graphics.cpp +# End Source File +# Begin Source File + SOURCE=.\msw\gsocket.cpp # End Source File # Begin Source File @@ -2611,6 +2619,10 @@ SOURCE=..\include\wx\glcanvas.h # End Source File # Begin Source File +SOURCE=..\include\wx\graphics.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\grid.h # End Source File # Begin Source File -- 2.45.2