From 0b0bed0fcaef2b9eb7999d9d4c5b11ef65df78c9 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 30 Dec 2010 22:37:17 +0000
Subject: [PATCH] Move wxMSW wxCommandLinkButton files to native-only part.
wxMSW wxCommandLinkButton implementation shouldn't be used in wxUniv so move
src/msw/commandlinkbutton.cpp and include/wx/msw/commandlinkbutton.h to
ADVANCED_MSW_NATIVE_{SRC,HDR} from ADVANCED_MSW_{SRC,HDR} in files.bkl and
rebake the makefiles.
This fixes wxUniv/MSW compilation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
Makefile.in | 95 +++++++++++++++++++------------------
build/bakefiles/files.bkl | 4 +-
build/msw/makefile.bcc | 40 +++++++---------
build/msw/makefile.gcc | 40 +++++++---------
build/msw/makefile.vc | 40 +++++++---------
build/msw/makefile.wat | 40 +++++++---------
build/msw/wx_adv.dsp | 31 ++++++++++++
build/msw/wx_vc7_adv.vcproj | 12 +++++
build/msw/wx_vc8_adv.vcproj | 16 +++++++
build/msw/wx_vc9_adv.vcproj | 16 +++++++
10 files changed, 190 insertions(+), 144 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index a266da2765..1d621b1055 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3588,7 +3588,6 @@ COND_TOOLKIT_MOTIF_ADVANCED_PLATFORM_HDR = \
wx/generic/animate.h
@COND_TOOLKIT_MOTIF@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_MOTIF_ADVANCED_PLATFORM_HDR)
COND_TOOLKIT_MSW_ADVANCED_PLATFORM_HDR = \
- wx/msw/commandlinkbutton.h \
wx/msw/hyperlink.h \
wx/msw/notifmsg.h \
wx/msw/sound.h \
@@ -3622,13 +3621,9 @@ COND_TOOLKIT_OSX_COCOA_ADVANCED_PLATFORM_HDR = \
@COND_TOOLKIT_OSX_IPHONE@ wx/generic/animate.h wx/osx/sound.h
@COND_TOOLKIT_PM@ADVANCED_PLATFORM_HDR = \
@COND_TOOLKIT_PM@ wx/generic/animate.h wx/os2/joystick.h wx/os2/sound.h
-COND_TOOLKIT_WINCE_ADVANCED_PLATFORM_HDR = \
- wx/msw/commandlinkbutton.h \
- wx/msw/hyperlink.h \
- wx/msw/notifmsg.h \
- wx/msw/sound.h \
- wx/msw/taskbar.h
-@COND_TOOLKIT_WINCE@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_WINCE_ADVANCED_PLATFORM_HDR)
+@COND_TOOLKIT_WINCE@ADVANCED_PLATFORM_HDR = \
+@COND_TOOLKIT_WINCE@ wx/msw/hyperlink.h wx/msw/notifmsg.h wx/msw/sound.h \
+@COND_TOOLKIT_WINCE@ wx/msw/taskbar.h
@COND_TOOLKIT_X11@ADVANCED_PLATFORM_HDR = \
@COND_TOOLKIT_X11@ wx/unix/joystick.h wx/unix/sound.h wx/unix/taskbarx11.h
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_NATIVE_HDR = \
@@ -3640,12 +3635,20 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_NATIVE_HDR = \
wx/gtk/dvrenderers.h \
wx/gtk/hyperlink.h
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ADVANCED_PLATFORM_NATIVE_HDR = $(COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_ADVANCED_PLATFORM_NATIVE_HDR)
-@COND_TOOLKIT_MSW@ADVANCED_PLATFORM_NATIVE_HDR = \
-@COND_TOOLKIT_MSW@ wx/generic/animate.h wx/msw/bmpcbox.h wx/msw/calctrl.h \
-@COND_TOOLKIT_MSW@ wx/msw/datectrl.h
-@COND_TOOLKIT_WINCE@ADVANCED_PLATFORM_NATIVE_HDR = \
-@COND_TOOLKIT_WINCE@ wx/generic/animate.h wx/msw/bmpcbox.h wx/msw/calctrl.h \
-@COND_TOOLKIT_WINCE@ wx/msw/datectrl.h
+COND_TOOLKIT_MSW_ADVANCED_PLATFORM_NATIVE_HDR = \
+ wx/generic/animate.h \
+ wx/msw/bmpcbox.h \
+ wx/msw/commandlinkbutton.h \
+ wx/msw/calctrl.h \
+ wx/msw/datectrl.h
+@COND_TOOLKIT_MSW@ADVANCED_PLATFORM_NATIVE_HDR = $(COND_TOOLKIT_MSW_ADVANCED_PLATFORM_NATIVE_HDR)
+COND_TOOLKIT_WINCE_ADVANCED_PLATFORM_NATIVE_HDR = \
+ wx/generic/animate.h \
+ wx/msw/bmpcbox.h \
+ wx/msw/commandlinkbutton.h \
+ wx/msw/calctrl.h \
+ wx/msw/datectrl.h
+@COND_TOOLKIT_WINCE@ADVANCED_PLATFORM_NATIVE_HDR = $(COND_TOOLKIT_WINCE_ADVANCED_PLATFORM_NATIVE_HDR)
COND_WXUNIV_0_ADVANCED_HDR = \
wx/aboutdlg.h \
wx/animate.h \
@@ -6040,6 +6043,7 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS = \
monodll_animateg.o \
monodll_msw_bmpcbox.o \
monodll_msw_calctrl.o \
+ monodll_commandlinkbutton.o \
monodll_datecontrols.o \
monodll_datectrl.o
@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS)
@@ -6047,6 +6051,7 @@ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS = \
monodll_animateg.o \
monodll_msw_bmpcbox.o \
monodll_msw_calctrl.o \
+ monodll_commandlinkbutton.o \
monodll_datecontrols.o \
monodll_datectrl.o
@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS)
@@ -7916,6 +7921,7 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 = \
monolib_animateg.o \
monolib_msw_bmpcbox.o \
monolib_msw_calctrl.o \
+ monolib_commandlinkbutton.o \
monolib_datecontrols.o \
monolib_datectrl.o
@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1)
@@ -7923,6 +7929,7 @@ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 = \
monolib_animateg.o \
monolib_msw_bmpcbox.o \
monolib_msw_calctrl.o \
+ monolib_commandlinkbutton.o \
monolib_datecontrols.o \
monolib_datectrl.o
@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_1)
@@ -11589,6 +11596,7 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 = \
advdll_animateg.o \
advdll_msw_bmpcbox.o \
advdll_msw_calctrl.o \
+ advdll_commandlinkbutton.o \
advdll_datecontrols.o \
advdll_datectrl.o
@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2)
@@ -11596,6 +11604,7 @@ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 = \
advdll_animateg.o \
advdll_msw_bmpcbox.o \
advdll_msw_calctrl.o \
+ advdll_commandlinkbutton.o \
advdll_datecontrols.o \
advdll_datectrl.o
@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_2)
@@ -11685,6 +11694,7 @@ COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 = \
advlib_animateg.o \
advlib_msw_bmpcbox.o \
advlib_msw_calctrl.o \
+ advlib_commandlinkbutton.o \
advlib_datecontrols.o \
advlib_datectrl.o
@COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 = $(COND_TOOLKIT_MSW___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3)
@@ -11692,6 +11702,7 @@ COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 = \
advlib_animateg.o \
advlib_msw_bmpcbox.o \
advlib_msw_calctrl.o \
+ advlib_commandlinkbutton.o \
advlib_datecontrols.o \
advlib_datectrl.o
@COND_TOOLKIT_WINCE@__ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3 = $(COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_NATIVE_SRC_OBJECTS_3)
@@ -12845,7 +12856,6 @@ COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS = \
COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS = \
monodll_taskbarcmn.o \
monodll_msw_aboutdlg.o \
- monodll_commandlinkbutton.o \
monodll_msw_hyperlink.o \
monodll_msw_notifmsg.o \
monodll_msw_sound.o \
@@ -12885,7 +12895,6 @@ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS = \
COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS = \
monodll_taskbarcmn.o \
monodll_msw_aboutdlg.o \
- monodll_commandlinkbutton.o \
monodll_msw_hyperlink.o \
monodll_msw_notifmsg.o \
monodll_msw_sound.o \
@@ -13034,7 +13043,6 @@ COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
monolib_taskbarcmn.o \
monolib_msw_aboutdlg.o \
- monolib_commandlinkbutton.o \
monolib_msw_hyperlink.o \
monolib_msw_notifmsg.o \
monolib_msw_sound.o \
@@ -13074,7 +13082,6 @@ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
monolib_taskbarcmn.o \
monolib_msw_aboutdlg.o \
- monolib_commandlinkbutton.o \
monolib_msw_hyperlink.o \
monolib_msw_notifmsg.o \
monolib_msw_sound.o \
@@ -13320,7 +13327,6 @@ COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
advdll_taskbarcmn.o \
advdll_msw_aboutdlg.o \
- advdll_commandlinkbutton.o \
advdll_msw_hyperlink.o \
advdll_msw_notifmsg.o \
advdll_msw_sound.o \
@@ -13360,7 +13366,6 @@ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
advdll_taskbarcmn.o \
advdll_msw_aboutdlg.o \
- advdll_commandlinkbutton.o \
advdll_msw_hyperlink.o \
advdll_msw_notifmsg.o \
advdll_msw_sound.o \
@@ -13412,7 +13417,6 @@ COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
COND_TOOLKIT_MSW___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
advlib_taskbarcmn.o \
advlib_msw_aboutdlg.o \
- advlib_commandlinkbutton.o \
advlib_msw_hyperlink.o \
advlib_msw_notifmsg.o \
advlib_msw_sound.o \
@@ -13452,7 +13456,6 @@ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
COND_TOOLKIT_WINCE___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
advlib_taskbarcmn.o \
advlib_msw_aboutdlg.o \
- advlib_commandlinkbutton.o \
advlib_msw_hyperlink.o \
advlib_msw_notifmsg.o \
advlib_msw_sound.o \
@@ -20088,12 +20091,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monodll_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1@monodll_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(MONODLL_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1@monodll_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/hyperlink.cpp
@@ -20289,6 +20286,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_msw_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monodll_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(MONODLL_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp
+
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monodll_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/datecontrols.cpp
@@ -25317,12 +25320,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
-@COND_TOOLKIT_MSW_USE_GUI_1@monolib_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp
-
-@COND_TOOLKIT_WINCE_USE_GUI_1@monolib_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(MONOLIB_ODEP)
-@COND_TOOLKIT_WINCE_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp
-
@COND_TOOLKIT_MSW_USE_GUI_1@monolib_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/hyperlink.cpp
@@ -25518,6 +25515,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_msw_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp
+
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@monolib_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(MONOLIB_ODEP)
+@COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp
+
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@monolib_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/datecontrols.cpp
@@ -34668,12 +34671,6 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_WINCE@advdll_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
-@COND_TOOLKIT_MSW@advdll_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp
-
-@COND_TOOLKIT_WINCE@advdll_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(ADVDLL_ODEP)
-@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp
-
@COND_TOOLKIT_MSW@advdll_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/hyperlink.cpp
@@ -34869,6 +34866,12 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_WINCE_WXUNIV_0@advdll_msw_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_WINCE_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
+@COND_TOOLKIT_MSW_WXUNIV_0@advdll_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_MSW_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp
+
+@COND_TOOLKIT_WINCE_WXUNIV_0@advdll_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(ADVDLL_ODEP)
+@COND_TOOLKIT_WINCE_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp
+
@COND_TOOLKIT_MSW_WXUNIV_0@advdll_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(ADVDLL_ODEP)
@COND_TOOLKIT_MSW_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/msw/datecontrols.cpp
@@ -35016,12 +35019,6 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_WINCE@advlib_msw_aboutdlg.o: $(srcdir)/src/msw/aboutdlg.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/aboutdlg.cpp
-@COND_TOOLKIT_MSW@advlib_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp
-
-@COND_TOOLKIT_WINCE@advlib_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(ADVLIB_ODEP)
-@COND_TOOLKIT_WINCE@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp
-
@COND_TOOLKIT_MSW@advlib_msw_hyperlink.o: $(srcdir)/src/msw/hyperlink.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/hyperlink.cpp
@@ -35217,6 +35214,12 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_WINCE_WXUNIV_0@advlib_msw_calctrl.o: $(srcdir)/src/msw/calctrl.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_WINCE_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/calctrl.cpp
+@COND_TOOLKIT_MSW_WXUNIV_0@advlib_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_MSW_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp
+
+@COND_TOOLKIT_WINCE_WXUNIV_0@advlib_commandlinkbutton.o: $(srcdir)/src/msw/commandlinkbutton.cpp $(ADVLIB_ODEP)
+@COND_TOOLKIT_WINCE_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/commandlinkbutton.cpp
+
@COND_TOOLKIT_MSW_WXUNIV_0@advlib_datecontrols.o: $(srcdir)/src/msw/datecontrols.cpp $(ADVLIB_ODEP)
@COND_TOOLKIT_MSW_WXUNIV_0@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/msw/datecontrols.cpp
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 1860257eae..9b90071763 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -2973,14 +2973,12 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<set var="ADVANCED_MSW_SRC" hints="files">
src/common/taskbarcmn.cpp
src/msw/aboutdlg.cpp
- src/msw/commandlinkbutton.cpp
src/msw/hyperlink.cpp
src/msw/notifmsg.cpp
src/msw/sound.cpp
src/msw/taskbar.cpp
</set>
<set var="ADVANCED_MSW_HDR" hints="files">
- wx/msw/commandlinkbutton.h
wx/msw/hyperlink.h
wx/msw/notifmsg.h
wx/msw/sound.h
@@ -2992,12 +2990,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/generic/animateg.cpp
src/msw/bmpcbox.cpp
src/msw/calctrl.cpp
+ src/msw/commandlinkbutton.cpp
src/msw/datecontrols.cpp
src/msw/datectrl.cpp
</set>
<set var="ADVANCED_MSW_NATIVE_HDR" hints="files">
wx/generic/animate.h
wx/msw/bmpcbox.h
+ wx/msw/commandlinkbutton.h
wx/msw/calctrl.h
wx/msw/datectrl.h
</set>
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 3347781dd3..d1378fb090 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -2203,7 +2203,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_wizard.obj \
$(OBJS)\monodll_taskbarcmn.obj \
$(OBJS)\monodll_aboutdlg.obj \
- $(OBJS)\monodll_commandlinkbutton.obj \
$(OBJS)\monodll_hyperlink.obj \
$(OBJS)\monodll_notifmsg.obj \
$(OBJS)\monodll_sound.obj \
@@ -2212,6 +2211,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_animateg.obj \
$(OBJS)\monodll_bmpcbox.obj \
$(OBJS)\monodll_calctrl.obj \
+ $(OBJS)\monodll_commandlinkbutton.obj \
$(OBJS)\monodll_datecontrols.obj \
$(OBJS)\monodll_datectrl.obj
!endif
@@ -2245,7 +2245,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_wizard.obj \
$(OBJS)\monodll_taskbarcmn.obj \
$(OBJS)\monodll_aboutdlg.obj \
- $(OBJS)\monodll_commandlinkbutton.obj \
$(OBJS)\monodll_hyperlink.obj \
$(OBJS)\monodll_notifmsg.obj \
$(OBJS)\monodll_sound.obj \
@@ -2926,7 +2925,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_wizard.obj \
$(OBJS)\monolib_taskbarcmn.obj \
$(OBJS)\monolib_aboutdlg.obj \
- $(OBJS)\monolib_commandlinkbutton.obj \
$(OBJS)\monolib_hyperlink.obj \
$(OBJS)\monolib_notifmsg.obj \
$(OBJS)\monolib_sound.obj \
@@ -2935,6 +2933,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_animateg.obj \
$(OBJS)\monolib_bmpcbox.obj \
$(OBJS)\monolib_calctrl.obj \
+ $(OBJS)\monolib_commandlinkbutton.obj \
$(OBJS)\monolib_datecontrols.obj \
$(OBJS)\monolib_datectrl.obj
!endif
@@ -2968,7 +2967,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_wizard.obj \
$(OBJS)\monolib_taskbarcmn.obj \
$(OBJS)\monolib_aboutdlg.obj \
- $(OBJS)\monolib_commandlinkbutton.obj \
$(OBJS)\monolib_hyperlink.obj \
$(OBJS)\monolib_notifmsg.obj \
$(OBJS)\monolib_sound.obj \
@@ -4050,7 +4048,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_wizard.obj \
$(OBJS)\advdll_taskbarcmn.obj \
$(OBJS)\advdll_aboutdlg.obj \
- $(OBJS)\advdll_commandlinkbutton.obj \
$(OBJS)\advdll_hyperlink.obj \
$(OBJS)\advdll_notifmsg.obj \
$(OBJS)\advdll_sound.obj \
@@ -4059,6 +4056,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_animateg.obj \
$(OBJS)\advdll_bmpcbox.obj \
$(OBJS)\advdll_calctrl.obj \
+ $(OBJS)\advdll_commandlinkbutton.obj \
$(OBJS)\advdll_datecontrols.obj \
$(OBJS)\advdll_datectrl.obj
!endif
@@ -4092,7 +4090,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_wizard.obj \
$(OBJS)\advdll_taskbarcmn.obj \
$(OBJS)\advdll_aboutdlg.obj \
- $(OBJS)\advdll_commandlinkbutton.obj \
$(OBJS)\advdll_hyperlink.obj \
$(OBJS)\advdll_notifmsg.obj \
$(OBJS)\advdll_sound.obj \
@@ -4134,7 +4131,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_wizard.obj \
$(OBJS)\advlib_taskbarcmn.obj \
$(OBJS)\advlib_aboutdlg.obj \
- $(OBJS)\advlib_commandlinkbutton.obj \
$(OBJS)\advlib_hyperlink.obj \
$(OBJS)\advlib_notifmsg.obj \
$(OBJS)\advlib_sound.obj \
@@ -4143,6 +4139,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_animateg.obj \
$(OBJS)\advlib_bmpcbox.obj \
$(OBJS)\advlib_calctrl.obj \
+ $(OBJS)\advlib_commandlinkbutton.obj \
$(OBJS)\advlib_datecontrols.obj \
$(OBJS)\advlib_datectrl.obj
!endif
@@ -4176,7 +4173,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_wizard.obj \
$(OBJS)\advlib_taskbarcmn.obj \
$(OBJS)\advlib_aboutdlg.obj \
- $(OBJS)\advlib_commandlinkbutton.obj \
$(OBJS)\advlib_hyperlink.obj \
$(OBJS)\advlib_notifmsg.obj \
$(OBJS)\advlib_sound.obj \
@@ -6413,6 +6409,9 @@ $(OBJS)\monodll_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
$(OBJS)\monodll_calctrl.obj: ..\..\src\msw\calctrl.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\calctrl.cpp
+$(OBJS)\monodll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
+ $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
+
$(OBJS)\monodll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
@@ -7941,11 +7940,6 @@ $(OBJS)\monodll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
!endif
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
- $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
-!endif
-
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
@@ -8657,6 +8651,9 @@ $(OBJS)\monolib_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
$(OBJS)\monolib_calctrl.obj: ..\..\src\msw\calctrl.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\calctrl.cpp
+$(OBJS)\monolib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
+ $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
+
$(OBJS)\monolib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
@@ -10185,11 +10182,6 @@ $(OBJS)\monolib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
!endif
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
- $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
-!endif
-
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
@@ -13605,6 +13597,9 @@ $(OBJS)\advdll_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
$(OBJS)\advdll_calctrl.obj: ..\..\src\msw\calctrl.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\calctrl.cpp
+$(OBJS)\advdll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
+ $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
+
$(OBJS)\advdll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
@@ -13695,9 +13690,6 @@ $(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
$(OBJS)\advdll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
-$(OBJS)\advdll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
- $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
-
$(OBJS)\advdll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
@@ -13725,6 +13717,9 @@ $(OBJS)\advlib_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
$(OBJS)\advlib_calctrl.obj: ..\..\src\msw\calctrl.cpp
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\calctrl.cpp
+$(OBJS)\advlib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
+ $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
+
$(OBJS)\advlib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
@@ -13815,9 +13810,6 @@ $(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
$(OBJS)\advlib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
-$(OBJS)\advlib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
- $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
-
$(OBJS)\advlib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 8a27ad0a9c..6250b3c132 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -2217,7 +2217,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_wizard.o \
$(OBJS)\monodll_taskbarcmn.o \
$(OBJS)\monodll_aboutdlg.o \
- $(OBJS)\monodll_commandlinkbutton.o \
$(OBJS)\monodll_hyperlink.o \
$(OBJS)\monodll_notifmsg.o \
$(OBJS)\monodll_sound.o \
@@ -2226,6 +2225,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_animateg.o \
$(OBJS)\monodll_bmpcbox.o \
$(OBJS)\monodll_calctrl.o \
+ $(OBJS)\monodll_commandlinkbutton.o \
$(OBJS)\monodll_datecontrols.o \
$(OBJS)\monodll_datectrl.o
endif
@@ -2259,7 +2259,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_wizard.o \
$(OBJS)\monodll_taskbarcmn.o \
$(OBJS)\monodll_aboutdlg.o \
- $(OBJS)\monodll_commandlinkbutton.o \
$(OBJS)\monodll_hyperlink.o \
$(OBJS)\monodll_notifmsg.o \
$(OBJS)\monodll_sound.o \
@@ -2946,7 +2945,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_wizard.o \
$(OBJS)\monolib_taskbarcmn.o \
$(OBJS)\monolib_aboutdlg.o \
- $(OBJS)\monolib_commandlinkbutton.o \
$(OBJS)\monolib_hyperlink.o \
$(OBJS)\monolib_notifmsg.o \
$(OBJS)\monolib_sound.o \
@@ -2955,6 +2953,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_animateg.o \
$(OBJS)\monolib_bmpcbox.o \
$(OBJS)\monolib_calctrl.o \
+ $(OBJS)\monolib_commandlinkbutton.o \
$(OBJS)\monolib_datecontrols.o \
$(OBJS)\monolib_datectrl.o
endif
@@ -2988,7 +2987,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_wizard.o \
$(OBJS)\monolib_taskbarcmn.o \
$(OBJS)\monolib_aboutdlg.o \
- $(OBJS)\monolib_commandlinkbutton.o \
$(OBJS)\monolib_hyperlink.o \
$(OBJS)\monolib_notifmsg.o \
$(OBJS)\monolib_sound.o \
@@ -4098,7 +4096,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_wizard.o \
$(OBJS)\advdll_taskbarcmn.o \
$(OBJS)\advdll_aboutdlg.o \
- $(OBJS)\advdll_commandlinkbutton.o \
$(OBJS)\advdll_hyperlink.o \
$(OBJS)\advdll_notifmsg.o \
$(OBJS)\advdll_sound.o \
@@ -4107,6 +4104,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_animateg.o \
$(OBJS)\advdll_bmpcbox.o \
$(OBJS)\advdll_calctrl.o \
+ $(OBJS)\advdll_commandlinkbutton.o \
$(OBJS)\advdll_datecontrols.o \
$(OBJS)\advdll_datectrl.o
endif
@@ -4140,7 +4138,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_wizard.o \
$(OBJS)\advdll_taskbarcmn.o \
$(OBJS)\advdll_aboutdlg.o \
- $(OBJS)\advdll_commandlinkbutton.o \
$(OBJS)\advdll_hyperlink.o \
$(OBJS)\advdll_notifmsg.o \
$(OBJS)\advdll_sound.o \
@@ -4186,7 +4183,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_wizard.o \
$(OBJS)\advlib_taskbarcmn.o \
$(OBJS)\advlib_aboutdlg.o \
- $(OBJS)\advlib_commandlinkbutton.o \
$(OBJS)\advlib_hyperlink.o \
$(OBJS)\advlib_notifmsg.o \
$(OBJS)\advlib_sound.o \
@@ -4195,6 +4191,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_animateg.o \
$(OBJS)\advlib_bmpcbox.o \
$(OBJS)\advlib_calctrl.o \
+ $(OBJS)\advlib_commandlinkbutton.o \
$(OBJS)\advlib_datecontrols.o \
$(OBJS)\advlib_datectrl.o
endif
@@ -4228,7 +4225,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_wizard.o \
$(OBJS)\advlib_taskbarcmn.o \
$(OBJS)\advlib_aboutdlg.o \
- $(OBJS)\advlib_commandlinkbutton.o \
$(OBJS)\advlib_hyperlink.o \
$(OBJS)\advlib_notifmsg.o \
$(OBJS)\advlib_sound.o \
@@ -6563,6 +6559,9 @@ $(OBJS)\monodll_bmpcbox.o: ../../src/msw/bmpcbox.cpp
$(OBJS)\monodll_calctrl.o: ../../src/msw/calctrl.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+$(OBJS)\monodll_commandlinkbutton.o: ../../src/msw/commandlinkbutton.cpp
+ $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
$(OBJS)\monodll_datecontrols.o: ../../src/msw/datecontrols.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -8091,11 +8090,6 @@ $(OBJS)\monodll_aboutdlg.o: ../../src/msw/aboutdlg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
-ifeq ($(USE_GUI),1)
-$(OBJS)\monodll_commandlinkbutton.o: ../../src/msw/commandlinkbutton.cpp
- $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-endif
-
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_hyperlink.o: ../../src/msw/hyperlink.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -8807,6 +8801,9 @@ $(OBJS)\monolib_bmpcbox.o: ../../src/msw/bmpcbox.cpp
$(OBJS)\monolib_calctrl.o: ../../src/msw/calctrl.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+$(OBJS)\monolib_commandlinkbutton.o: ../../src/msw/commandlinkbutton.cpp
+ $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
$(OBJS)\monolib_datecontrols.o: ../../src/msw/datecontrols.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -10335,11 +10332,6 @@ $(OBJS)\monolib_aboutdlg.o: ../../src/msw/aboutdlg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
-ifeq ($(USE_GUI),1)
-$(OBJS)\monolib_commandlinkbutton.o: ../../src/msw/commandlinkbutton.cpp
- $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-endif
-
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_hyperlink.o: ../../src/msw/hyperlink.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -13755,6 +13747,9 @@ $(OBJS)\advdll_bmpcbox.o: ../../src/msw/bmpcbox.cpp
$(OBJS)\advdll_calctrl.o: ../../src/msw/calctrl.cpp
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+$(OBJS)\advdll_commandlinkbutton.o: ../../src/msw/commandlinkbutton.cpp
+ $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
+
$(OBJS)\advdll_datecontrols.o: ../../src/msw/datecontrols.cpp
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -13845,9 +13840,6 @@ $(OBJS)\advdll_taskbarcmn.o: ../../src/common/taskbarcmn.cpp
$(OBJS)\advdll_aboutdlg.o: ../../src/msw/aboutdlg.cpp
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\advdll_commandlinkbutton.o: ../../src/msw/commandlinkbutton.cpp
- $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
-
$(OBJS)\advdll_hyperlink.o: ../../src/msw/hyperlink.cpp
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -13875,6 +13867,9 @@ $(OBJS)\advlib_bmpcbox.o: ../../src/msw/bmpcbox.cpp
$(OBJS)\advlib_calctrl.o: ../../src/msw/calctrl.cpp
$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+$(OBJS)\advlib_commandlinkbutton.o: ../../src/msw/commandlinkbutton.cpp
+ $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
+
$(OBJS)\advlib_datecontrols.o: ../../src/msw/datecontrols.cpp
$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -13965,9 +13960,6 @@ $(OBJS)\advlib_taskbarcmn.o: ../../src/common/taskbarcmn.cpp
$(OBJS)\advlib_aboutdlg.o: ../../src/msw/aboutdlg.cpp
$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\advlib_commandlinkbutton.o: ../../src/msw/commandlinkbutton.cpp
- $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
-
$(OBJS)\advlib_hyperlink.o: ../../src/msw/hyperlink.cpp
$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index b36a4689c3..aa7872f7af 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -2411,7 +2411,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_wizard.obj \
$(OBJS)\monodll_taskbarcmn.obj \
$(OBJS)\monodll_aboutdlg.obj \
- $(OBJS)\monodll_commandlinkbutton.obj \
$(OBJS)\monodll_hyperlink.obj \
$(OBJS)\monodll_notifmsg.obj \
$(OBJS)\monodll_sound.obj \
@@ -2420,6 +2419,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_animateg.obj \
$(OBJS)\monodll_bmpcbox.obj \
$(OBJS)\monodll_calctrl.obj \
+ $(OBJS)\monodll_commandlinkbutton.obj \
$(OBJS)\monodll_datecontrols.obj \
$(OBJS)\monodll_datectrl.obj
!endif
@@ -2453,7 +2453,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_wizard.obj \
$(OBJS)\monodll_taskbarcmn.obj \
$(OBJS)\monodll_aboutdlg.obj \
- $(OBJS)\monodll_commandlinkbutton.obj \
$(OBJS)\monodll_hyperlink.obj \
$(OBJS)\monodll_notifmsg.obj \
$(OBJS)\monodll_sound.obj \
@@ -3140,7 +3139,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_wizard.obj \
$(OBJS)\monolib_taskbarcmn.obj \
$(OBJS)\monolib_aboutdlg.obj \
- $(OBJS)\monolib_commandlinkbutton.obj \
$(OBJS)\monolib_hyperlink.obj \
$(OBJS)\monolib_notifmsg.obj \
$(OBJS)\monolib_sound.obj \
@@ -3149,6 +3147,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_animateg.obj \
$(OBJS)\monolib_bmpcbox.obj \
$(OBJS)\monolib_calctrl.obj \
+ $(OBJS)\monolib_commandlinkbutton.obj \
$(OBJS)\monolib_datecontrols.obj \
$(OBJS)\monolib_datectrl.obj
!endif
@@ -3182,7 +3181,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_wizard.obj \
$(OBJS)\monolib_taskbarcmn.obj \
$(OBJS)\monolib_aboutdlg.obj \
- $(OBJS)\monolib_commandlinkbutton.obj \
$(OBJS)\monolib_hyperlink.obj \
$(OBJS)\monolib_notifmsg.obj \
$(OBJS)\monolib_sound.obj \
@@ -4354,7 +4352,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_wizard.obj \
$(OBJS)\advdll_taskbarcmn.obj \
$(OBJS)\advdll_aboutdlg.obj \
- $(OBJS)\advdll_commandlinkbutton.obj \
$(OBJS)\advdll_hyperlink.obj \
$(OBJS)\advdll_notifmsg.obj \
$(OBJS)\advdll_sound.obj \
@@ -4363,6 +4360,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_animateg.obj \
$(OBJS)\advdll_bmpcbox.obj \
$(OBJS)\advdll_calctrl.obj \
+ $(OBJS)\advdll_commandlinkbutton.obj \
$(OBJS)\advdll_datecontrols.obj \
$(OBJS)\advdll_datectrl.obj
!endif
@@ -4396,7 +4394,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_wizard.obj \
$(OBJS)\advdll_taskbarcmn.obj \
$(OBJS)\advdll_aboutdlg.obj \
- $(OBJS)\advdll_commandlinkbutton.obj \
$(OBJS)\advdll_hyperlink.obj \
$(OBJS)\advdll_notifmsg.obj \
$(OBJS)\advdll_sound.obj \
@@ -4444,7 +4441,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_wizard.obj \
$(OBJS)\advlib_taskbarcmn.obj \
$(OBJS)\advlib_aboutdlg.obj \
- $(OBJS)\advlib_commandlinkbutton.obj \
$(OBJS)\advlib_hyperlink.obj \
$(OBJS)\advlib_notifmsg.obj \
$(OBJS)\advlib_sound.obj \
@@ -4453,6 +4449,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_animateg.obj \
$(OBJS)\advlib_bmpcbox.obj \
$(OBJS)\advlib_calctrl.obj \
+ $(OBJS)\advlib_commandlinkbutton.obj \
$(OBJS)\advlib_datecontrols.obj \
$(OBJS)\advlib_datectrl.obj
!endif
@@ -4486,7 +4483,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_wizard.obj \
$(OBJS)\advlib_taskbarcmn.obj \
$(OBJS)\advlib_aboutdlg.obj \
- $(OBJS)\advlib_commandlinkbutton.obj \
$(OBJS)\advlib_hyperlink.obj \
$(OBJS)\advlib_notifmsg.obj \
$(OBJS)\advlib_sound.obj \
@@ -6993,6 +6989,9 @@ $(OBJS)\monodll_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
$(OBJS)\monodll_calctrl.obj: ..\..\src\msw\calctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\calctrl.cpp
+$(OBJS)\monodll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
+
$(OBJS)\monodll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
@@ -8521,11 +8520,6 @@ $(OBJS)\monodll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
!endif
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monodll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
-!endif
-
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
@@ -9237,6 +9231,9 @@ $(OBJS)\monolib_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
$(OBJS)\monolib_calctrl.obj: ..\..\src\msw\calctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\calctrl.cpp
+$(OBJS)\monolib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
+
$(OBJS)\monolib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
@@ -10765,11 +10762,6 @@ $(OBJS)\monolib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
!endif
-!if "$(USE_GUI)" == "1"
-$(OBJS)\monolib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
-!endif
-
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
@@ -14185,6 +14177,9 @@ $(OBJS)\advdll_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
$(OBJS)\advdll_calctrl.obj: ..\..\src\msw\calctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\calctrl.cpp
+$(OBJS)\advdll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
+
$(OBJS)\advdll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
@@ -14275,9 +14270,6 @@ $(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
$(OBJS)\advdll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
-$(OBJS)\advdll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
-
$(OBJS)\advdll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
@@ -14305,6 +14297,9 @@ $(OBJS)\advlib_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp
$(OBJS)\advlib_calctrl.obj: ..\..\src\msw\calctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\calctrl.cpp
+$(OBJS)\advlib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
+
$(OBJS)\advlib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datecontrols.cpp
@@ -14395,9 +14390,6 @@ $(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp
$(OBJS)\advlib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp
-$(OBJS)\advlib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp
-
$(OBJS)\advlib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index 741a2eb381..e9aa89675a 100644
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -773,7 +773,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_wizard.obj &
$(OBJS)\monodll_taskbarcmn.obj &
$(OBJS)\monodll_aboutdlg.obj &
- $(OBJS)\monodll_commandlinkbutton.obj &
$(OBJS)\monodll_hyperlink.obj &
$(OBJS)\monodll_notifmsg.obj &
$(OBJS)\monodll_sound.obj &
@@ -782,6 +781,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_animateg.obj &
$(OBJS)\monodll_bmpcbox.obj &
$(OBJS)\monodll_calctrl.obj &
+ $(OBJS)\monodll_commandlinkbutton.obj &
$(OBJS)\monodll_datecontrols.obj &
$(OBJS)\monodll_datectrl.obj
!endif
@@ -815,7 +815,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_wizard.obj &
$(OBJS)\monodll_taskbarcmn.obj &
$(OBJS)\monodll_aboutdlg.obj &
- $(OBJS)\monodll_commandlinkbutton.obj &
$(OBJS)\monodll_hyperlink.obj &
$(OBJS)\monodll_notifmsg.obj &
$(OBJS)\monodll_sound.obj &
@@ -1507,7 +1506,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_wizard.obj &
$(OBJS)\monolib_taskbarcmn.obj &
$(OBJS)\monolib_aboutdlg.obj &
- $(OBJS)\monolib_commandlinkbutton.obj &
$(OBJS)\monolib_hyperlink.obj &
$(OBJS)\monolib_notifmsg.obj &
$(OBJS)\monolib_sound.obj &
@@ -1516,6 +1514,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_animateg.obj &
$(OBJS)\monolib_bmpcbox.obj &
$(OBJS)\monolib_calctrl.obj &
+ $(OBJS)\monolib_commandlinkbutton.obj &
$(OBJS)\monolib_datecontrols.obj &
$(OBJS)\monolib_datectrl.obj
!endif
@@ -1549,7 +1548,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_wizard.obj &
$(OBJS)\monolib_taskbarcmn.obj &
$(OBJS)\monolib_aboutdlg.obj &
- $(OBJS)\monolib_commandlinkbutton.obj &
$(OBJS)\monolib_hyperlink.obj &
$(OBJS)\monolib_notifmsg.obj &
$(OBJS)\monolib_sound.obj &
@@ -2675,7 +2673,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\advdll_wizard.obj &
$(OBJS)\advdll_taskbarcmn.obj &
$(OBJS)\advdll_aboutdlg.obj &
- $(OBJS)\advdll_commandlinkbutton.obj &
$(OBJS)\advdll_hyperlink.obj &
$(OBJS)\advdll_notifmsg.obj &
$(OBJS)\advdll_sound.obj &
@@ -2684,6 +2681,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\advdll_animateg.obj &
$(OBJS)\advdll_bmpcbox.obj &
$(OBJS)\advdll_calctrl.obj &
+ $(OBJS)\advdll_commandlinkbutton.obj &
$(OBJS)\advdll_datecontrols.obj &
$(OBJS)\advdll_datectrl.obj
!endif
@@ -2717,7 +2715,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\advdll_wizard.obj &
$(OBJS)\advdll_taskbarcmn.obj &
$(OBJS)\advdll_aboutdlg.obj &
- $(OBJS)\advdll_commandlinkbutton.obj &
$(OBJS)\advdll_hyperlink.obj &
$(OBJS)\advdll_notifmsg.obj &
$(OBJS)\advdll_sound.obj &
@@ -2765,7 +2762,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\advlib_wizard.obj &
$(OBJS)\advlib_taskbarcmn.obj &
$(OBJS)\advlib_aboutdlg.obj &
- $(OBJS)\advlib_commandlinkbutton.obj &
$(OBJS)\advlib_hyperlink.obj &
$(OBJS)\advlib_notifmsg.obj &
$(OBJS)\advlib_sound.obj &
@@ -2774,6 +2770,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\advlib_animateg.obj &
$(OBJS)\advlib_bmpcbox.obj &
$(OBJS)\advlib_calctrl.obj &
+ $(OBJS)\advlib_commandlinkbutton.obj &
$(OBJS)\advlib_datecontrols.obj &
$(OBJS)\advlib_datectrl.obj
!endif
@@ -2807,7 +2804,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\advlib_wizard.obj &
$(OBJS)\advlib_taskbarcmn.obj &
$(OBJS)\advlib_aboutdlg.obj &
- $(OBJS)\advlib_commandlinkbutton.obj &
$(OBJS)\advlib_hyperlink.obj &
$(OBJS)\advlib_notifmsg.obj &
$(OBJS)\advlib_sound.obj &
@@ -6822,6 +6818,9 @@ $(OBJS)\monodll_bmpcbox.obj : .AUTODEPEND ..\..\src\msw\bmpcbox.cpp
$(OBJS)\monodll_calctrl.obj : .AUTODEPEND ..\..\src\msw\calctrl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+$(OBJS)\monodll_commandlinkbutton.obj : .AUTODEPEND ..\..\src\msw\commandlinkbutton.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
$(OBJS)\monodll_datecontrols.obj : .AUTODEPEND ..\..\src\msw\datecontrols.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -8350,11 +8349,6 @@ $(OBJS)\monodll_aboutdlg.obj : .AUTODEPEND ..\..\src\msw\aboutdlg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
-!ifeq USE_GUI 1
-$(OBJS)\monodll_commandlinkbutton.obj : .AUTODEPEND ..\..\src\msw\commandlinkbutton.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
-!endif
-
!ifeq USE_GUI 1
$(OBJS)\monodll_hyperlink.obj : .AUTODEPEND ..\..\src\msw\hyperlink.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -9066,6 +9060,9 @@ $(OBJS)\monolib_bmpcbox.obj : .AUTODEPEND ..\..\src\msw\bmpcbox.cpp
$(OBJS)\monolib_calctrl.obj : .AUTODEPEND ..\..\src\msw\calctrl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+$(OBJS)\monolib_commandlinkbutton.obj : .AUTODEPEND ..\..\src\msw\commandlinkbutton.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
$(OBJS)\monolib_datecontrols.obj : .AUTODEPEND ..\..\src\msw\datecontrols.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -10594,11 +10591,6 @@ $(OBJS)\monolib_aboutdlg.obj : .AUTODEPEND ..\..\src\msw\aboutdlg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
-!ifeq USE_GUI 1
-$(OBJS)\monolib_commandlinkbutton.obj : .AUTODEPEND ..\..\src\msw\commandlinkbutton.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
-!endif
-
!ifeq USE_GUI 1
$(OBJS)\monolib_hyperlink.obj : .AUTODEPEND ..\..\src\msw\hyperlink.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -14014,6 +14006,9 @@ $(OBJS)\advdll_bmpcbox.obj : .AUTODEPEND ..\..\src\msw\bmpcbox.cpp
$(OBJS)\advdll_calctrl.obj : .AUTODEPEND ..\..\src\msw\calctrl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+$(OBJS)\advdll_commandlinkbutton.obj : .AUTODEPEND ..\..\src\msw\commandlinkbutton.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
+
$(OBJS)\advdll_datecontrols.obj : .AUTODEPEND ..\..\src\msw\datecontrols.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
@@ -14104,9 +14099,6 @@ $(OBJS)\advdll_taskbarcmn.obj : .AUTODEPEND ..\..\src\common\taskbarcmn.cpp
$(OBJS)\advdll_aboutdlg.obj : .AUTODEPEND ..\..\src\msw\aboutdlg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-$(OBJS)\advdll_commandlinkbutton.obj : .AUTODEPEND ..\..\src\msw\commandlinkbutton.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
-
$(OBJS)\advdll_hyperlink.obj : .AUTODEPEND ..\..\src\msw\hyperlink.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
@@ -14134,6 +14126,9 @@ $(OBJS)\advlib_bmpcbox.obj : .AUTODEPEND ..\..\src\msw\bmpcbox.cpp
$(OBJS)\advlib_calctrl.obj : .AUTODEPEND ..\..\src\msw\calctrl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+$(OBJS)\advlib_commandlinkbutton.obj : .AUTODEPEND ..\..\src\msw\commandlinkbutton.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
+
$(OBJS)\advlib_datecontrols.obj : .AUTODEPEND ..\..\src\msw\datecontrols.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
@@ -14224,9 +14219,6 @@ $(OBJS)\advlib_taskbarcmn.obj : .AUTODEPEND ..\..\src\common\taskbarcmn.cpp
$(OBJS)\advlib_aboutdlg.obj : .AUTODEPEND ..\..\src\msw\aboutdlg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-$(OBJS)\advlib_commandlinkbutton.obj : .AUTODEPEND ..\..\src\msw\commandlinkbutton.cpp
- $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
-
$(OBJS)\advlib_hyperlink.obj : .AUTODEPEND ..\..\src\msw\hyperlink.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
diff --git a/build/msw/wx_adv.dsp b/build/msw/wx_adv.dsp
index 199de88755..3beb8ac089 100644
--- a/build/msw/wx_adv.dsp
+++ b/build/msw/wx_adv.dsp
@@ -353,6 +353,37 @@ SOURCE=..\..\src\msw\calctrl.cpp
# Begin Source File
SOURCE=..\..\src\msw\commandlinkbutton.cpp
+
+!IF "$(CFG)" == "adv - Win32 DLL Universal Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Universal Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Release"
+
+
+!ELSEIF "$(CFG)" == "adv - Win32 DLL Debug"
+
+
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "adv - Win32 Universal Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF "$(CFG)" == "adv - Win32 Release"
+
+
+!ELSEIF "$(CFG)" == "adv - Win32 Debug"
+
+
+!ENDIF
+
# End Source File
# Begin Source File
diff --git a/build/msw/wx_vc7_adv.vcproj b/build/msw/wx_vc7_adv.vcproj
index b267fb8673..6b2d024a7b 100644
--- a/build/msw/wx_vc7_adv.vcproj
+++ b/build/msw/wx_vc7_adv.vcproj
@@ -636,6 +636,18 @@
</File>
<File
RelativePath="..\..\src\msw\commandlinkbutton.cpp">
+ <FileConfiguration
+ Name="Universal Debug|Win32"
+ ExcludedFromBuild="TRUE"/>
+ <FileConfiguration
+ Name="Universal Release|Win32"
+ ExcludedFromBuild="TRUE"/>
+ <FileConfiguration
+ Name="DLL Universal Debug|Win32"
+ ExcludedFromBuild="TRUE"/>
+ <FileConfiguration
+ Name="DLL Universal Release|Win32"
+ ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\datecontrols.cpp">
diff --git a/build/msw/wx_vc8_adv.vcproj b/build/msw/wx_vc8_adv.vcproj
index 4a3dc208d5..34e42c6ed1 100644
--- a/build/msw/wx_vc8_adv.vcproj
+++ b/build/msw/wx_vc8_adv.vcproj
@@ -882,6 +882,22 @@
<File
RelativePath="..\..\src\msw\commandlinkbutton.cpp"
>
+ <FileConfiguration
+ Name="Universal Debug|Win32"
+ ExcludedFromBuild="true"
+ />
+ <FileConfiguration
+ Name="Universal Release|Win32"
+ ExcludedFromBuild="true"
+ />
+ <FileConfiguration
+ Name="DLL Universal Debug|Win32"
+ ExcludedFromBuild="true"
+ />
+ <FileConfiguration
+ Name="DLL Universal Release|Win32"
+ ExcludedFromBuild="true"
+ />
</File>
<File
RelativePath="..\..\src\msw\datecontrols.cpp"
diff --git a/build/msw/wx_vc9_adv.vcproj b/build/msw/wx_vc9_adv.vcproj
index 4671821eda..48d8fc9bf0 100644
--- a/build/msw/wx_vc9_adv.vcproj
+++ b/build/msw/wx_vc9_adv.vcproj
@@ -878,6 +878,22 @@
<File
RelativePath="..\..\src\msw\commandlinkbutton.cpp"
>
+ <FileConfiguration
+ Name="Universal Debug|Win32"
+ ExcludedFromBuild="true"
+ />
+ <FileConfiguration
+ Name="Universal Release|Win32"
+ ExcludedFromBuild="true"
+ />
+ <FileConfiguration
+ Name="DLL Universal Debug|Win32"
+ ExcludedFromBuild="true"
+ />
+ <FileConfiguration
+ Name="DLL Universal Release|Win32"
+ ExcludedFromBuild="true"
+ />
</File>
<File
RelativePath="..\..\src\msw\datecontrols.cpp"
--
2.47.2