diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt index 009ee6e7d9..87814a64d9 100644 --- a/distrib/msw/tmake/filelist.txt +++ b/distrib/msw/tmake/filelist.txt @@ -101,7 +101,7 @@ numdlgg.cpp G tbarsmpl.cpp G textdlgg.cpp G tipdlg.cpp G -treectlg.cpp G 16 +treectlg.cpp G treelay.cpp G wizard.cpp G diff --git a/docs/html/wxbook.htm b/docs/html/wxbook.htm index 8900967c66..a2cae70661 100644 --- a/docs/html/wxbook.htm +++ b/docs/html/wxbook.htm @@ -33,12 +33,19 @@ wxWindows Book

About the wxWindows book

-Discussions have been taking place on the wxwin-developers list about -collaboratively writing a wxWindows book. The concensus is to write a tutorial -book for people with reasonable C++ experience, with the possibility of including the API reference either in a very compact -form at the back of the book, or as a separate volume. The book would almost certainly -contain a CD-ROM with wxWindows and its documentation. It would probably be available -for free on-line, publisher permitting.

+Discussions have been taking place on the wxwin-developers list +about collaboratively writing a wxWindows book. The book will +not include the API reference, though this could be a +separate project. The book will be accompanied by a CD-ROM with +wxWindows and its documentation. The book will initially be +available on-line, and when enough is done we will look for a +publisher.

+ +There will also be a separate small booklet which can easily be printed +out and which gives an overview of wxWindows facilities by taking +the reader through a single worked example. Guillermo Rodriguez +Garcia has volunteered to write this, and will use his Life! +demo to illustrate it.

Goals for the book:

@@ -66,12 +73,34 @@ with a predefined number of points for chapters, indexing, editing, proof-readin So far, the following people are interested in taking part in this project:

Publication

+We should have a substantial chunk of wxBook done before we approach a publisher, +because with the risks of multiple author + +

Suggestions and comments

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32 index 0e2ee37e3a..7e6c0405ea 100644 --- a/src/msw/makefile.b32 +++ b/src/msw/makefile.b32 @@ -103,6 +103,7 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \ $(MSWDIR)\tbarsmpl.obj \ $(MSWDIR)\textdlgg.obj \ $(MSWDIR)\tipdlg.obj \ + $(MSWDIR)\treectlg.obj \ $(MSWDIR)\treelay.obj \ $(MSWDIR)\wizard.obj @@ -861,6 +862,8 @@ $(MSWDIR)\textdlgg.obj: $(GENDIR)\textdlgg.$(SRCSUFF) $(MSWDIR)\tipdlg.obj: $(GENDIR)\tipdlg.$(SRCSUFF) +$(MSWDIR)\treectlg.obj: $(GENDIR)\treectlg.$(SRCSUFF) + $(MSWDIR)\treelay.obj: $(GENDIR)\treelay.$(SRCSUFF) $(MSWDIR)\wizard.obj: $(GENDIR)\wizard.$(SRCSUFF) diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp index 24ead62f4f..80a4517527 100644 --- a/src/msw/treectrl.cpp +++ b/src/msw/treectrl.cpp @@ -1102,7 +1102,7 @@ wxTreeItemId wxTreeCtrl::GetRootItem() const wxTreeItemId wxTreeCtrl::GetSelection() const { - wxCHECK_MSG( !(m_windowStyle & wxTR_MULTIPLE), (WXHTREEITEM)0, + wxCHECK_MSG( !(m_windowStyle & wxTR_MULTIPLE), (long)(WXHTREEITEM)0, wxT("this only works with single selection controls") ); return wxTreeItemId((WXHTREEITEM) TreeView_GetSelection(GetHwnd())); @@ -1301,7 +1301,7 @@ wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text, int image, int selectedImage, wxTreeItemData *data) { - return DoInsertItem(wxTreeItemId((WXHTREEITEM) 0), (WXHTREEITEM) 0, + return DoInsertItem(wxTreeItemId((long) (WXHTREEITEM) 0), (long)(WXHTREEITEM) 0, text, image, selectedImage, data); } @@ -1466,7 +1466,7 @@ void wxTreeCtrl::Unselect() wxT("doesn't make sense, may be you want UnselectAll()?") ); // just remove the selection - SelectItem(wxTreeItemId((WXHTREEITEM) 0)); + SelectItem(wxTreeItemId((long) (WXHTREEITEM) 0)); } void wxTreeCtrl::UnselectAll()