Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use native MSW wxHyperlinkCtrl implementation in wxUniv.

Browse Source 
Move src/msw/hyperlink.cpp and include/wx/msw/hyperlink.h to
ADVANCED_MSW_NATIVE_SRC/HDR from ADVANCED_MSW_SRC/HDR respectively to ensure
that these files are not used in wxUniv build that uses its own, generic,
versions.

This should fix wxUniv/MSW build as the native files didn't even compile with
wxUniv.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-05-23 15:26:42 +00:00
parent 2e103d05f1
commit 218697e27b
10 changed files with 205 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
build/msw/makefile.bcc
View File

@@ -2247,7 +2247,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_wizard.obj \
$(OBJS)\monodll_taskbarcmn.obj \
$(OBJS)\monodll_aboutdlg.obj \
$(OBJS)\monodll_hyperlink.obj \
$(OBJS)\monodll_notifmsg.obj \
$(OBJS)\monodll_sound.obj \
$(OBJS)\monodll_taskbar.obj \
@@ -2257,7 +2256,8 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_calctrl.obj \
$(OBJS)\monodll_commandlinkbutton.obj \
$(OBJS)\monodll_datecontrols.obj \
$(OBJS)\monodll_datectrl.obj
$(OBJS)\monodll_datectrl.obj \
$(OBJS)\monodll_hyperlink.obj
!endif
!if "$(WXUNIV)" == "1"
____ADVANCED_SRC_FILENAMES_OBJECTS = \
@@ -2291,7 +2291,6 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_wizard.obj \
$(OBJS)\monodll_taskbarcmn.obj \
$(OBJS)\monodll_aboutdlg.obj \
$(OBJS)\monodll_hyperlink.obj \
$(OBJS)\monodll_notifmsg.obj \
$(OBJS)\monodll_sound.obj \
$(OBJS)\monodll_taskbar.obj \
@@ -3011,7 +3010,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_wizard.obj \
$(OBJS)\monolib_taskbarcmn.obj \
$(OBJS)\monolib_aboutdlg.obj \
$(OBJS)\monolib_hyperlink.obj \
$(OBJS)\monolib_notifmsg.obj \
$(OBJS)\monolib_sound.obj \
$(OBJS)\monolib_taskbar.obj \
@@ -3021,7 +3019,8 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_calctrl.obj \
$(OBJS)\monolib_commandlinkbutton.obj \
$(OBJS)\monolib_datecontrols.obj \
$(OBJS)\monolib_datectrl.obj
$(OBJS)\monolib_datectrl.obj \
$(OBJS)\monolib_hyperlink.obj
!endif
!if "$(WXUNIV)" == "1"
____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
@@ -3055,7 +3054,6 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_wizard.obj \
$(OBJS)\monolib_taskbarcmn.obj \
$(OBJS)\monolib_aboutdlg.obj \
$(OBJS)\monolib_hyperlink.obj \
$(OBJS)\monolib_notifmsg.obj \
$(OBJS)\monolib_sound.obj \
$(OBJS)\monolib_taskbar.obj \
@@ -4214,7 +4212,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_wizard.obj \
$(OBJS)\advdll_taskbarcmn.obj \
$(OBJS)\advdll_aboutdlg.obj \
$(OBJS)\advdll_hyperlink.obj \
$(OBJS)\advdll_notifmsg.obj \
$(OBJS)\advdll_sound.obj \
$(OBJS)\advdll_taskbar.obj \
@@ -4224,7 +4221,8 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_calctrl.obj \
$(OBJS)\advdll_commandlinkbutton.obj \
$(OBJS)\advdll_datecontrols.obj \
$(OBJS)\advdll_datectrl.obj
$(OBJS)\advdll_datectrl.obj \
$(OBJS)\advdll_hyperlink.obj
!endif
!if "$(WXUNIV)" == "1"
____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
@@ -4258,7 +4256,6 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_wizard.obj \
$(OBJS)\advdll_taskbarcmn.obj \
$(OBJS)\advdll_aboutdlg.obj \
$(OBJS)\advdll_hyperlink.obj \
$(OBJS)\advdll_notifmsg.obj \
$(OBJS)\advdll_sound.obj \
$(OBJS)\advdll_taskbar.obj \
@@ -4301,7 +4298,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_wizard.obj \
$(OBJS)\advlib_taskbarcmn.obj \
$(OBJS)\advlib_aboutdlg.obj \
$(OBJS)\advlib_hyperlink.obj \
$(OBJS)\advlib_notifmsg.obj \
$(OBJS)\advlib_sound.obj \
$(OBJS)\advlib_taskbar.obj \
@@ -4311,7 +4307,8 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_calctrl.obj \
$(OBJS)\advlib_commandlinkbutton.obj \
$(OBJS)\advlib_datecontrols.obj \
$(OBJS)\advlib_datectrl.obj
$(OBJS)\advlib_datectrl.obj \
$(OBJS)\advlib_hyperlink.obj
!endif
!if "$(WXUNIV)" == "1"
____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
@@ -4345,7 +4342,6 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_wizard.obj \
$(OBJS)\advlib_taskbarcmn.obj \
$(OBJS)\advlib_aboutdlg.obj \
$(OBJS)\advlib_hyperlink.obj \
$(OBJS)\advlib_notifmsg.obj \
$(OBJS)\advlib_sound.obj \
$(OBJS)\advlib_taskbar.obj \
@@ -6593,6 +6589,9 @@ $(OBJS)\monodll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
$(OBJS)\monodll_datectrl.obj: ..\..\src\msw\datectrl.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp
$(OBJS)\monodll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
$(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp
@@ -8220,11 +8219,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_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
@@ -8943,6 +8937,9 @@ $(OBJS)\monolib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
$(OBJS)\monolib_datectrl.obj: ..\..\src\msw\datectrl.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp
$(OBJS)\monolib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
$(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp
@@ -10570,11 +10567,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_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
@@ -14190,6 +14182,9 @@ $(OBJS)\advdll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
$(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp
$(OBJS)\advdll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
$(OBJS)\advdll_animatecmn.obj: ..\..\src\common\animatecmn.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp
@@ -14280,9 +14275,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_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
$(OBJS)\advdll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp
@@ -14316,6 +14308,9 @@ $(OBJS)\advlib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp
$(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp
$(OBJS)\advlib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
$(OBJS)\advlib_animatecmn.obj: ..\..\src\common\animatecmn.cpp
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp
@@ -14406,9 +14401,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_hyperlink.obj: ..\..\src\msw\hyperlink.cpp
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp
$(OBJS)\advlib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp