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

32
Makefile.in
View File

@@ -1137,7 +1137,7 @@ HTMLDLL_OBJECTS = \
htmldll_helpdata.o \
htmldll_helpdlg.o \
htmldll_helpfrm.o \
htmldll_helpwin.o \
htmldll_helpwnd.o \
htmldll_htmlcell.o \
htmldll_htmlfilt.o \
htmldll_htmlpars.o \
@@ -1168,7 +1168,7 @@ HTMLLIB_OBJECTS = \
htmllib_helpdata.o \
htmllib_helpdlg.o \
htmllib_helpfrm.o \
htmllib_helpwin.o \
htmllib_helpwnd.o \
htmllib_htmlcell.o \
htmllib_htmlfilt.o \
htmllib_htmlpars.o \
@@ -2691,10 +2691,10 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \
wx/mediactrl.h \
$(MEDIA_PLATFORM_HDR) \
wx/html/helpctrl.h \
wx/html/helpdlg.h \
wx/html/helpdata.h \
wx/html/helpdlg.h \
wx/html/helpfrm.h \
wx/html/helpwin.h \
wx/html/helpwnd.h \
wx/html/htmlcell.h \
wx/html/htmldefs.h \
wx/html/htmlfilt.h \
@@ -2966,7 +2966,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \
monodll_helpdata.o \
monodll_helpdlg.o \
monodll_helpfrm.o \
monodll_helpwin.o \
monodll_helpwnd.o \
monodll_htmlcell.o \
monodll_htmlfilt.o \
monodll_htmlpars.o \
@@ -4450,7 +4450,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \
monolib_helpdata.o \
monolib_helpdlg.o \
monolib_helpfrm.o \
monolib_helpwin.o \
monolib_helpwnd.o \
monolib_htmlcell.o \
monolib_htmlfilt.o \
monolib_htmlpars.o \
@@ -10885,6 +10885,9 @@ monodll_helpdlg.o: $(srcdir)/src/html/helpdlg.cpp $(MONODLL_ODEP)
monodll_helpfrm.o: $(srcdir)/src/html/helpfrm.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/helpfrm.cpp
monodll_helpwnd.o: $(srcdir)/src/html/helpwnd.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/helpwnd.cpp
monodll_htmlcell.o: $(srcdir)/src/html/htmlcell.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/htmlcell.cpp
@@ -12388,9 +12391,6 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monodll_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/os2/helpwin.cpp
@COND_USE_GUI_1@monodll_helpwin.o: $(srcdir)/src/html/helpwin.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/html/helpwin.cpp
@COND_TOOLKIT_MSW_USE_GUI_1@monodll_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp $(MONODLL_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/msw/ole/automtn.cpp
@@ -14386,6 +14386,9 @@ monolib_helpdlg.o: $(srcdir)/src/html/helpdlg.cpp $(MONOLIB_ODEP)
monolib_helpfrm.o: $(srcdir)/src/html/helpfrm.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/helpfrm.cpp
monolib_helpwnd.o: $(srcdir)/src/html/helpwnd.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/helpwnd.cpp
monolib_htmlcell.o: $(srcdir)/src/html/htmlcell.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/htmlcell.cpp
@@ -15889,9 +15892,6 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@monolib_helpwin.o: $(srcdir)/src/os2/helpwin.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/os2/helpwin.cpp
@COND_USE_GUI_1@monolib_helpwin.o: $(srcdir)/src/html/helpwin.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/html/helpwin.cpp
@COND_TOOLKIT_MSW_USE_GUI_1@monolib_automtn.o: $(srcdir)/src/msw/ole/automtn.cpp $(MONOLIB_ODEP)
@COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/msw/ole/automtn.cpp
@@ -24079,8 +24079,8 @@ htmldll_helpdlg.o: $(srcdir)/src/html/helpdlg.cpp $(HTMLDLL_ODEP)
htmldll_helpfrm.o: $(srcdir)/src/html/helpfrm.cpp $(HTMLDLL_ODEP)
$(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/html/helpfrm.cpp
htmldll_helpwin.o: $(srcdir)/src/html/helpwin.cpp $(HTMLDLL_ODEP)
$(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/html/helpwin.cpp
htmldll_helpwnd.o: $(srcdir)/src/html/helpwnd.cpp $(HTMLDLL_ODEP)
$(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/html/helpwnd.cpp
htmldll_htmlcell.o: $(srcdir)/src/html/htmlcell.cpp $(HTMLDLL_ODEP)
$(CXXC) -c -o $@ $(HTMLDLL_CXXFLAGS) $(srcdir)/src/html/htmlcell.cpp
@@ -24157,8 +24157,8 @@ htmllib_helpdlg.o: $(srcdir)/src/html/helpdlg.cpp $(HTMLLIB_ODEP)
htmllib_helpfrm.o: $(srcdir)/src/html/helpfrm.cpp $(HTMLLIB_ODEP)
$(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/helpfrm.cpp
htmllib_helpwin.o: $(srcdir)/src/html/helpwin.cpp $(HTMLLIB_ODEP)
$(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/helpwin.cpp
htmllib_helpwnd.o: $(srcdir)/src/html/helpwnd.cpp $(HTMLLIB_ODEP)
$(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/helpwnd.cpp
htmllib_htmlcell.o: $(srcdir)/src/html/htmlcell.cpp $(HTMLLIB_ODEP)
$(CXXC) -c -o $@ $(HTMLLIB_CXXFLAGS) $(srcdir)/src/html/htmlcell.cpp

4
build/bakefiles/files.bkl
View File

@@ -2547,7 +2547,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/html/helpdata.cpp
src/html/helpdlg.cpp
src/html/helpfrm.cpp
src/html/helpwin.cpp
src/html/helpwnd.cpp
src/html/htmlcell.cpp
src/html/htmlfilt.cpp
src/html/htmlpars.cpp
@@ -2573,7 +2573,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/html/helpdata.h
wx/html/helpdlg.h
wx/html/helpfrm.h
wx/html/helpwin.h
wx/html/helpwnd.h
wx/html/htmlcell.h
wx/html/htmldefs.h
wx/html/htmlfilt.h

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

28
build/msw/makefile.gcc
View File

@@ -769,7 +769,7 @@ HTMLDLL_OBJECTS = \
$(OBJS)\htmldll_helpdata.o \
$(OBJS)\htmldll_helpdlg.o \
$(OBJS)\htmldll_helpfrm.o \
$(OBJS)\htmldll_helpwin.o \
$(OBJS)\htmldll_helpwnd.o \
$(OBJS)\htmldll_htmlcell.o \
$(OBJS)\htmldll_htmlfilt.o \
$(OBJS)\htmldll_htmlpars.o \
@@ -803,7 +803,7 @@ HTMLLIB_OBJECTS = \
$(OBJS)\htmllib_helpdata.o \
$(OBJS)\htmllib_helpdlg.o \
$(OBJS)\htmllib_helpfrm.o \
$(OBJS)\htmllib_helpwin.o \
$(OBJS)\htmllib_helpwnd.o \
$(OBJS)\htmllib_htmlcell.o \
$(OBJS)\htmllib_htmlfilt.o \
$(OBJS)\htmllib_htmlpars.o \
@@ -1077,7 +1077,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_helpdata.o \
$(OBJS)\monodll_helpdlg.o \
$(OBJS)\monodll_helpfrm.o \
$(OBJS)\monodll_helpwin.o \
$(OBJS)\monodll_helpwnd.o \
$(OBJS)\monodll_htmlcell.o \
$(OBJS)\monodll_htmlfilt.o \
$(OBJS)\monodll_htmlpars.o \
@@ -1611,7 +1611,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_helpdata.o \
$(OBJS)\monolib_helpdlg.o \
$(OBJS)\monolib_helpfrm.o \
$(OBJS)\monolib_helpwin.o \
$(OBJS)\monolib_helpwnd.o \
$(OBJS)\monolib_htmlcell.o \
$(OBJS)\monolib_htmlfilt.o \
$(OBJS)\monolib_htmlpars.o \
@@ -4528,6 +4528,9 @@ $(OBJS)\monodll_helpdlg.o: ../../src/html/helpdlg.cpp
$(OBJS)\monodll_helpfrm.o: ../../src/html/helpfrm.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_helpwnd.o: ../../src/html/helpwnd.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_htmlcell.o: ../../src/html/htmlcell.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -4968,11 +4971,6 @@ $(OBJS)\monodll_helpwin.o: ../../src/msw/helpwin.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_helpwin.o: ../../src/html/helpwin.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_automtn.o: ../../src/msw/ole/automtn.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -6360,6 +6358,9 @@ $(OBJS)\monolib_helpdlg.o: ../../src/html/helpdlg.cpp
$(OBJS)\monolib_helpfrm.o: ../../src/html/helpfrm.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_helpwnd.o: ../../src/html/helpwnd.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_htmlcell.o: ../../src/html/htmlcell.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -6800,11 +6801,6 @@ $(OBJS)\monolib_helpwin.o: ../../src/msw/helpwin.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_helpwin.o: ../../src/html/helpwin.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_automtn.o: ../../src/msw/ole/automtn.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -11018,7 +11014,7 @@ $(OBJS)\htmldll_helpdlg.o: ../../src/html/helpdlg.cpp
$(OBJS)\htmldll_helpfrm.o: ../../src/html/helpfrm.cpp
$(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\htmldll_helpwin.o: ../../src/html/helpwin.cpp
$(OBJS)\htmldll_helpwnd.o: ../../src/html/helpwnd.cpp
$(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\htmldll_htmlcell.o: ../../src/html/htmlcell.cpp
@@ -11093,7 +11089,7 @@ $(OBJS)\htmllib_helpdlg.o: ../../src/html/helpdlg.cpp
$(OBJS)\htmllib_helpfrm.o: ../../src/html/helpfrm.cpp
$(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\htmllib_helpwin.o: ../../src/html/helpwin.cpp
$(OBJS)\htmllib_helpwnd.o: ../../src/html/helpwnd.cpp
$(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\htmllib_htmlcell.o: ../../src/html/htmlcell.cpp

28
build/msw/makefile.vc
View File

@@ -833,7 +833,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 \
@@ -869,7 +869,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 \
@@ -1226,7 +1226,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 \
@@ -1760,7 +1760,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 \
@@ -4741,6 +4741,9 @@ $(OBJS)\monodll_helpdlg.obj: ..\..\src\html\helpdlg.cpp
$(OBJS)\monodll_helpfrm.obj: ..\..\src\html\helpfrm.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_helpwnd.obj: ..\..\src\html\helpwnd.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
$(OBJS)\monodll_htmlcell.obj: ..\..\src\html\htmlcell.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -5181,11 +5184,6 @@ $(OBJS)\monodll_helpwin.obj: ..\..\src\msw\helpwin.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_helpwin.obj: ..\..\src\html\helpwin.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_automtn.obj: ..\..\src\msw\ole\automtn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -6473,6 +6471,9 @@ $(OBJS)\monolib_helpdlg.obj: ..\..\src\html\helpdlg.cpp
$(OBJS)\monolib_helpfrm.obj: ..\..\src\html\helpfrm.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_helpwnd.obj: ..\..\src\html\helpwnd.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
$(OBJS)\monolib_htmlcell.obj: ..\..\src\html\htmlcell.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -6913,11 +6914,6 @@ $(OBJS)\monolib_helpwin.obj: ..\..\src\msw\helpwin.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_helpwin.obj: ..\..\src\html\helpwin.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_automtn.obj: ..\..\src\msw\ole\automtn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -10831,7 +10827,7 @@ $(OBJS)\htmldll_helpdlg.obj: ..\..\src\html\helpdlg.cpp
$(OBJS)\htmldll_helpfrm.obj: ..\..\src\html\helpfrm.cpp
$(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
$(OBJS)\htmldll_helpwin.obj: ..\..\src\html\helpwin.cpp
$(OBJS)\htmldll_helpwnd.obj: ..\..\src\html\helpwnd.cpp
$(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) $**
$(OBJS)\htmldll_htmlcell.obj: ..\..\src\html\htmlcell.cpp
@@ -10906,7 +10902,7 @@ $(OBJS)\htmllib_helpdlg.obj: ..\..\src\html\helpdlg.cpp
$(OBJS)\htmllib_helpfrm.obj: ..\..\src\html\helpfrm.cpp
$(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
$(OBJS)\htmllib_helpwin.obj: ..\..\src\html\helpwin.cpp
$(OBJS)\htmllib_helpwnd.obj: ..\..\src\html\helpwnd.cpp
$(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) $**
$(OBJS)\htmllib_htmlcell.obj: ..\..\src\html\htmlcell.cpp

28
build/msw/makefile.wat
View File

@@ -108,7 +108,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 &
@@ -646,7 +646,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 &
@@ -3162,7 +3162,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 &
@@ -3196,7 +3196,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 &
@@ -4728,6 +4728,9 @@ $(OBJS)\monodll_helpdlg.obj : .AUTODEPEND ..\..\src\html\helpdlg.cpp
$(OBJS)\monodll_helpfrm.obj : .AUTODEPEND ..\..\src\html\helpfrm.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_helpwnd.obj : .AUTODEPEND ..\..\src\html\helpwnd.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_htmlcell.obj : .AUTODEPEND ..\..\src\html\htmlcell.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -5168,11 +5171,6 @@ $(OBJS)\monodll_helpwin.obj : .AUTODEPEND ..\..\src\msw\helpwin.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_helpwin.obj : .AUTODEPEND ..\..\src\html\helpwin.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_automtn.obj : .AUTODEPEND ..\..\src\msw\ole\automtn.cpp
$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -6560,6 +6558,9 @@ $(OBJS)\monolib_helpdlg.obj : .AUTODEPEND ..\..\src\html\helpdlg.cpp
$(OBJS)\monolib_helpfrm.obj : .AUTODEPEND ..\..\src\html\helpfrm.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_helpwnd.obj : .AUTODEPEND ..\..\src\html\helpwnd.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_htmlcell.obj : .AUTODEPEND ..\..\src\html\htmlcell.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -7000,11 +7001,6 @@ $(OBJS)\monolib_helpwin.obj : .AUTODEPEND ..\..\src\msw\helpwin.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_helpwin.obj : .AUTODEPEND ..\..\src\html\helpwin.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_automtn.obj : .AUTODEPEND ..\..\src\msw\ole\automtn.cpp
$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -11218,7 +11214,7 @@ $(OBJS)\htmldll_helpdlg.obj : .AUTODEPEND ..\..\src\html\helpdlg.cpp
$(OBJS)\htmldll_helpfrm.obj : .AUTODEPEND ..\..\src\html\helpfrm.cpp
$(CXX) -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
$(OBJS)\htmldll_helpwin.obj : .AUTODEPEND ..\..\src\html\helpwin.cpp
$(OBJS)\htmldll_helpwnd.obj : .AUTODEPEND ..\..\src\html\helpwnd.cpp
$(CXX) -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $<
$(OBJS)\htmldll_htmlcell.obj : .AUTODEPEND ..\..\src\html\htmlcell.cpp
@@ -11293,7 +11289,7 @@ $(OBJS)\htmllib_helpdlg.obj : .AUTODEPEND ..\..\src\html\helpdlg.cpp
$(OBJS)\htmllib_helpfrm.obj : .AUTODEPEND ..\..\src\html\helpfrm.cpp
$(CXX) -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<
$(OBJS)\htmllib_helpwin.obj : .AUTODEPEND ..\..\src\html\helpwin.cpp
$(OBJS)\htmllib_helpwnd.obj : .AUTODEPEND ..\..\src\html\helpwnd.cpp
$(CXX) -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $<
$(OBJS)\htmllib_htmlcell.obj : .AUTODEPEND ..\..\src\html\htmlcell.cpp

8
build/msw/wx_core.dsp
View File

@@ -8299,10 +8299,18 @@ SOURCE=..\..\include\wx\html\helpdata.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\html\helpdlg.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\html\helpfrm.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\html\helpwnd.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\html\htmlcell.h
# End Source File
# Begin Source File

10
build/msw/wx_html.dsp
View File

@@ -553,7 +553,7 @@ SOURCE=..\..\src\html\helpfrm.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\html\helpwin.cpp
SOURCE=..\..\src\html\helpwnd.cpp
# End Source File
# Begin Source File
@@ -1066,10 +1066,18 @@ SOURCE=..\..\include\wx\html\helpdata.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\html\helpdlg.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\html\helpfrm.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\html\helpwnd.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\html\htmlcell.h
# End Source File
# Begin Source File

2
docs/latex/wx/hthlpfrm.tex
View File

@@ -178,7 +178,7 @@ the embedded window to be destroyed independently of the help controller.
\wxheading{Include files}
<wx/html/helpwin.h>
<wx/html/helpwnd.h>
\latexignore{\rtfignore{\wxheading{Members}}}

8
include/wx/html/helpctrl.h
View File

@@ -37,6 +37,8 @@
class WXDLLIMPEXP_HTML wxHtmlHelpDialog;
class WXDLLIMPEXP_HTML wxHtmlHelpWindow;
class WXDLLIMPEXP_HTML wxHtmlHelpFrame;
class WXDLLIMPEXP_HTML wxHtmlHelpDialog;
class WXDLLIMPEXP_HTML wxHtmlHelpController : public wxHelpControllerBase // wxEvtHandler
{
@@ -61,6 +63,9 @@ public:
wxHtmlHelpWindow* GetHelpWindow() { return m_helpWindow; }
void SetHelpWindow(wxHtmlHelpWindow* helpWindow);
wxHtmlHelpFrame* GetHelpFrame() { return m_helpFrame; }
wxHtmlHelpDialog* GetHelpDialog() { return m_helpDialog; }
void UseConfig(wxConfigBase *config, const wxString& rootpath = wxEmptyString);
// Assigns config object to the Ctrl. This config is then
@@ -117,7 +122,8 @@ protected:
wxString m_ConfigRoot;
wxString m_titleFormat;
int m_FrameStyle;
// DECLARE_EVENT_TABLE()
wxHtmlHelpFrame* m_helpFrame;
wxHtmlHelpDialog* m_helpDialog;
DECLARE_NO_COPY_CLASS(wxHtmlHelpController)
};

2
include/wx/html/helpdlg.h
View File

@@ -32,7 +32,7 @@
#include "wx/checkbox.h"
#include "wx/stattext.h"
#include "wx/html/htmlwin.h"
#include "wx/html/helpwin.h"
#include "wx/html/helpwnd.h"
#include "wx/html/htmprint.h"
class WXDLLIMPEXP_HTML wxHtmlHelpController;

2
include/wx/html/helpwin.h → include/wx/html/helpwnd.h
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: helpwin.h
// Name: helpwnd.h
// Purpose: wxHtmlHelpWindow
// Notes: Based on htmlhelp.cpp, implementing a monolithic
// HTML Help controller class, by Vaclav Slavik

10
src/html/helpctrl.cpp
View File

@@ -25,7 +25,7 @@
#include "wx/busyinfo.h"
#include "wx/html/helpctrl.h"
#include "wx/html/helpwin.h"
#include "wx/html/helpwnd.h"
#include "wx/html/helpfrm.h"
#include "wx/html/helpdlg.h"
@@ -44,6 +44,8 @@ wxHtmlHelpController::wxHtmlHelpController(int style, wxWindow* parentWindow):
wxHelpControllerBase(parentWindow)
{
m_helpWindow = NULL;
m_helpFrame = NULL;
m_helpDialog = NULL;
m_Config = NULL;
m_ConfigRoot = wxEmptyString;
m_titleFormat = _("Help: %s");
@@ -77,6 +79,8 @@ void wxHtmlHelpController::DestroyHelpWindow()
parent->Destroy();
m_helpWindow = NULL;
}
m_helpDialog = NULL;
m_helpFrame = NULL;
}
void wxHtmlHelpController::OnCloseFrame(wxCloseEvent& evt)
@@ -90,6 +94,8 @@ void wxHtmlHelpController::OnCloseFrame(wxCloseEvent& evt)
m_helpWindow->SetController(NULL);
m_helpWindow = NULL;
m_helpDialog = NULL;
m_helpFrame = NULL;
}
void wxHtmlHelpController::SetTitleFormat(const wxString& title)
@@ -151,6 +157,7 @@ wxHtmlHelpFrame* wxHtmlHelpController::CreateHelpFrame(wxHtmlHelpData *data)
frame->SetController(this);
frame->SetTitleFormat(m_titleFormat);
frame->Create(m_parentWindow, -1, wxEmptyString, m_FrameStyle);
m_helpFrame = frame;
return frame;
}
@@ -160,6 +167,7 @@ wxHtmlHelpDialog* wxHtmlHelpController::CreateHelpDialog(wxHtmlHelpData *data)
dialog->SetController(this);
dialog->SetTitleFormat(m_titleFormat);
dialog->Create(m_parentWindow, -1, wxEmptyString, m_FrameStyle);
m_helpDialog = dialog;
return dialog;
}

0
src/html/helpwin.cpp → src/html/helpwnd.cpp
View File