diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt index afb753fd9a..b326acaf71 100644 --- a/distrib/msw/tmake/filelist.txt +++ b/distrib/msw/tmake/filelist.txt @@ -292,7 +292,7 @@ dragimag.cpp MSW dropsrc.cpp MSW OLE droptgt.cpp MSW OLE enhmeta.cpp MSW Win32Only -helpbest.cpp MSW Win32Only +helpbest.cpp MSW Win32Only,LowLevel evtloop.cpp MSW LowLevel fdrepdlg.cpp MSW Win32Only # FIXME: the generic implementation doesn't work under MSW, so we must @@ -308,8 +308,8 @@ gaugemsw.cpp MSW NotWin32 gdiimage.cpp MSW LowLevel gdiobj.cpp MSW LowLevel glcanvas.cpp MSW -helpchm.cpp MSW Win32Only -helpwin.cpp MSW +helpchm.cpp MSW Win32Only,LowLevel +helpwin.cpp MSW LowLevel icon.cpp MSW LowLevel imaglist.cpp MSW Win32Only iniconf.cpp MSW diff --git a/docs/changes.txt b/docs/changes.txt index 71bbc0f38c..09612cc667 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -15,6 +15,10 @@ Unix: - fixed compilation on systems with zlib installed but < 1.1.3 version +All: + +- Implemented GetEditControl for wxGenericTreeCtrl (Peter + Stieber). OLD CHANGES =========== diff --git a/docs/latex/wx/window.tex b/docs/latex/wx/window.tex index c784cfbb04..f8969d5214 100644 --- a/docs/latex/wx/window.tex +++ b/docs/latex/wx/window.tex @@ -46,8 +46,8 @@ this style} the window completely when its size is changed - you will have to repaint the new window area manually if you use this style. Currently only has an effect for Windows.} -\twocolitem{\windowstyle{wxVSCROLL}}{Use this style to enable a vertical scrollbar. (Still used?) } -\twocolitem{\windowstyle{wxHSCROLL}}{Use this style to enable a horizontal scrollbar. (Still used?) } +\twocolitem{\windowstyle{wxVSCROLL}}{Use this style to enable a vertical scrollbar.} +\twocolitem{\windowstyle{wxHSCROLL}}{Use this style to enable a horizontal scrollbar.} \twocolitem{\windowstyle{wxCLIP\_CHILDREN}}{Use this style to eliminate flicker caused by the background being repainted, then children being painted over them. Windows only.} \end{twocollist} @@ -1094,8 +1094,8 @@ window). Invokes the constraint-based layout algorithm or the sizer-based algorithm for this window. -See \helpref{wxWindow::SetAutoLayout}{wxwindowsetautolayout} on when -this function gets called automatically using auto layout. +See \helpref{wxWindow::SetAutoLayout}{wxwindowsetautolayout}: when auto +layout is on, this function gets called automatically when the window is resized. \membersection{wxWindow::LoadFromResource}\label{wxwindowloadfromresource} diff --git a/include/wx/univ/setup.h b/include/wx/univ/setup.h index ed4f25881e..3e8c9868fe 100644 --- a/include/wx/univ/setup.h +++ b/include/wx/univ/setup.h @@ -888,7 +888,7 @@ #define wxUSE_MS_HTML_HELP 1 // Use wxHTML-based help controller? -#define wxUSE_WXHTML_HELP 0 //? error 'type cast' cannot convert from ... +#define wxUSE_WXHTML_HELP 1 // Use resources #define wxUSE_RESOURCES 1 diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h index ed4f25881e..3e8c9868fe 100644 --- a/include/wx/univ/setup0.h +++ b/include/wx/univ/setup0.h @@ -888,7 +888,7 @@ #define wxUSE_MS_HTML_HELP 1 // Use wxHTML-based help controller? -#define wxUSE_WXHTML_HELP 0 //? error 'type cast' cannot convert from ... +#define wxUSE_WXHTML_HELP 1 // Use resources #define wxUSE_RESOURCES 1 diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp index 92f11379b1..31eab70e8c 100644 --- a/src/html/helpfrm.cpp +++ b/src/html/helpfrm.cpp @@ -1020,13 +1020,17 @@ Normal face
(and underlined. Italic face. \ { UpdateTestWin(); } + void OnUpdateSpin(wxSpinEvent& WXUNUSED(event)) + { + UpdateTestWin(); + } DECLARE_EVENT_TABLE() }; BEGIN_EVENT_TABLE(wxHtmlHelpFrameOptionsDialog, wxDialog) EVT_COMBOBOX(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate) - EVT_SPINCTRL(-1, wxHtmlHelpFrameOptionsDialog::OnUpdate) + EVT_SPINCTRL(-1, wxHtmlHelpFrameOptionsDialog::OnUpdateSpin) END_EVENT_TABLE() diff --git a/src/wxUniv.dsp b/src/wxUniv.dsp index 3852dba726..721188c706 100644 --- a/src/wxUniv.dsp +++ b/src/wxUniv.dsp @@ -49,7 +49,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\lib\wxuniv.lib" +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "wxUniv - Win32 Debug" @@ -221,6 +221,11 @@ SOURCE=.\common\event.cpp # End Source File # Begin Source File +SOURCE=.\common\extended.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + SOURCE=.\common\fddlgcmn.cpp # End Source File # Begin Source File @@ -549,6 +554,11 @@ SOURCE=.\common\txtstrm.cpp # End Source File # Begin Source File +SOURCE=.\common\unzip.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + SOURCE=.\common\url.cpp # End Source File # Begin Source File @@ -599,18 +609,6 @@ SOURCE=.\common\zipstrm.cpp SOURCE=.\common\zstream.cpp # End Source File - -# Begin Source File - -SOURCE=.\common\extended.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\common\unzip.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File - # End Group # Begin Group "Generic Files" @@ -791,7 +789,6 @@ SOURCE=.\generic\treelay.cpp SOURCE=.\generic\wizard.cpp # End Source File - # End Group # Begin Group "wxHTML Files" @@ -876,18 +873,12 @@ SOURCE=.\html\m_tables.cpp SOURCE=.\html\winpars.cpp # End Source File - # End Group # Begin Group "MSW Files" # PROP Default_Filter "" # Begin Source File -SOURCE=.\msw\dummy.cpp -# ADD CPP /Yc"wx/wxprec.h" -# End Source File -# Begin Source File - SOURCE=.\msw\app.cpp # End Source File # Begin Source File @@ -952,6 +943,11 @@ SOURCE=.\msw\dir.cpp # End Source File # Begin Source File +SOURCE=.\msw\dummy.cpp +# ADD CPP /Yc"wx/wxprec.h" +# End Source File +# Begin Source File + SOURCE=.\msw\evtloop.cpp # End Source File # Begin Source File @@ -980,6 +976,28 @@ SOURCE=.\msw\gdiobj.cpp # End Source File # Begin Source File +SOURCE=.\msw\gsocket.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=.\msw\gsockmsw.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=.\msw\helpbest.cpp +# End Source File +# Begin Source File + +SOURCE=.\msw\helpchm.cpp +# End Source File +# Begin Source File + +SOURCE=.\msw\helpwin.cpp +# End Source File +# Begin Source File + SOURCE=.\msw\icon.cpp # End Source File # Begin Source File @@ -1050,22 +1068,26 @@ SOURCE=.\msw\volume.cpp SOURCE=.\msw\window.cpp # End Source File - -# Begin Source File - -SOURCE=.\msw\gsocket.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - -SOURCE=.\msw\gsockmsw.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File - # End Group # Begin Group "Universal Files" # PROP Default_Filter "" +# Begin Group "Theme Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\univ\themes\gtk.cpp +# End Source File +# Begin Source File + +SOURCE=.\univ\themes\metal.cpp +# End Source File +# Begin Source File + +SOURCE=.\univ\themes\win32.cpp +# End Source File +# End Group # Begin Source File SOURCE=.\univ\bmpbuttn.cpp @@ -1202,24 +1224,6 @@ SOURCE=.\univ\topluniv.cpp SOURCE=.\univ\winuniv.cpp # End Source File - -# Begin Group "Theme Files" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\univ\themes\gtk.cpp -# End Source File -# Begin Source File - -SOURCE=.\univ\themes\metal.cpp -# End Source File -# Begin Source File - -SOURCE=.\univ\themes\win32.cpp -# End Source File - -# End Group # End Group # Begin Group "Headers" @@ -1230,7 +1234,9 @@ SOURCE=.\univ\themes\win32.cpp # Begin Source File SOURCE=..\include\wx\univ\setup.h + !IF "$(CFG)" == "wxUniv - Win32 Release" + # Begin Custom Build - Creating lib\univ\wx\setup.h from $(InputPath) InputPath=..\include\wx\univ\setup.h @@ -1238,7 +1244,9 @@ InputPath=..\include\wx\univ\setup.h copy "$(InputPath)" ..\lib\univ\wx\setup.h # End Custom Build + !ELSEIF "$(CFG)" == "wxUniv - Win32 Debug" + # Begin Custom Build - Creating lib\univd\wx\setup.h from $(InputPath) InputPath=..\include\wx\univ\setup.h @@ -1246,7 +1254,9 @@ InputPath=..\include\wx\univ\setup.h copy "$(InputPath)" ..\lib\univd\wx\setup.h # End Custom Build + !ENDIF + # End Source File # End Group # Begin Group "Common" @@ -2200,7 +2210,6 @@ SOURCE=..\include\wx\zipstrm.h SOURCE=..\include\wx\zstream.h # End Source File - # End Group # Begin Group "MSW" @@ -2369,7 +2378,6 @@ SOURCE=..\include\wx\generic\treectlg.h SOURCE=..\include\wx\generic\wizard.h # End Source File - # End Group # Begin Group "HTML" @@ -2426,7 +2434,6 @@ SOURCE=..\include\wx\html\m_templ.h SOURCE=..\include\wx\html\winpars.h # End Source File - # End Group # Begin Group "Universal"