Some BC++ fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index 009ee6e7d9d80662e54f5ebe2506f0f01def6664..87814a64d9dbff273f69992a804501e407821d47 100644 (file)
--- 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
 tbarsmpl.cpp   G
 textdlgg.cpp   G
 tipdlg.cpp     G

-treectlg.cpp   G       16
+treectlg.cpp   G

 treelay.cpp    G
 wizard.cpp     G
 
 treelay.cpp    G
 wizard.cpp     G
 

diff --git a/docs/html/wxbook.htm b/docs/html/wxbook.htm
index 8900967c662cab912635d4b996b40e0eb4a69a43..a2cae706611435b8f6e084b3297b157345b0e353 100644 (file)
--- a/docs/html/wxbook.htm
+++ b/docs/html/wxbook.htm
@@ -33,12 +33,19 @@ wxWindows Book
 
 <H3><a name="about">About the wxWindows book</a></H3>
 
 
 <H3><a name="about">About the wxWindows book</a></H3>
 

-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.<P>
+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.<P>
+
+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.<P>

 
 Goals for the book:<P>
 
 
 Goals for the book:<P>
 


@@ -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:<P>
 
 <ul>
 So far, the following people are interested in taking part in this project:<P>
 
 <ul>

-<li><a href="mailto:bsimser@home.com">Bil Simser</a>. Bil would like to coordinate
-the book. He's currently writing a book for WordWare Publishing (about his CDX library)
-and also has contacts at Sams and the Waite Group. Bil is writing <a href="http://lightning.prohosting.com/~wxbuild" target=_new>
-wxBuilder</a>, an IDE for wxWindows.
+<li><a href="mailto:julian.smart@ukonline.co.uk">Julian Smart</a> -
+editor and coordinator of the project; introductory chapter, some other
+chapters.
+<li><a href="mailto:guille@iies.es">Guillermo Rodriguez Garcia</a> - Separate tutorial booklet;
+communication classes (wxSocket, wxXXXServer, some protocol stuff); timing and timers.
+<li><a href="mailto:robin@alldunn.com">Robin Dunn</a> - wxPython chapter.
+</i>
+<li><a href="mailto:zeitlin@dptmaths.ens-cachan.fr">Vadim Zeitlin</a> - drag and drop chapter?
+<li><a href="mailto:slavik2@czn.cz">Vaclav Slavik</a> - wxHTML section.
+<li><a href="mailto:gtasker@fastpicsystems.com">George Tasker</a> - database chapter.
+<li><a href="mailto:moreno@mochima.com">Carlos Moreno</a> - wxImage, wxBitmap.
+<li><a href="mailto:Shiv@pspl.co.in">Shiv Shankar Ramakrishnan</a> - wxWindows advocacy, convincing your manager,
+container classes and strings, comparison with STL
+<li><a href="mailto:markusneifer@my-Deja.com">Markus Neifer</a> - user-defined events.
+
+<!--
+<li><a href="mailto:csomor@advancedconcepts.ch">Stefan Csomor</a>. The sequence of events i.e. which action provokes which event sequence,
+this is implicit for the use on MSW, but very important for other systems; and porting to new platforms
+-->
+<!--

 <li><a href="mailto:tomr@scitechsoft.com">Tom Ryan</a>, SciTech Software.
 <li><a href="mailto:tomr@scitechsoft.com">Tom Ryan</a>, SciTech Software.

-<li><a href="mailto:robin@alldunn.com">Robin Dunn</a>. <i>Chapter on wxPython.</i>
+-->
+<!--
+<li><a href="mailto:karsten@phy.hw.ac.uk">Karsten Ballueder</a>. Short tutorials on some useful
+GNU tools, like autoconf/configure/make, programming
+strategies, etc.
+-->
+<!--

 <li><a href="mailto:mheck@www.surveyorcorp.com">Matt Heck</a>, SurveyorCorp Inc.
 <i>
 <ol>
 <li><a href="mailto:mheck@www.surveyorcorp.com">Matt Heck</a>, SurveyorCorp Inc.
 <i>
 <ol>


@@ -80,21 +109,17 @@ wxBuilder</a>, an IDE for wxWindows.
   <li>an appendix something similar about how to use wxLIVID for video capture and display;
   <li>proofreading
 </ol>
   <li>an appendix something similar about how to use wxLIVID for video capture and display;
   <li>proofreading
 </ol>

-</i>
-<li><a href="mailto:julian.smart@ukonline.co.uk">Julian Smart</a>.
-<li><a href="mailto:zeitlin@dptmaths.ens-cachan.fr">Vadim Zeitlin</a>.
-<li><a href="mailto:slavik2@czn.cz">Vaclav Slavik</a>. <i>wxHTML section</i>
-<li><a href="mailto:csomor@advancedconcepts.ch">Stefan Csomor</a>. <i>the sequence of events i.e. which action provokes which event sequence,
-this is implicit for the use on MSW, but very important for other systems; and porting to new platforms</i>
-<li><a href="mailto:karsten@phy.hw.ac.uk">Karsten Ballueder</a>. <i>short tutorials on some useful
-GNU tools, like autoconf/configure/make, programming
-strategies, etc.</i>
+-->

 </ul>
 
 <hr>
 
 <H3><a name="publication">Publication</a></H3>
 
 </ul>
 
 <hr>
 
 <H3><a name="publication">Publication</a></H3>
 

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

 Tom Ryan originally wrote:<P>
 
 <PRE>
 Tom Ryan originally wrote:<P>
 
 <PRE>


@@ -128,6 +153,7 @@ of guidance for style, formatting, etc.<P>
 "<a href="http://www.bruceeckel.com/javabook.html" target=_new>Thinking in Java</a>
 is published both as a PDF for internet (by the author) and in print by Prentice Hall."<P>
 
 "<a href="http://www.bruceeckel.com/javabook.html" target=_new>Thinking in Java</a>
 is published both as a PDF for internet (by the author) and in print by Prentice Hall."<P>
 

+-->

 <hr>
 
 <H3><a name="suggestions">Suggestions and comments</a></H3>
 <hr>
 
 <H3><a name="suggestions">Suggestions and comments</a></H3>

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 0e2ee37e3aae8d7e68e75bdfd503ce88231fd95e..7e6c0405eaa04ba368f48d6604f5efef70319956 100644 (file)
--- 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)\tbarsmpl.obj \
                $(MSWDIR)\textdlgg.obj \
                $(MSWDIR)\tipdlg.obj \

+               $(MSWDIR)\treectlg.obj \

                $(MSWDIR)\treelay.obj \
                $(MSWDIR)\wizard.obj
 
                $(MSWDIR)\treelay.obj \
                $(MSWDIR)\wizard.obj
 


@@ -861,6 +862,8 @@ $(MSWDIR)\textdlgg.obj: $(GENDIR)\textdlgg.$(SRCSUFF)
 
 $(MSWDIR)\tipdlg.obj: $(GENDIR)\tipdlg.$(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)
 $(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 24ead62f4f62a3c8175e62386d12bf5e47b6dadd..80a45175271bb7e603719e052f1b3594eee6768b 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -1102,7 +1102,7 @@ wxTreeItemId wxTreeCtrl::GetRootItem() const
 
 wxTreeItemId wxTreeCtrl::GetSelection() 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()));
                  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)
 {
                                  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);
 }
 
                         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
                   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()
 }
 
 void wxTreeCtrl::UnselectAll()