From: Robin Dunn Date: Mon, 29 May 2006 19:16:15 +0000 (+0000) Subject: rebake for *hyperlink.* files X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9e89f049b8d6ecd97ed5505de9c68c511166d617 rebake for *hyperlink.* files git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/Makefile.in b/Makefile.in index b1d7648ed6..41d9f3c0a8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1269,6 +1269,7 @@ XRCDLL_OBJECTS = \ xrcdll_xh_gdctl.o \ xrcdll_xh_grid.o \ xrcdll_xh_html.o \ + xrcdll_xh_hyperlink.o \ xrcdll_xh_listb.o \ xrcdll_xh_listbk.o \ xrcdll_xh_listc.o \ @@ -1320,6 +1321,7 @@ XRCLIB_OBJECTS = \ xrclib_xh_gdctl.o \ xrclib_xh_grid.o \ xrclib_xh_html.o \ + xrclib_xh_hyperlink.o \ xrclib_xh_listb.o \ xrclib_xh_listbk.o \ xrclib_xh_listc.o \ @@ -2497,6 +2499,7 @@ COND_WXUNIV_0_ADVANCED_HDR = \ wx/generic/splash.h \ wx/generic/wizard.h \ wx/grid.h \ + wx/hyperlink.h \ wx/joystick.h \ wx/laywin.h \ wx/odcombo.h \ @@ -2535,6 +2538,7 @@ COND_WXUNIV_1_ADVANCED_HDR = \ wx/generic/splash.h \ wx/generic/wizard.h \ wx/grid.h \ + wx/hyperlink.h \ wx/joystick.h \ wx/laywin.h \ wx/odcombo.h \ @@ -2830,6 +2834,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \ wx/xrc/xh_gdctl.h \ wx/xrc/xh_grid.h \ wx/xrc/xh_html.h \ + wx/xrc/xh_hyperlink.h \ wx/xrc/xh_listb.h \ wx/xrc/xh_listbk.h \ wx/xrc/xh_listc.h \ @@ -3112,6 +3117,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \ monodll_xh_gdctl.o \ monodll_xh_grid.o \ monodll_xh_html.o \ + monodll_xh_hyperlink.o \ monodll_xh_listb.o \ monodll_xh_listbk.o \ monodll_xh_listc.o \ @@ -4472,6 +4478,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS = \ monodll_gridctrl.o \ monodll_gridsel.o \ monodll_helpext.o \ + monodll_hyperlink.o \ monodll_laywin.o \ monodll_odcombo.o \ monodll_propdlg.o \ @@ -4496,6 +4503,7 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS = \ monodll_gridctrl.o \ monodll_gridsel.o \ monodll_helpext.o \ + monodll_hyperlink.o \ monodll_laywin.o \ monodll_odcombo.o \ monodll_propdlg.o \ @@ -4750,6 +4758,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \ monolib_xh_gdctl.o \ monolib_xh_grid.o \ monolib_xh_html.o \ + monolib_xh_hyperlink.o \ monolib_xh_listb.o \ monolib_xh_listbk.o \ monolib_xh_listc.o \ @@ -6112,6 +6121,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_1 = \ monolib_gridctrl.o \ monolib_gridsel.o \ monolib_helpext.o \ + monolib_hyperlink.o \ monolib_laywin.o \ monolib_odcombo.o \ monolib_propdlg.o \ @@ -6136,6 +6146,7 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_1 = \ monolib_gridctrl.o \ monolib_gridsel.o \ monolib_helpext.o \ + monolib_hyperlink.o \ monolib_laywin.o \ monolib_odcombo.o \ monolib_propdlg.o \ @@ -9374,6 +9385,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_2 = \ advdll_gridctrl.o \ advdll_gridsel.o \ advdll_helpext.o \ + advdll_hyperlink.o \ advdll_laywin.o \ advdll_odcombo.o \ advdll_propdlg.o \ @@ -9398,6 +9410,7 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_2 = \ advdll_gridctrl.o \ advdll_gridsel.o \ advdll_helpext.o \ + advdll_hyperlink.o \ advdll_laywin.o \ advdll_odcombo.o \ advdll_propdlg.o \ @@ -9437,6 +9450,7 @@ COND_WXUNIV_0___ADVANCED_SRC_OBJECTS_3 = \ advlib_gridctrl.o \ advlib_gridsel.o \ advlib_helpext.o \ + advlib_hyperlink.o \ advlib_laywin.o \ advlib_odcombo.o \ advlib_propdlg.o \ @@ -9461,6 +9475,7 @@ COND_WXUNIV_1___ADVANCED_SRC_OBJECTS_3 = \ advlib_gridctrl.o \ advlib_gridsel.o \ advlib_helpext.o \ + advlib_hyperlink.o \ advlib_laywin.o \ advlib_odcombo.o \ advlib_propdlg.o \ @@ -11799,6 +11814,9 @@ monodll_xh_grid.o: $(srcdir)/src/xrc/xh_grid.cpp $(MONODLL_ODEP) monodll_xh_html.o: $(srcdir)/src/xrc/xh_html.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_html.cpp +monodll_xh_hyperlink.o: $(srcdir)/src/xrc/xh_hyperlink.cpp $(MONODLL_ODEP) + $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_hyperlink.cpp + monodll_xh_listb.o: $(srcdir)/src/xrc/xh_listb.cpp $(MONODLL_ODEP) $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_listb.cpp @@ -14865,6 +14883,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@monodll_helpext.o: $(srcdir)/src/generic/helpext.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/helpext.cpp +@COND_USE_GUI_1@monodll_hyperlink.o: $(srcdir)/src/generic/hyperlink.cpp $(MONODLL_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/hyperlink.cpp + @COND_USE_GUI_1@monodll_laywin.o: $(srcdir)/src/generic/laywin.cpp $(MONODLL_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/laywin.cpp @@ -15618,6 +15639,9 @@ monolib_xh_grid.o: $(srcdir)/src/xrc/xh_grid.cpp $(MONOLIB_ODEP) monolib_xh_html.o: $(srcdir)/src/xrc/xh_html.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_html.cpp +monolib_xh_hyperlink.o: $(srcdir)/src/xrc/xh_hyperlink.cpp $(MONOLIB_ODEP) + $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_hyperlink.cpp + monolib_xh_listb.o: $(srcdir)/src/xrc/xh_listb.cpp $(MONOLIB_ODEP) $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_listb.cpp @@ -18684,6 +18708,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@monolib_helpext.o: $(srcdir)/src/generic/helpext.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/helpext.cpp +@COND_USE_GUI_1@monolib_hyperlink.o: $(srcdir)/src/generic/hyperlink.cpp $(MONOLIB_ODEP) +@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/hyperlink.cpp + @COND_USE_GUI_1@monolib_laywin.o: $(srcdir)/src/generic/laywin.cpp $(MONOLIB_ODEP) @COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/laywin.cpp @@ -25695,6 +25722,9 @@ advdll_gridsel.o: $(srcdir)/src/generic/gridsel.cpp $(ADVDLL_ODEP) advdll_helpext.o: $(srcdir)/src/generic/helpext.cpp $(ADVDLL_ODEP) $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/helpext.cpp +advdll_hyperlink.o: $(srcdir)/src/generic/hyperlink.cpp $(ADVDLL_ODEP) + $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/hyperlink.cpp + advdll_laywin.o: $(srcdir)/src/generic/laywin.cpp $(ADVDLL_ODEP) $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/generic/laywin.cpp @@ -25872,6 +25902,9 @@ advlib_gridsel.o: $(srcdir)/src/generic/gridsel.cpp $(ADVLIB_ODEP) advlib_helpext.o: $(srcdir)/src/generic/helpext.cpp $(ADVLIB_ODEP) $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/helpext.cpp +advlib_hyperlink.o: $(srcdir)/src/generic/hyperlink.cpp $(ADVLIB_ODEP) + $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/hyperlink.cpp + advlib_laywin.o: $(srcdir)/src/generic/laywin.cpp $(ADVLIB_ODEP) $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/generic/laywin.cpp @@ -26364,6 +26397,9 @@ xrcdll_xh_grid.o: $(srcdir)/src/xrc/xh_grid.cpp $(XRCDLL_ODEP) xrcdll_xh_html.o: $(srcdir)/src/xrc/xh_html.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_html.cpp +xrcdll_xh_hyperlink.o: $(srcdir)/src/xrc/xh_hyperlink.cpp $(XRCDLL_ODEP) + $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_hyperlink.cpp + xrcdll_xh_listb.o: $(srcdir)/src/xrc/xh_listb.cpp $(XRCDLL_ODEP) $(CXXC) -c -o $@ $(XRCDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_listb.cpp @@ -26499,6 +26535,9 @@ xrclib_xh_grid.o: $(srcdir)/src/xrc/xh_grid.cpp $(XRCLIB_ODEP) xrclib_xh_html.o: $(srcdir)/src/xrc/xh_html.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_html.cpp +xrclib_xh_hyperlink.o: $(srcdir)/src/xrc/xh_hyperlink.cpp $(XRCLIB_ODEP) + $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_hyperlink.cpp + xrclib_xh_listb.o: $(srcdir)/src/xrc/xh_listb.cpp $(XRCLIB_ODEP) $(CXXC) -c -o $@ $(XRCLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_listb.cpp @@ -27669,7 +27708,6 @@ SAMPLES_DIST: ALL_GUI_DIST $(CP_P) $(SAMPDIR)/widgets/Makefile.in $(DISTDIR)/samples/widgets $(CP_P) $(SAMPDIR)/widgets/*.cpp $(DISTDIR)/samples/widgets $(CP_P) $(SAMPDIR)/widgets/*.h $(DISTDIR)/samples/widgets - $(CP_P) $(SAMPDIR)/widgets/*.rc $(DISTDIR)/samples/widgets $(CP_P) $(SAMPDIR)/widgets/icons/*.xpm $(DISTDIR)/samples/widgets/icons mkdir $(DISTDIR)/samples/xrc diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index e66ec7fd51..9ac07448ee 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -911,6 +911,7 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_gdctl.obj \ $(OBJS)\xrcdll_xh_grid.obj \ $(OBJS)\xrcdll_xh_html.obj \ + $(OBJS)\xrcdll_xh_hyperlink.obj \ $(OBJS)\xrcdll_xh_listb.obj \ $(OBJS)\xrcdll_xh_listbk.obj \ $(OBJS)\xrcdll_xh_listc.obj \ @@ -965,6 +966,7 @@ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_xh_gdctl.obj \ $(OBJS)\xrclib_xh_grid.obj \ $(OBJS)\xrclib_xh_html.obj \ + $(OBJS)\xrclib_xh_hyperlink.obj \ $(OBJS)\xrclib_xh_listb.obj \ $(OBJS)\xrclib_xh_listbk.obj \ $(OBJS)\xrclib_xh_listc.obj \ @@ -1124,6 +1126,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xh_gdctl.obj \ $(OBJS)\monodll_xh_grid.obj \ $(OBJS)\monodll_xh_html.obj \ + $(OBJS)\monodll_xh_hyperlink.obj \ $(OBJS)\monodll_xh_listb.obj \ $(OBJS)\monodll_xh_listbk.obj \ $(OBJS)\monodll_xh_listc.obj \ @@ -1572,6 +1575,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_gridctrl.obj \ $(OBJS)\monodll_gridsel.obj \ $(OBJS)\monodll_helpext.obj \ + $(OBJS)\monodll_hyperlink.obj \ $(OBJS)\monodll_laywin.obj \ $(OBJS)\monodll_odcombo.obj \ $(OBJS)\monodll_propdlg.obj \ @@ -1600,6 +1604,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_gridctrl.obj \ $(OBJS)\monodll_gridsel.obj \ $(OBJS)\monodll_helpext.obj \ + $(OBJS)\monodll_hyperlink.obj \ $(OBJS)\monodll_laywin.obj \ $(OBJS)\monodll_odcombo.obj \ $(OBJS)\monodll_propdlg.obj \ @@ -1675,6 +1680,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xh_gdctl.obj \ $(OBJS)\monolib_xh_grid.obj \ $(OBJS)\monolib_xh_html.obj \ + $(OBJS)\monolib_xh_hyperlink.obj \ $(OBJS)\monolib_xh_listb.obj \ $(OBJS)\monolib_xh_listbk.obj \ $(OBJS)\monolib_xh_listc.obj \ @@ -2123,6 +2129,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_gridctrl.obj \ $(OBJS)\monolib_gridsel.obj \ $(OBJS)\monolib_helpext.obj \ + $(OBJS)\monolib_hyperlink.obj \ $(OBJS)\monolib_laywin.obj \ $(OBJS)\monolib_odcombo.obj \ $(OBJS)\monolib_propdlg.obj \ @@ -2151,6 +2158,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_gridctrl.obj \ $(OBJS)\monolib_gridsel.obj \ $(OBJS)\monolib_helpext.obj \ + $(OBJS)\monolib_hyperlink.obj \ $(OBJS)\monolib_laywin.obj \ $(OBJS)\monolib_odcombo.obj \ $(OBJS)\monolib_propdlg.obj \ @@ -3024,6 +3032,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_gridctrl.obj \ $(OBJS)\advdll_gridsel.obj \ $(OBJS)\advdll_helpext.obj \ + $(OBJS)\advdll_hyperlink.obj \ $(OBJS)\advdll_laywin.obj \ $(OBJS)\advdll_odcombo.obj \ $(OBJS)\advdll_propdlg.obj \ @@ -3052,6 +3061,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_gridctrl.obj \ $(OBJS)\advdll_gridsel.obj \ $(OBJS)\advdll_helpext.obj \ + $(OBJS)\advdll_hyperlink.obj \ $(OBJS)\advdll_laywin.obj \ $(OBJS)\advdll_odcombo.obj \ $(OBJS)\advdll_propdlg.obj \ @@ -3083,6 +3093,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_gridctrl.obj \ $(OBJS)\advlib_gridsel.obj \ $(OBJS)\advlib_helpext.obj \ + $(OBJS)\advlib_hyperlink.obj \ $(OBJS)\advlib_laywin.obj \ $(OBJS)\advlib_odcombo.obj \ $(OBJS)\advlib_propdlg.obj \ @@ -3111,6 +3122,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_gridctrl.obj \ $(OBJS)\advlib_gridsel.obj \ $(OBJS)\advlib_helpext.obj \ + $(OBJS)\advlib_hyperlink.obj \ $(OBJS)\advlib_laywin.obj \ $(OBJS)\advlib_odcombo.obj \ $(OBJS)\advlib_propdlg.obj \ @@ -4673,6 +4685,9 @@ $(OBJS)\monodll_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp $(OBJS)\monodll_xh_html.obj: ..\..\src\xrc\xh_html.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -5828,6 +5843,11 @@ $(OBJS)\monodll_helpext.obj: ..\..\src\generic\helpext.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_hyperlink.obj: ..\..\src\generic\hyperlink.cpp + $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_laywin.obj: ..\..\src\generic\laywin.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** @@ -6475,6 +6495,9 @@ $(OBJS)\monolib_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp $(OBJS)\monolib_xh_html.obj: ..\..\src\xrc\xh_html.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -7630,6 +7653,11 @@ $(OBJS)\monolib_helpext.obj: ..\..\src\generic\helpext.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_hyperlink.obj: ..\..\src\generic\hyperlink.cpp + $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_laywin.obj: ..\..\src\generic\laywin.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** @@ -10684,6 +10712,9 @@ $(OBJS)\advdll_gridsel.obj: ..\..\src\generic\gridsel.cpp $(OBJS)\advdll_helpext.obj: ..\..\src\generic\helpext.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** +$(OBJS)\advdll_hyperlink.obj: ..\..\src\generic\hyperlink.cpp + $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** + $(OBJS)\advdll_laywin.obj: ..\..\src\generic\laywin.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** @@ -10762,6 +10793,9 @@ $(OBJS)\advlib_gridsel.obj: ..\..\src\generic\gridsel.cpp $(OBJS)\advlib_helpext.obj: ..\..\src\generic\helpext.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** +$(OBJS)\advlib_hyperlink.obj: ..\..\src\generic\hyperlink.cpp + $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** + $(OBJS)\advlib_laywin.obj: ..\..\src\generic\laywin.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** @@ -11131,6 +11165,9 @@ $(OBJS)\xrcdll_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp $(OBJS)\xrcdll_xh_html.obj: ..\..\src\xrc\xh_html.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** +$(OBJS)\xrcdll_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp + $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** + $(OBJS)\xrcdll_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) $** @@ -11269,6 +11306,9 @@ $(OBJS)\xrclib_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp $(OBJS)\xrclib_xh_html.obj: ..\..\src\xrc\xh_html.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** +$(OBJS)\xrclib_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp + $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** + $(OBJS)\xrclib_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) $** diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index f2f3d94f86..f5b888f879 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -913,6 +913,7 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_gdctl.o \ $(OBJS)\xrcdll_xh_grid.o \ $(OBJS)\xrcdll_xh_html.o \ + $(OBJS)\xrcdll_xh_hyperlink.o \ $(OBJS)\xrcdll_xh_listb.o \ $(OBJS)\xrcdll_xh_listbk.o \ $(OBJS)\xrcdll_xh_listc.o \ @@ -967,6 +968,7 @@ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_xh_gdctl.o \ $(OBJS)\xrclib_xh_grid.o \ $(OBJS)\xrclib_xh_html.o \ + $(OBJS)\xrclib_xh_hyperlink.o \ $(OBJS)\xrclib_xh_listb.o \ $(OBJS)\xrclib_xh_listbk.o \ $(OBJS)\xrclib_xh_listc.o \ @@ -1134,6 +1136,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xh_gdctl.o \ $(OBJS)\monodll_xh_grid.o \ $(OBJS)\monodll_xh_html.o \ + $(OBJS)\monodll_xh_hyperlink.o \ $(OBJS)\monodll_xh_listb.o \ $(OBJS)\monodll_xh_listbk.o \ $(OBJS)\monodll_xh_listc.o \ @@ -1586,6 +1589,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_gridctrl.o \ $(OBJS)\monodll_gridsel.o \ $(OBJS)\monodll_helpext.o \ + $(OBJS)\monodll_hyperlink.o \ $(OBJS)\monodll_laywin.o \ $(OBJS)\monodll_odcombo.o \ $(OBJS)\monodll_propdlg.o \ @@ -1614,6 +1618,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_gridctrl.o \ $(OBJS)\monodll_gridsel.o \ $(OBJS)\monodll_helpext.o \ + $(OBJS)\monodll_hyperlink.o \ $(OBJS)\monodll_laywin.o \ $(OBJS)\monodll_odcombo.o \ $(OBJS)\monodll_propdlg.o \ @@ -1691,6 +1696,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xh_gdctl.o \ $(OBJS)\monolib_xh_grid.o \ $(OBJS)\monolib_xh_html.o \ + $(OBJS)\monolib_xh_hyperlink.o \ $(OBJS)\monolib_xh_listb.o \ $(OBJS)\monolib_xh_listbk.o \ $(OBJS)\monolib_xh_listc.o \ @@ -2143,6 +2149,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_gridctrl.o \ $(OBJS)\monolib_gridsel.o \ $(OBJS)\monolib_helpext.o \ + $(OBJS)\monolib_hyperlink.o \ $(OBJS)\monolib_laywin.o \ $(OBJS)\monolib_odcombo.o \ $(OBJS)\monolib_propdlg.o \ @@ -2171,6 +2178,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_gridctrl.o \ $(OBJS)\monolib_gridsel.o \ $(OBJS)\monolib_helpext.o \ + $(OBJS)\monolib_hyperlink.o \ $(OBJS)\monolib_laywin.o \ $(OBJS)\monolib_odcombo.o \ $(OBJS)\monolib_propdlg.o \ @@ -3072,6 +3080,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_gridctrl.o \ $(OBJS)\advdll_gridsel.o \ $(OBJS)\advdll_helpext.o \ + $(OBJS)\advdll_hyperlink.o \ $(OBJS)\advdll_laywin.o \ $(OBJS)\advdll_odcombo.o \ $(OBJS)\advdll_propdlg.o \ @@ -3100,6 +3109,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_gridctrl.o \ $(OBJS)\advdll_gridsel.o \ $(OBJS)\advdll_helpext.o \ + $(OBJS)\advdll_hyperlink.o \ $(OBJS)\advdll_laywin.o \ $(OBJS)\advdll_odcombo.o \ $(OBJS)\advdll_propdlg.o \ @@ -3135,6 +3145,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_gridctrl.o \ $(OBJS)\advlib_gridsel.o \ $(OBJS)\advlib_helpext.o \ + $(OBJS)\advlib_hyperlink.o \ $(OBJS)\advlib_laywin.o \ $(OBJS)\advlib_odcombo.o \ $(OBJS)\advlib_propdlg.o \ @@ -3163,6 +3174,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_gridctrl.o \ $(OBJS)\advlib_gridsel.o \ $(OBJS)\advlib_helpext.o \ + $(OBJS)\advlib_hyperlink.o \ $(OBJS)\advlib_laywin.o \ $(OBJS)\advlib_odcombo.o \ $(OBJS)\advlib_propdlg.o \ @@ -4777,6 +4789,9 @@ $(OBJS)\monodll_xh_grid.o: ../../src/xrc/xh_grid.cpp $(OBJS)\monodll_xh_html.o: ../../src/xrc/xh_html.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monodll_xh_hyperlink.o: ../../src/xrc/xh_hyperlink.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monodll_xh_listb.o: ../../src/xrc/xh_listb.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -6036,6 +6051,11 @@ $(OBJS)\monodll_helpext.o: ../../src/generic/helpext.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monodll_hyperlink.o: ../../src/generic/hyperlink.cpp + $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monodll_laywin.o: ../../src/generic/laywin.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< @@ -6683,6 +6703,9 @@ $(OBJS)\monolib_xh_grid.o: ../../src/xrc/xh_grid.cpp $(OBJS)\monolib_xh_html.o: ../../src/xrc/xh_html.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\monolib_xh_hyperlink.o: ../../src/xrc/xh_hyperlink.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\monolib_xh_listb.o: ../../src/xrc/xh_listb.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -7942,6 +7965,11 @@ $(OBJS)\monolib_helpext.o: ../../src/generic/helpext.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< endif +ifeq ($(USE_GUI),1) +$(OBJS)\monolib_hyperlink.o: ../../src/generic/hyperlink.cpp + $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< +endif + ifeq ($(USE_GUI),1) $(OBJS)\monolib_laywin.o: ../../src/generic/laywin.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< @@ -11204,6 +11232,9 @@ $(OBJS)\advdll_gridsel.o: ../../src/generic/gridsel.cpp $(OBJS)\advdll_helpext.o: ../../src/generic/helpext.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\advdll_hyperlink.o: ../../src/generic/hyperlink.cpp + $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\advdll_laywin.o: ../../src/generic/laywin.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< @@ -11282,6 +11313,9 @@ $(OBJS)\advlib_gridsel.o: ../../src/generic/gridsel.cpp $(OBJS)\advlib_helpext.o: ../../src/generic/helpext.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\advlib_hyperlink.o: ../../src/generic/hyperlink.cpp + $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\advlib_laywin.o: ../../src/generic/laywin.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< @@ -11651,6 +11685,9 @@ $(OBJS)\xrcdll_xh_grid.o: ../../src/xrc/xh_grid.cpp $(OBJS)\xrcdll_xh_html.o: ../../src/xrc/xh_html.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\xrcdll_xh_hyperlink.o: ../../src/xrc/xh_hyperlink.cpp + $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\xrcdll_xh_listb.o: ../../src/xrc/xh_listb.cpp $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< @@ -11789,6 +11826,9 @@ $(OBJS)\xrclib_xh_grid.o: ../../src/xrc/xh_grid.cpp $(OBJS)\xrclib_xh_html.o: ../../src/xrc/xh_html.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< +$(OBJS)\xrclib_xh_hyperlink.o: ../../src/xrc/xh_hyperlink.cpp + $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< + $(OBJS)\xrclib_xh_listb.o: ../../src/xrc/xh_listb.cpp $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 77b4458cfd..561dba04f8 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -994,6 +994,7 @@ XRCDLL_OBJECTS = \ $(OBJS)\xrcdll_xh_gdctl.obj \ $(OBJS)\xrcdll_xh_grid.obj \ $(OBJS)\xrcdll_xh_html.obj \ + $(OBJS)\xrcdll_xh_hyperlink.obj \ $(OBJS)\xrcdll_xh_listb.obj \ $(OBJS)\xrcdll_xh_listbk.obj \ $(OBJS)\xrcdll_xh_listc.obj \ @@ -1051,6 +1052,7 @@ XRCLIB_OBJECTS = \ $(OBJS)\xrclib_xh_gdctl.obj \ $(OBJS)\xrclib_xh_grid.obj \ $(OBJS)\xrclib_xh_html.obj \ + $(OBJS)\xrclib_xh_hyperlink.obj \ $(OBJS)\xrclib_xh_listb.obj \ $(OBJS)\xrclib_xh_listbk.obj \ $(OBJS)\xrclib_xh_listc.obj \ @@ -1283,6 +1285,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_xh_gdctl.obj \ $(OBJS)\monodll_xh_grid.obj \ $(OBJS)\monodll_xh_html.obj \ + $(OBJS)\monodll_xh_hyperlink.obj \ $(OBJS)\monodll_xh_listb.obj \ $(OBJS)\monodll_xh_listbk.obj \ $(OBJS)\monodll_xh_listc.obj \ @@ -1731,6 +1734,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_gridctrl.obj \ $(OBJS)\monodll_gridsel.obj \ $(OBJS)\monodll_helpext.obj \ + $(OBJS)\monodll_hyperlink.obj \ $(OBJS)\monodll_laywin.obj \ $(OBJS)\monodll_odcombo.obj \ $(OBJS)\monodll_propdlg.obj \ @@ -1759,6 +1763,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_gridctrl.obj \ $(OBJS)\monodll_gridsel.obj \ $(OBJS)\monodll_helpext.obj \ + $(OBJS)\monodll_hyperlink.obj \ $(OBJS)\monodll_laywin.obj \ $(OBJS)\monodll_odcombo.obj \ $(OBJS)\monodll_propdlg.obj \ @@ -1840,6 +1845,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_xh_gdctl.obj \ $(OBJS)\monolib_xh_grid.obj \ $(OBJS)\monolib_xh_html.obj \ + $(OBJS)\monolib_xh_hyperlink.obj \ $(OBJS)\monolib_xh_listb.obj \ $(OBJS)\monolib_xh_listbk.obj \ $(OBJS)\monolib_xh_listc.obj \ @@ -2288,6 +2294,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_gridctrl.obj \ $(OBJS)\monolib_gridsel.obj \ $(OBJS)\monolib_helpext.obj \ + $(OBJS)\monolib_hyperlink.obj \ $(OBJS)\monolib_laywin.obj \ $(OBJS)\monolib_odcombo.obj \ $(OBJS)\monolib_propdlg.obj \ @@ -2316,6 +2323,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_gridctrl.obj \ $(OBJS)\monolib_gridsel.obj \ $(OBJS)\monolib_helpext.obj \ + $(OBJS)\monolib_hyperlink.obj \ $(OBJS)\monolib_laywin.obj \ $(OBJS)\monolib_odcombo.obj \ $(OBJS)\monolib_propdlg.obj \ @@ -3231,6 +3239,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_gridctrl.obj \ $(OBJS)\advdll_gridsel.obj \ $(OBJS)\advdll_helpext.obj \ + $(OBJS)\advdll_hyperlink.obj \ $(OBJS)\advdll_laywin.obj \ $(OBJS)\advdll_odcombo.obj \ $(OBJS)\advdll_propdlg.obj \ @@ -3259,6 +3268,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ $(OBJS)\advdll_gridctrl.obj \ $(OBJS)\advdll_gridsel.obj \ $(OBJS)\advdll_helpext.obj \ + $(OBJS)\advdll_hyperlink.obj \ $(OBJS)\advdll_laywin.obj \ $(OBJS)\advdll_odcombo.obj \ $(OBJS)\advdll_propdlg.obj \ @@ -3296,6 +3306,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_gridctrl.obj \ $(OBJS)\advlib_gridsel.obj \ $(OBJS)\advlib_helpext.obj \ + $(OBJS)\advlib_hyperlink.obj \ $(OBJS)\advlib_laywin.obj \ $(OBJS)\advlib_odcombo.obj \ $(OBJS)\advlib_propdlg.obj \ @@ -3324,6 +3335,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ $(OBJS)\advlib_gridctrl.obj \ $(OBJS)\advlib_gridsel.obj \ $(OBJS)\advlib_helpext.obj \ + $(OBJS)\advlib_hyperlink.obj \ $(OBJS)\advlib_laywin.obj \ $(OBJS)\advlib_odcombo.obj \ $(OBJS)\advlib_propdlg.obj \ @@ -4982,6 +4994,9 @@ $(OBJS)\monodll_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp $(OBJS)\monodll_xh_html.obj: ..\..\src\xrc\xh_html.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +$(OBJS)\monodll_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** + $(OBJS)\monodll_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -6137,6 +6152,11 @@ $(OBJS)\monodll_helpext.obj: ..\..\src\generic\helpext.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monodll_hyperlink.obj: ..\..\src\generic\hyperlink.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monodll_laywin.obj: ..\..\src\generic\laywin.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** @@ -6784,6 +6804,9 @@ $(OBJS)\monolib_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp $(OBJS)\monolib_xh_html.obj: ..\..\src\xrc\xh_html.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +$(OBJS)\monolib_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** + $(OBJS)\monolib_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -7939,6 +7962,11 @@ $(OBJS)\monolib_helpext.obj: ..\..\src\generic\helpext.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** !endif +!if "$(USE_GUI)" == "1" +$(OBJS)\monolib_hyperlink.obj: ..\..\src\generic\hyperlink.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** +!endif + !if "$(USE_GUI)" == "1" $(OBJS)\monolib_laywin.obj: ..\..\src\generic\laywin.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** @@ -10993,6 +11021,9 @@ $(OBJS)\advdll_gridsel.obj: ..\..\src\generic\gridsel.cpp $(OBJS)\advdll_helpext.obj: ..\..\src\generic\helpext.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** +$(OBJS)\advdll_hyperlink.obj: ..\..\src\generic\hyperlink.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** + $(OBJS)\advdll_laywin.obj: ..\..\src\generic\laywin.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** @@ -11071,6 +11102,9 @@ $(OBJS)\advlib_gridsel.obj: ..\..\src\generic\gridsel.cpp $(OBJS)\advlib_helpext.obj: ..\..\src\generic\helpext.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** +$(OBJS)\advlib_hyperlink.obj: ..\..\src\generic\hyperlink.cpp + $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** + $(OBJS)\advlib_laywin.obj: ..\..\src\generic\laywin.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** @@ -11440,6 +11474,9 @@ $(OBJS)\xrcdll_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp $(OBJS)\xrcdll_xh_html.obj: ..\..\src\xrc\xh_html.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** +$(OBJS)\xrcdll_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** + $(OBJS)\xrcdll_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) $** @@ -11578,6 +11615,9 @@ $(OBJS)\xrclib_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp $(OBJS)\xrclib_xh_html.obj: ..\..\src\xrc\xh_html.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** +$(OBJS)\xrclib_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp + $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** + $(OBJS)\xrclib_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) $** diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index b87242d7ba..d881033746 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -150,6 +150,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_xh_gdctl.obj & $(OBJS)\monodll_xh_grid.obj & $(OBJS)\monodll_xh_html.obj & + $(OBJS)\monodll_xh_hyperlink.obj & $(OBJS)\monodll_xh_listb.obj & $(OBJS)\monodll_xh_listbk.obj & $(OBJS)\monodll_xh_listc.obj & @@ -604,6 +605,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_gridctrl.obj & $(OBJS)\monodll_gridsel.obj & $(OBJS)\monodll_helpext.obj & + $(OBJS)\monodll_hyperlink.obj & $(OBJS)\monodll_laywin.obj & $(OBJS)\monodll_odcombo.obj & $(OBJS)\monodll_propdlg.obj & @@ -632,6 +634,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_gridctrl.obj & $(OBJS)\monodll_gridsel.obj & $(OBJS)\monodll_helpext.obj & + $(OBJS)\monodll_hyperlink.obj & $(OBJS)\monodll_laywin.obj & $(OBJS)\monodll_odcombo.obj & $(OBJS)\monodll_propdlg.obj & @@ -711,6 +714,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_xh_gdctl.obj & $(OBJS)\monolib_xh_grid.obj & $(OBJS)\monolib_xh_html.obj & + $(OBJS)\monolib_xh_hyperlink.obj & $(OBJS)\monolib_xh_listb.obj & $(OBJS)\monolib_xh_listbk.obj & $(OBJS)\monolib_xh_listc.obj & @@ -1165,6 +1169,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_gridctrl.obj & $(OBJS)\monolib_gridsel.obj & $(OBJS)\monolib_helpext.obj & + $(OBJS)\monolib_hyperlink.obj & $(OBJS)\monolib_laywin.obj & $(OBJS)\monolib_odcombo.obj & $(OBJS)\monolib_propdlg.obj & @@ -1193,6 +1198,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_gridctrl.obj & $(OBJS)\monolib_gridsel.obj & $(OBJS)\monolib_helpext.obj & + $(OBJS)\monolib_hyperlink.obj & $(OBJS)\monolib_laywin.obj & $(OBJS)\monolib_odcombo.obj & $(OBJS)\monolib_propdlg.obj & @@ -2104,6 +2110,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\advdll_gridctrl.obj & $(OBJS)\advdll_gridsel.obj & $(OBJS)\advdll_helpext.obj & + $(OBJS)\advdll_hyperlink.obj & $(OBJS)\advdll_laywin.obj & $(OBJS)\advdll_odcombo.obj & $(OBJS)\advdll_propdlg.obj & @@ -2132,6 +2139,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = & $(OBJS)\advdll_gridctrl.obj & $(OBJS)\advdll_gridsel.obj & $(OBJS)\advdll_helpext.obj & + $(OBJS)\advdll_hyperlink.obj & $(OBJS)\advdll_laywin.obj & $(OBJS)\advdll_odcombo.obj & $(OBJS)\advdll_propdlg.obj & @@ -2169,6 +2177,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\advlib_gridctrl.obj & $(OBJS)\advlib_gridsel.obj & $(OBJS)\advlib_helpext.obj & + $(OBJS)\advlib_hyperlink.obj & $(OBJS)\advlib_laywin.obj & $(OBJS)\advlib_odcombo.obj & $(OBJS)\advlib_propdlg.obj & @@ -2197,6 +2206,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = & $(OBJS)\advlib_gridctrl.obj & $(OBJS)\advlib_gridsel.obj & $(OBJS)\advlib_helpext.obj & + $(OBJS)\advlib_hyperlink.obj & $(OBJS)\advlib_laywin.obj & $(OBJS)\advlib_odcombo.obj & $(OBJS)\advlib_propdlg.obj & @@ -3399,6 +3409,7 @@ XRCDLL_OBJECTS = & $(OBJS)\xrcdll_xh_gdctl.obj & $(OBJS)\xrcdll_xh_grid.obj & $(OBJS)\xrcdll_xh_html.obj & + $(OBJS)\xrcdll_xh_hyperlink.obj & $(OBJS)\xrcdll_xh_listb.obj & $(OBJS)\xrcdll_xh_listbk.obj & $(OBJS)\xrcdll_xh_listc.obj & @@ -3454,6 +3465,7 @@ XRCLIB_OBJECTS = & $(OBJS)\xrclib_xh_gdctl.obj & $(OBJS)\xrclib_xh_grid.obj & $(OBJS)\xrclib_xh_html.obj & + $(OBJS)\xrclib_xh_hyperlink.obj & $(OBJS)\xrclib_xh_listb.obj & $(OBJS)\xrclib_xh_listbk.obj & $(OBJS)\xrclib_xh_listc.obj & @@ -4977,6 +4989,9 @@ $(OBJS)\monodll_xh_grid.obj : .AUTODEPEND ..\..\src\xrc\xh_grid.cpp $(OBJS)\monodll_xh_html.obj : .AUTODEPEND ..\..\src\xrc\xh_html.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +$(OBJS)\monodll_xh_hyperlink.obj : .AUTODEPEND ..\..\src\xrc\xh_hyperlink.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< + $(OBJS)\monodll_xh_listb.obj : .AUTODEPEND ..\..\src\xrc\xh_listb.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6236,6 +6251,11 @@ $(OBJS)\monodll_helpext.obj : .AUTODEPEND ..\..\src\generic\helpext.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monodll_hyperlink.obj : .AUTODEPEND ..\..\src\generic\hyperlink.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monodll_laywin.obj : .AUTODEPEND ..\..\src\generic\laywin.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< @@ -6883,6 +6903,9 @@ $(OBJS)\monolib_xh_grid.obj : .AUTODEPEND ..\..\src\xrc\xh_grid.cpp $(OBJS)\monolib_xh_html.obj : .AUTODEPEND ..\..\src\xrc\xh_html.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +$(OBJS)\monolib_xh_hyperlink.obj : .AUTODEPEND ..\..\src\xrc\xh_hyperlink.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< + $(OBJS)\monolib_xh_listb.obj : .AUTODEPEND ..\..\src\xrc\xh_listb.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -8142,6 +8165,11 @@ $(OBJS)\monolib_helpext.obj : .AUTODEPEND ..\..\src\generic\helpext.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< !endif +!ifeq USE_GUI 1 +$(OBJS)\monolib_hyperlink.obj : .AUTODEPEND ..\..\src\generic\hyperlink.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< +!endif + !ifeq USE_GUI 1 $(OBJS)\monolib_laywin.obj : .AUTODEPEND ..\..\src\generic\laywin.cpp $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< @@ -11404,6 +11432,9 @@ $(OBJS)\advdll_gridsel.obj : .AUTODEPEND ..\..\src\generic\gridsel.cpp $(OBJS)\advdll_helpext.obj : .AUTODEPEND ..\..\src\generic\helpext.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< +$(OBJS)\advdll_hyperlink.obj : .AUTODEPEND ..\..\src\generic\hyperlink.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< + $(OBJS)\advdll_laywin.obj : .AUTODEPEND ..\..\src\generic\laywin.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< @@ -11482,6 +11513,9 @@ $(OBJS)\advlib_gridsel.obj : .AUTODEPEND ..\..\src\generic\gridsel.cpp $(OBJS)\advlib_helpext.obj : .AUTODEPEND ..\..\src\generic\helpext.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< +$(OBJS)\advlib_hyperlink.obj : .AUTODEPEND ..\..\src\generic\hyperlink.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< + $(OBJS)\advlib_laywin.obj : .AUTODEPEND ..\..\src\generic\laywin.cpp $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< @@ -11851,6 +11885,9 @@ $(OBJS)\xrcdll_xh_grid.obj : .AUTODEPEND ..\..\src\xrc\xh_grid.cpp $(OBJS)\xrcdll_xh_html.obj : .AUTODEPEND ..\..\src\xrc\xh_html.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< +$(OBJS)\xrcdll_xh_hyperlink.obj : .AUTODEPEND ..\..\src\xrc\xh_hyperlink.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< + $(OBJS)\xrcdll_xh_listb.obj : .AUTODEPEND ..\..\src\xrc\xh_listb.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< @@ -11989,6 +12026,9 @@ $(OBJS)\xrclib_xh_grid.obj : .AUTODEPEND ..\..\src\xrc\xh_grid.cpp $(OBJS)\xrclib_xh_html.obj : .AUTODEPEND ..\..\src\xrc\xh_html.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< +$(OBJS)\xrclib_xh_hyperlink.obj : .AUTODEPEND ..\..\src\xrc\xh_hyperlink.cpp + $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< + $(OBJS)\xrclib_xh_listb.obj : .AUTODEPEND ..\..\src\xrc\xh_listb.cpp $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< diff --git a/build/msw/wx_adv.dsp b/build/msw/wx_adv.dsp index ad33d487b6..0c523d9a40 100644 --- a/build/msw/wx_adv.dsp +++ b/build/msw/wx_adv.dsp @@ -640,6 +640,10 @@ SOURCE=..\..\src\generic\helpext.cpp # End Source File # Begin Source File +SOURCE=..\..\src\generic\hyperlink.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\generic\laywin.cpp # End Source File # Begin Source File @@ -1193,6 +1197,10 @@ SOURCE=..\..\include\wx\grid.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\hyperlink.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\joystick.h # End Source File # Begin Source File diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index 79fb5d2521..64455b6def 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -8805,6 +8805,10 @@ SOURCE=..\..\include\wx\htmllbox.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\hyperlink.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\icon.h # End Source File # Begin Source File @@ -9269,6 +9273,10 @@ SOURCE=..\..\include\wx\xrc\xh_html.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\xrc\xh_hyperlink.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\xrc\xh_listb.h # End Source File # Begin Source File diff --git a/build/msw/wx_xrc.dsp b/build/msw/wx_xrc.dsp index 3e9d00114b..707ad70e77 100644 --- a/build/msw/wx_xrc.dsp +++ b/build/msw/wx_xrc.dsp @@ -1022,6 +1022,10 @@ SOURCE=..\..\include\wx\xrc\xh_html.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\xrc\xh_hyperlink.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\xrc\xh_listb.h # End Source File # Begin Source File @@ -1202,6 +1206,10 @@ SOURCE=..\..\src\xrc\xh_html.cpp # End Source File # Begin Source File +SOURCE=..\..\src\xrc\xh_hyperlink.cpp +# End Source File +# Begin Source File + SOURCE=..\..\src\xrc\xh_listb.cpp # End Source File # Begin Source File