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

Renamed helpwin.h/cpp to helpwnd.h/cpp to avoid clash

Browse Source 
Added back GetFrame/GetDialog for compatibility and consistency


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-01-11 08:59:17 +00:00
parent aec7c82991
commit f3e156efb0
14 changed files with 102 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
build/msw/makefile.bcc
View File

@@ -772,7 +772,7 @@ HTMLDLL_OBJECTS = \
$(OBJS)\htmldll_helpdata.obj \
$(OBJS)\htmldll_helpdlg.obj \
$(OBJS)\htmldll_helpfrm.obj \
$(OBJS)\htmldll_helpwin.obj \
$(OBJS)\htmldll_helpwnd.obj \
$(OBJS)\htmldll_htmlcell.obj \
$(OBJS)\htmldll_htmlfilt.obj \
$(OBJS)\htmldll_htmlpars.obj \
@@ -805,7 +805,7 @@ HTMLLIB_OBJECTS = \
$(OBJS)\htmllib_helpdata.obj \
$(OBJS)\htmllib_helpdlg.obj \
$(OBJS)\htmllib_helpfrm.obj \
$(OBJS)\htmllib_helpwin.obj \
$(OBJS)\htmllib_helpwnd.obj \
$(OBJS)\htmllib_htmlcell.obj \
$(OBJS)\htmllib_htmlfilt.obj \
$(OBJS)\htmllib_htmlpars.obj \
@@ -1068,7 +1068,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_helpdata.obj \
$(OBJS)\monodll_helpdlg.obj \
$(OBJS)\monodll_helpfrm.obj \
$(OBJS)\monodll_helpwin.obj \
$(OBJS)\monodll_helpwnd.obj \
$(OBJS)\monodll_htmlcell.obj \
$(OBJS)\monodll_htmlfilt.obj \
$(OBJS)\monodll_htmlpars.obj \
@@ -1596,7 +1596,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_helpdata.obj \
$(OBJS)\monolib_helpdlg.obj \
$(OBJS)\monolib_helpfrm.obj \
$(OBJS)\monolib_helpwin.obj \
$(OBJS)\monolib_helpwnd.obj \
$(OBJS)\monolib_htmlcell.obj \
$(OBJS)\monolib_htmlfilt.obj \
$(OBJS)\monolib_htmlpars.obj \
@@ -4433,6 +4433,9 @@ $(OBJS)\monodll_helpdlg.obj: ..\..\src\html\helpdlg.cpp
$(OBJS)\monodll_helpfrm.obj: ..\..\src\html\helpfrm.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_helpwnd.obj: ..\..\src\html\helpwnd.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_htmlcell.obj: ..\..\src\html\htmlcell.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -4873,11 +4876,6 @@ $(OBJS)\monodll_helpwin.obj: ..\..\src\msw\helpwin.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_helpwin.obj: ..\..\src\html\helpwin.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_automtn.obj: ..\..\src\msw\ole\automtn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -6165,6 +6163,9 @@ $(OBJS)\monolib_helpdlg.obj: ..\..\src\html\helpdlg.cpp
$(OBJS)\monolib_helpfrm.obj: ..\..\src\html\helpfrm.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_helpwnd.obj: ..\..\src\html\helpwnd.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_htmlcell.obj: ..\..\src\html\htmlcell.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -6605,11 +6606,6 @@ $(OBJS)\monolib_helpwin.obj: ..\..\src\msw\helpwin.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_helpwin.obj: ..\..\src\html\helpwin.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_automtn.obj: ..\..\src\msw\ole\automtn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -10523,7 +10519,7 @@ $(OBJS)\htmldll_helpdlg.obj: ..\..\src\html\helpdlg.cpp
$(OBJS)\htmldll_helpfrm.obj: ..\..\src\html\helpfrm.cpp
$(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) $**
$(OBJS)\htmldll_helpwin.obj: ..\..\src\html\helpwin.cpp
$(OBJS)\htmldll_helpwnd.obj: ..\..\src\html\helpwnd.cpp
$(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) $**
$(OBJS)\htmldll_htmlcell.obj: ..\..\src\html\htmlcell.cpp
@@ -10598,7 +10594,7 @@ $(OBJS)\htmllib_helpdlg.obj: ..\..\src\html\helpdlg.cpp
$(OBJS)\htmllib_helpfrm.obj: ..\..\src\html\helpfrm.cpp
$(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) $**
$(OBJS)\htmllib_helpwin.obj: ..\..\src\html\helpwin.cpp
$(OBJS)\htmllib_helpwnd.obj: ..\..\src\html\helpwnd.cpp
$(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) $**
$(OBJS)\htmllib_htmlcell.obj: ..\..\src\html\htmlcell.cpp