From e642beb2b9dee1753aaa3198255beef2ab89dda5 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 26 Oct 2006 09:51:13 +0000 Subject: [PATCH] Added dcgraph.cpp and rebaked git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 20 ++++++++++++++++++++ build/bakefiles/files.bkl | 1 + build/msw/makefile.bcc | 28 ++++++++++++++++++++++++++++ build/msw/makefile.gcc | 28 ++++++++++++++++++++++++++++ build/msw/makefile.vc | 28 ++++++++++++++++++++++++++++ build/msw/makefile.wat | 28 ++++++++++++++++++++++++++++ build/msw/wx_core.dsp | 4 ++++ src/wxWindows.dsp | 4 ++++ 8 files changed, 141 insertions(+) diff --git a/Makefile.in b/Makefile.in index 59da9588b0..0a1823d033 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3400,6 +3400,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS = \ monodll_datacmn.o \ monodll_dcbase.o \ monodll_dcbufcmn.o \ + monodll_dcgraph.o \ monodll_dlgcmn.o \ monodll_dndcmn.o \ monodll_dobjcmn.o \ @@ -3570,6 +3571,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS = \ monodll_datacmn.o \ monodll_dcbase.o \ monodll_dcbufcmn.o \ + monodll_dcgraph.o \ monodll_dlgcmn.o \ monodll_dndcmn.o \ monodll_dobjcmn.o \ @@ -5149,6 +5151,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 = \ monolib_datacmn.o \ monolib_dcbase.o \ monolib_dcbufcmn.o \ + monolib_dcgraph.o \ monolib_dlgcmn.o \ monolib_dndcmn.o \ monolib_dobjcmn.o \ @@ -5319,6 +5322,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 = \ monolib_datacmn.o \ monolib_dcbase.o \ monolib_dcbufcmn.o \ + monolib_dcgraph.o \ monolib_dlgcmn.o \ monolib_dndcmn.o \ monolib_dobjcmn.o \ @@ -7111,6 +7115,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 = \ coredll_datacmn.o \ coredll_dcbase.o \ coredll_dcbufcmn.o \ + coredll_dcgraph.o \ coredll_dlgcmn.o \ coredll_dndcmn.o \ coredll_dobjcmn.o \ @@ -7281,6 +7286,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 = \ coredll_datacmn.o \ coredll_dcbase.o \ coredll_dcbufcmn.o \ + coredll_dcgraph.o \ coredll_dlgcmn.o \ coredll_dndcmn.o \ coredll_dobjcmn.o \ @@ -8543,6 +8549,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 = \ corelib_datacmn.o \ corelib_dcbase.o \ corelib_dcbufcmn.o \ + corelib_dcgraph.o \ corelib_dlgcmn.o \ corelib_dndcmn.o \ corelib_dobjcmn.o \ @@ -8713,6 +8720,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 = \ corelib_datacmn.o \ corelib_dcbase.o \ corelib_dcbufcmn.o \ + corelib_dcgraph.o \ corelib_dlgcmn.o \ corelib_dndcmn.o \ corelib_dobjcmn.o \ @@ -15662,6 +15670,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_dcbufcmn.o: $(srcdir)/src/common/dcbufcmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dcbufcmn.cpp +@COND_USE_GUI_1@monodll_dcgraph.o: $(srcdir)/src/common/dcgraph.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dcgraph.cpp + @COND_USE_GUI_1@monodll_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/dlgcmn.cpp @@ -19736,6 +19747,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_dcbufcmn.o: $(srcdir)/src/common/dcbufcmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dcbufcmn.cpp +@COND_USE_GUI_1@monolib_dcgraph.o: $(srcdir)/src/common/dcgraph.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dcgraph.cpp + @COND_USE_GUI_1@monolib_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/dlgcmn.cpp @@ -24149,6 +24163,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@coredll_dcbufcmn.o: $(srcdir)/src/common/dcbufcmn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dcbufcmn.cpp +@COND_USE_GUI_1@coredll_dcgraph.o: $(srcdir)/src/common/dcgraph.cpp $(COREDLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dcgraph.cpp + @COND_USE_GUI_1@coredll_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp $(COREDLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/dlgcmn.cpp @@ -27068,6 +27085,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@corelib_dcbufcmn.o: $(srcdir)/src/common/dcbufcmn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/dcbufcmn.cpp +@COND_USE_GUI_1@corelib_dcgraph.o: $(srcdir)/src/common/dcgraph.cpp $(CORELIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/dcgraph.cpp + @COND_USE_GUI_1@corelib_dlgcmn.o: $(srcdir)/src/common/dlgcmn.cpp $(CORELIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/dlgcmn.cpp diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 763cb4b06f..dd8ea9eaee 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -575,6 +575,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/common/datacmn.cpp src/common/dcbase.cpp src/common/dcbufcmn.cpp + src/common/dcgraph.cpp src/common/dlgcmn.cpp src/common/dndcmn.cpp src/common/dobjcmn.cpp diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index cfd5cdb293..dce8a825f8 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -1410,6 +1410,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_datacmn.obj \ $(OBJS)\monodll_dcbase.obj \ $(OBJS)\monodll_dcbufcmn.obj \ + $(OBJS)\monodll_dcgraph.obj \ $(OBJS)\monodll_dlgcmn.obj \ $(OBJS)\monodll_dndcmn.obj \ $(OBJS)\monodll_dobjcmn.obj \ @@ -1630,6 +1631,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_datacmn.obj \ $(OBJS)\monodll_dcbase.obj \ $(OBJS)\monodll_dcbufcmn.obj \ + $(OBJS)\monodll_dcgraph.obj \ $(OBJS)\monodll_dlgcmn.obj \ $(OBJS)\monodll_dndcmn.obj \ $(OBJS)\monodll_dobjcmn.obj \ @@ -2015,6 +2017,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_datacmn.obj \ $(OBJS)\monolib_dcbase.obj \ $(OBJS)\monolib_dcbufcmn.obj \ + $(OBJS)\monolib_dcgraph.obj \ $(OBJS)\monolib_dlgcmn.obj \ $(OBJS)\monolib_dndcmn.obj \ $(OBJS)\monolib_dobjcmn.obj \ @@ -2235,6 +2238,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_datacmn.obj \ $(OBJS)\monolib_dcbase.obj \ $(OBJS)\monolib_dcbufcmn.obj \ + $(OBJS)\monolib_dcgraph.obj \ $(OBJS)\monolib_dlgcmn.obj \ $(OBJS)\monolib_dndcmn.obj \ $(OBJS)\monolib_dobjcmn.obj \ @@ -2531,6 +2535,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_datacmn.obj \ $(OBJS)\coredll_dcbase.obj \ $(OBJS)\coredll_dcbufcmn.obj \ + $(OBJS)\coredll_dcgraph.obj \ $(OBJS)\coredll_dlgcmn.obj \ $(OBJS)\coredll_dndcmn.obj \ $(OBJS)\coredll_dobjcmn.obj \ @@ -2751,6 +2756,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_datacmn.obj \ $(OBJS)\coredll_dcbase.obj \ $(OBJS)\coredll_dcbufcmn.obj \ + $(OBJS)\coredll_dcgraph.obj \ $(OBJS)\coredll_dlgcmn.obj \ $(OBJS)\coredll_dndcmn.obj \ $(OBJS)\coredll_dobjcmn.obj \ @@ -2972,6 +2978,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_datacmn.obj \ $(OBJS)\corelib_dcbase.obj \ $(OBJS)\corelib_dcbufcmn.obj \ + $(OBJS)\corelib_dcgraph.obj \ $(OBJS)\corelib_dlgcmn.obj \ $(OBJS)\corelib_dndcmn.obj \ $(OBJS)\corelib_dobjcmn.obj \ @@ -3192,6 +3199,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_datacmn.obj \ $(OBJS)\corelib_dcbase.obj \ $(OBJS)\corelib_dcbufcmn.obj \ + $(OBJS)\corelib_dcgraph.obj \ $(OBJS)\corelib_dlgcmn.obj \ $(OBJS)\corelib_dndcmn.obj \ $(OBJS)\corelib_dobjcmn.obj \ @@ -5817,6 +5825,11 @@ $(OBJS)\monodll_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_dcgraph.obj: ..\..\src\common\dcgraph.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -7773,6 +7786,11 @@ $(OBJS)\monolib_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_dcgraph.obj: ..\..\src\common\dcgraph.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -9750,6 +9768,11 @@ $(OBJS)\coredll_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_dcgraph.obj: ..\..\src\common\dcgraph.cpp + $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $** @@ -11000,6 +11023,11 @@ $(OBJS)\corelib_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_dcgraph.obj: ..\..\src\common\dcgraph.cpp + $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $** diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 2c33ab44ff..95bcb4d2ed 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -1420,6 +1420,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_datacmn.o \ $(OBJS)\monodll_dcbase.o \ $(OBJS)\monodll_dcbufcmn.o \ + $(OBJS)\monodll_dcgraph.o \ $(OBJS)\monodll_dlgcmn.o \ $(OBJS)\monodll_dndcmn.o \ $(OBJS)\monodll_dobjcmn.o \ @@ -1642,6 +1643,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_datacmn.o \ $(OBJS)\monodll_dcbase.o \ $(OBJS)\monodll_dcbufcmn.o \ + $(OBJS)\monodll_dcgraph.o \ $(OBJS)\monodll_dlgcmn.o \ $(OBJS)\monodll_dndcmn.o \ $(OBJS)\monodll_dobjcmn.o \ @@ -2031,6 +2033,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_datacmn.o \ $(OBJS)\monolib_dcbase.o \ $(OBJS)\monolib_dcbufcmn.o \ + $(OBJS)\monolib_dcgraph.o \ $(OBJS)\monolib_dlgcmn.o \ $(OBJS)\monolib_dndcmn.o \ $(OBJS)\monolib_dobjcmn.o \ @@ -2253,6 +2256,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_datacmn.o \ $(OBJS)\monolib_dcbase.o \ $(OBJS)\monolib_dcbufcmn.o \ + $(OBJS)\monolib_dcgraph.o \ $(OBJS)\monolib_dlgcmn.o \ $(OBJS)\monolib_dndcmn.o \ $(OBJS)\monolib_dobjcmn.o \ @@ -2563,6 +2567,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_datacmn.o \ $(OBJS)\coredll_dcbase.o \ $(OBJS)\coredll_dcbufcmn.o \ + $(OBJS)\coredll_dcgraph.o \ $(OBJS)\coredll_dlgcmn.o \ $(OBJS)\coredll_dndcmn.o \ $(OBJS)\coredll_dobjcmn.o \ @@ -2785,6 +2790,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_datacmn.o \ $(OBJS)\coredll_dcbase.o \ $(OBJS)\coredll_dcbufcmn.o \ + $(OBJS)\coredll_dcgraph.o \ $(OBJS)\coredll_dlgcmn.o \ $(OBJS)\coredll_dndcmn.o \ $(OBJS)\coredll_dobjcmn.o \ @@ -3012,6 +3018,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_datacmn.o \ $(OBJS)\corelib_dcbase.o \ $(OBJS)\corelib_dcbufcmn.o \ + $(OBJS)\corelib_dcgraph.o \ $(OBJS)\corelib_dlgcmn.o \ $(OBJS)\corelib_dndcmn.o \ $(OBJS)\corelib_dobjcmn.o \ @@ -3234,6 +3241,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_datacmn.o \ $(OBJS)\corelib_dcbase.o \ $(OBJS)\corelib_dcbufcmn.o \ + $(OBJS)\corelib_dcgraph.o \ $(OBJS)\corelib_dlgcmn.o \ $(OBJS)\corelib_dndcmn.o \ $(OBJS)\corelib_dobjcmn.o \ @@ -6034,6 +6042,11 @@ $(OBJS)\monodll_dcbufcmn.o: ../../src/common/dcbufcmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_dcgraph.o: ../../src/common/dcgraph.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_dlgcmn.o: ../../src/common/dlgcmn.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -8090,6 +8103,11 @@ $(OBJS)\monolib_dcbufcmn.o: ../../src/common/dcbufcmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_dcgraph.o: ../../src/common/dcgraph.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_dlgcmn.o: ../../src/common/dlgcmn.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -10167,6 +10185,11 @@ $(OBJS)\coredll_dcbufcmn.o: ../../src/common/dcbufcmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\coredll_dcgraph.o: ../../src/common/dcgraph.cpp + $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\coredll_dlgcmn.o: ../../src/common/dlgcmn.cpp $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< @@ -11517,6 +11540,11 @@ $(OBJS)\corelib_dcbufcmn.o: ../../src/common/dcbufcmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\corelib_dcgraph.o: ../../src/common/dcgraph.cpp + $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\corelib_dlgcmn.o: ../../src/common/dlgcmn.cpp $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 17b6295b4b..3fa5e7e400 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -1577,6 +1577,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_datacmn.obj \ $(OBJS)\monodll_dcbase.obj \ $(OBJS)\monodll_dcbufcmn.obj \ + $(OBJS)\monodll_dcgraph.obj \ $(OBJS)\monodll_dlgcmn.obj \ $(OBJS)\monodll_dndcmn.obj \ $(OBJS)\monodll_dobjcmn.obj \ @@ -1797,6 +1798,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_datacmn.obj \ $(OBJS)\monodll_dcbase.obj \ $(OBJS)\monodll_dcbufcmn.obj \ + $(OBJS)\monodll_dcgraph.obj \ $(OBJS)\monodll_dlgcmn.obj \ $(OBJS)\monodll_dndcmn.obj \ $(OBJS)\monodll_dobjcmn.obj \ @@ -2188,6 +2190,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_datacmn.obj \ $(OBJS)\monolib_dcbase.obj \ $(OBJS)\monolib_dcbufcmn.obj \ + $(OBJS)\monolib_dcgraph.obj \ $(OBJS)\monolib_dlgcmn.obj \ $(OBJS)\monolib_dndcmn.obj \ $(OBJS)\monolib_dobjcmn.obj \ @@ -2408,6 +2411,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_datacmn.obj \ $(OBJS)\monolib_dcbase.obj \ $(OBJS)\monolib_dcbufcmn.obj \ + $(OBJS)\monolib_dcgraph.obj \ $(OBJS)\monolib_dlgcmn.obj \ $(OBJS)\monolib_dndcmn.obj \ $(OBJS)\monolib_dobjcmn.obj \ @@ -2734,6 +2738,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_datacmn.obj \ $(OBJS)\coredll_dcbase.obj \ $(OBJS)\coredll_dcbufcmn.obj \ + $(OBJS)\coredll_dcgraph.obj \ $(OBJS)\coredll_dlgcmn.obj \ $(OBJS)\coredll_dndcmn.obj \ $(OBJS)\coredll_dobjcmn.obj \ @@ -2954,6 +2959,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\coredll_datacmn.obj \ $(OBJS)\coredll_dcbase.obj \ $(OBJS)\coredll_dcbufcmn.obj \ + $(OBJS)\coredll_dcgraph.obj \ $(OBJS)\coredll_dlgcmn.obj \ $(OBJS)\coredll_dndcmn.obj \ $(OBJS)\coredll_dobjcmn.obj \ @@ -3181,6 +3187,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_datacmn.obj \ $(OBJS)\corelib_dcbase.obj \ $(OBJS)\corelib_dcbufcmn.obj \ + $(OBJS)\corelib_dcgraph.obj \ $(OBJS)\corelib_dlgcmn.obj \ $(OBJS)\corelib_dndcmn.obj \ $(OBJS)\corelib_dobjcmn.obj \ @@ -3401,6 +3408,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\corelib_datacmn.obj \ $(OBJS)\corelib_dcbase.obj \ $(OBJS)\corelib_dcbufcmn.obj \ + $(OBJS)\corelib_dcgraph.obj \ $(OBJS)\corelib_dlgcmn.obj \ $(OBJS)\corelib_dndcmn.obj \ $(OBJS)\corelib_dobjcmn.obj \ @@ -6150,6 +6158,11 @@ $(OBJS)\monodll_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_dcgraph.obj: ..\..\src\common\dcgraph.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -8106,6 +8119,11 @@ $(OBJS)\monolib_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_dcgraph.obj: ..\..\src\common\dcgraph.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -10083,6 +10101,11 @@ $(OBJS)\coredll_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\coredll_dcgraph.obj: ..\..\src\common\dcgraph.cpp + $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\coredll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $** @@ -11333,6 +11356,11 @@ $(OBJS)\corelib_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\corelib_dcgraph.obj: ..\..\src\common\dcgraph.cpp + $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\corelib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $** diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index 16fcfcd992..80a8b57f80 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -324,6 +324,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_datacmn.obj & $(OBJS)\monodll_dcbase.obj & $(OBJS)\monodll_dcbufcmn.obj & + $(OBJS)\monodll_dcgraph.obj & $(OBJS)\monodll_dlgcmn.obj & $(OBJS)\monodll_dndcmn.obj & $(OBJS)\monodll_dobjcmn.obj & @@ -546,6 +547,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_datacmn.obj & $(OBJS)\monodll_dcbase.obj & $(OBJS)\monodll_dcbufcmn.obj & + $(OBJS)\monodll_dcgraph.obj & $(OBJS)\monodll_dlgcmn.obj & $(OBJS)\monodll_dndcmn.obj & $(OBJS)\monodll_dobjcmn.obj & @@ -939,6 +941,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_datacmn.obj & $(OBJS)\monolib_dcbase.obj & $(OBJS)\monolib_dcbufcmn.obj & + $(OBJS)\monolib_dcgraph.obj & $(OBJS)\monolib_dlgcmn.obj & $(OBJS)\monolib_dndcmn.obj & $(OBJS)\monolib_dobjcmn.obj & @@ -1161,6 +1164,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_datacmn.obj & $(OBJS)\monolib_dcbase.obj & $(OBJS)\monolib_dcbufcmn.obj & + $(OBJS)\monolib_dcgraph.obj & $(OBJS)\monolib_dlgcmn.obj & $(OBJS)\monolib_dndcmn.obj & $(OBJS)\monolib_dobjcmn.obj & @@ -1478,6 +1482,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_datacmn.obj & $(OBJS)\coredll_dcbase.obj & $(OBJS)\coredll_dcbufcmn.obj & + $(OBJS)\coredll_dcgraph.obj & $(OBJS)\coredll_dlgcmn.obj & $(OBJS)\coredll_dndcmn.obj & $(OBJS)\coredll_dobjcmn.obj & @@ -1700,6 +1705,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\coredll_datacmn.obj & $(OBJS)\coredll_dcbase.obj & $(OBJS)\coredll_dcbufcmn.obj & + $(OBJS)\coredll_dcgraph.obj & $(OBJS)\coredll_dlgcmn.obj & $(OBJS)\coredll_dndcmn.obj & $(OBJS)\coredll_dobjcmn.obj & @@ -1929,6 +1935,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_datacmn.obj & $(OBJS)\corelib_dcbase.obj & $(OBJS)\corelib_dcbufcmn.obj & + $(OBJS)\corelib_dcgraph.obj & $(OBJS)\corelib_dlgcmn.obj & $(OBJS)\corelib_dndcmn.obj & $(OBJS)\corelib_dobjcmn.obj & @@ -2151,6 +2158,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\corelib_datacmn.obj & $(OBJS)\corelib_dcbase.obj & $(OBJS)\corelib_dcbufcmn.obj & + $(OBJS)\corelib_dcgraph.obj & $(OBJS)\corelib_dlgcmn.obj & $(OBJS)\corelib_dndcmn.obj & $(OBJS)\corelib_dobjcmn.obj & @@ -6262,6 +6270,11 @@ $(OBJS)\monodll_dcbufcmn.obj : .AUTODEPEND ..\..\src\common\dcbufcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_dcgraph.obj : .AUTODEPEND ..\..\src\common\dcgraph.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_dlgcmn.obj : .AUTODEPEND ..\..\src\common\dlgcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -8318,6 +8331,11 @@ $(OBJS)\monolib_dcbufcmn.obj : .AUTODEPEND ..\..\src\common\dcbufcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_dcgraph.obj : .AUTODEPEND ..\..\src\common\dcgraph.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_dlgcmn.obj : .AUTODEPEND ..\..\src\common\dlgcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -10395,6 +10413,11 @@ $(OBJS)\coredll_dcbufcmn.obj : .AUTODEPEND ..\..\src\common\dcbufcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\coredll_dcgraph.obj : .AUTODEPEND ..\..\src\common\dcgraph.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\coredll_dlgcmn.obj : .AUTODEPEND ..\..\src\common\dlgcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< @@ -11745,6 +11768,11 @@ $(OBJS)\corelib_dcbufcmn.obj : .AUTODEPEND ..\..\src\common\dcbufcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\corelib_dcgraph.obj : .AUTODEPEND ..\..\src\common\dcgraph.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\corelib_dlgcmn.obj : .AUTODEPEND ..\..\src\common\dlgcmn.cpp $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index f7955efeea..5501a7abae 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -536,6 +536,10 @@ SOURCE=..\..\src\common\dcbufcmn.cpp # End Source File # Begin Source File +SOURCE=..\..\src\common\dcgraph.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\common\dlgcmn.cpp # End Source File # Begin Source File diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp index 27e5643fc7..f43dd0eba9 100644 --- a/src/wxWindows.dsp +++ b/src/wxWindows.dsp @@ -433,6 +433,10 @@ SOURCE=.\common\dcbufcmn.cpp # End Source File # Begin Source File +SOURCE=.\common\dcgraph.cpp +# End Source File +# Begin Source File + SOURCE=.\common\debugrpt.cpp # End Source File # Begin Source File -- 2.45.2