Some doc changes

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

diff --git a/distrib/msw/zipdist.bat b/distrib/msw/zipdist.bat
index 9e6c68bdb1bf9b905b05f4667661063a369ae40e..3d290538944a7bcb6aaf3703a438ad9319c7c85e 100755 (executable)
--- a/distrib/msw/zipdist.bat
+++ b/distrib/msw/zipdist.bat
@@ -3,6 +3,10 @@ rem Zip up an external, generic + Windows distribution of wxWindows 2.0
 set src=%wxwin
 set dest=%src\deliver
 set wise=0
+
+Rem Set this to the required version
+set version=2_1_11
+
 if "%src" == "" goto usage
 if "%dest" == "" goto usage
 if "%1" == "-help" goto usage
@@ -18,7 +22,7 @@ pause
 
 rem goto dounzip
 
-erase %dest\wx200*.zip
+erase %dest\wx*.zip
 erase %dest\glcanvas.zip
 erase %dest\ogl3.zip
 erase %dest\tex2rtf2.zip
@@ -29,31 +33,31 @@ if direxist %dest\wx deltree /Y %dest\wx
 cd %src
 echo Zipping...
 
-zip32 -@ %dest\wx200gen.zip < %src\distrib\msw\generic.rsp
-zip32 -@ -u %dest\wx200gen.zip < %src\distrib\msw\makefile.rsp
-zip32 -@ %dest\wx200msw.zip < %src\distrib\msw\msw.rsp
-zip32 -@ -u %dest\wx200msw.zip < %src\distrib\msw\makefile.rsp
-zip32 -@ %dest\wx200gtk.zip < %src\distrib\msw\gtk.rsp
-zip32 -@ -u %dest\wx200gtk.zip < %src\distrib\msw\makefile.rsp
-zip32 -@ %dest\wx200stubs.zip < %src\distrib\msw\stubs.rsp
-zip32 -@ %dest\wx200mot.zip < %src\distrib\msw\motif.rsp
-zip32 -@ -u %dest\wx200mot.zip < %src\distrib\msw\makefile.rsp
-zip32 -@ %dest\wx200user.zip < %src\distrib\msw\user.rsp
-
-zip32 -@ %dest\wx200doc.zip < %src\distrib\msw\docsrc.rsp
-zip32 -@ %dest\wx200hlp.zip < %src\distrib\msw\wx_hlp.rsp
-zip32 -@ %dest\wx200htm.zip < %src\distrib\msw\wx_html.rsp
-zip32 -@ %dest\wx200pdf.zip < %src\distrib\msw\wx_pdf.rsp
-zip32 -@ %dest\wx200wrd.zip < %src\distrib\msw\wx_word.rsp
+zip32 -@ %dest\wx%version%_gen.zip < %src\distrib\msw\generic.rsp
+zip32 -@ -u %dest\wx%version%_gen.zip < %src\distrib\msw\makefile.rsp
+zip32 -@ %dest\wx%version%_msw.zip < %src\distrib\msw\msw.rsp
+zip32 -@ -u %dest\wx%version%_msw.zip < %src\distrib\msw\makefile.rsp
+zip32 -@ %dest\wx%version%_gtk.zip < %src\distrib\msw\gtk.rsp
+zip32 -@ -u %dest\wx%version%_gtk.zip < %src\distrib\msw\makefile.rsp
+zip32 -@ %dest\wx%version%_stubs.zip < %src\distrib\msw\stubs.rsp
+zip32 -@ %dest\wx%version%_mot.zip < %src\distrib\msw\motif.rsp
+zip32 -@ -u %dest\wx%version%_mot.zip < %src\distrib\msw\makefile.rsp
+zip32 -@ %dest\wx%version%_user.zip < %src\distrib\msw\user.rsp
+
+zip32 -@ %dest\wx%version%_doc.zip < %src\distrib\msw\docsrc.rsp
+zip32 -@ %dest\wx%version%_hlp.zip < %src\distrib\msw\wx_hlp.rsp
+zip32 -@ %dest\wx%version%_htm.zip < %src\distrib\msw\wx_html.rsp
+zip32 -@ %dest\wx%version%_pdf.zip < %src\distrib\msw\wx_pdf.rsp
+zip32 -@ %dest\wx%version%_wrd.zip < %src\distrib\msw\wx_word.rsp
 
 rem VC++ project files
-zip32 -@ %dest\wx200vc.zip < %src\distrib\msw\vc.rsp
+zip32 -@ %dest\wx%version%_vc.zip < %src\distrib\msw\vc.rsp
 
 rem BC++ project files
-zip32 -@ %dest\wx200bc.zip < %src\distrib\msw\bc.rsp
+zip32 -@ %dest\wx%version%_bc.zip < %src\distrib\msw\bc.rsp
 
 rem CodeWarrior project files
-zip32 -@ %dest\wx200cw.zip < %src\distrib\msw\cw.rsp
+zip32 -@ %dest\wx%version%_cw.zip < %src\distrib\msw\cw.rsp
 
 rem OGL 3
 zip32 -@ %dest\ogl3.zip < %src\distrib\msw\ogl.rsp
@@ -92,13 +96,13 @@ Rem After this change of directory, we're in the
 Rem temporary 'wx' directory and not acting on
 Rem the source wxWindows directory.
 cd %dest\wx
-unzip32 -o ..\wx200msw.zip
-unzip32 -o ..\wx200gen.zip
-unzip32 -o ..\wx200vc.zip
-unzip32 -o ..\wx200bc.zip
-unzip32 -o ..\wx200hlp.zip
+unzip32 -o ..\wx%version%_msw.zip
+unzip32 -o ..\wx%version%_gen.zip
+unzip32 -o ..\wx%version%_vc.zip
+unzip32 -o ..\wx%version%_bc.zip
+unzip32 -o ..\wx%version%_hlp.zip
 Rem Need Word file, for Remstar DB classes
-unzip32 -o ..\wx200wrd.zip
+unzip32 -o ..\wx%version%_wrd.zip
 unzip32 -o ..\glcanvas.zip
 unzip32 -o ..\treedraw.zip
 unzip32 -o ..\ogl3.zip

diff --git a/docs/latex/wx/bmpdatob.tex b/docs/latex/wx/bmpdatob.tex
index 3d89e2648bc5f3316ed211552d2179d0efbed652..40ed2d256a455a1cc05f01e57c2ccec2ad475700 100644 (file)
--- a/docs/latex/wx/bmpdatob.tex
+++ b/docs/latex/wx/bmpdatob.tex
@@ -24,7 +24,7 @@ efficiency.
 
 \wxheading{See also}
 
-\helpref{Clipboard and drag and drop overview}{wxclipboardonfigoverview}, 
+\helpref{Clipboard and drag and drop overview}{wxdndoverview}, 
 \helpref{wxDataObject}{wxdataobject}, 
 \helpref{wxDataObjectSimple}{wxdataobjectsimple}, 
 \helpref{wxFileDataObject}{wxfiledataobject}, 

diff --git a/docs/latex/wx/dataobj.tex b/docs/latex/wx/dataobj.tex
index da1910005519e61bef3909ad050244e6326df3b0..e063f5c75536f831ae2f80359d178c4c9ef7e162 100644 (file)
--- a/docs/latex/wx/dataobj.tex
+++ b/docs/latex/wx/dataobj.tex
@@ -119,7 +119,7 @@ None
 
 \wxheading{See also}
 
-\helpref{Clipboard and drag and drop overview}{wxclipboardonfigoverview}, 
+\helpref{Clipboard and drag and drop overview}{wxdndoverview}, 
 \helpref{DnD sample}{samplednd}, 
 \helpref{wxFileDataObject}{wxfiledataobject}, 
 \helpref{wxTextDataObject}{wxtextdataobject}, 

diff --git a/docs/latex/wx/dobjcomp.tex b/docs/latex/wx/dobjcomp.tex
index 6adb5fca5b6e39d680a2526a1a1edf58aaa350df..9eca25853092806b2170b923d19ededc9253118b 100644 (file)
--- a/docs/latex/wx/dobjcomp.tex
+++ b/docs/latex/wx/dobjcomp.tex
@@ -38,7 +38,7 @@ None, this class should be used directly.
 
 \wxheading{See also}
 
-\helpref{Clipboard and drag and drop overview}{wxclipboardonfigoverview}, 
+\helpref{Clipboard and drag and drop overview}{wxdndoverview}, 
 \helpref{wxDataObject}{wxdataobject}, 
 \helpref{wxDataObjectSimple}{wxdataobjectsimple}, 
 \helpref{wxFileDataObject}{wxfiledataobject}, 

diff --git a/docs/latex/wx/dobjsmpl.tex b/docs/latex/wx/dobjsmpl.tex
index d874bde9ddc2f275d264611fb1fd3d1a51a2cbd4..3770c66ad013ff2131a298609e8b770859610c96 100644 (file)
--- a/docs/latex/wx/dobjsmpl.tex
+++ b/docs/latex/wx/dobjsmpl.tex
@@ -38,7 +38,7 @@ methods.
 
 \wxheading{See also}
 
-\helpref{Clipboard and drag and drop overview}{wxclipboardonfigoverview}, 
+\helpref{Clipboard and drag and drop overview}{wxdndoverview}, 
 \helpref{DnD sample}{samplednd}, 
 \helpref{wxFileDataObject}{wxfiledataobject}, 
 \helpref{wxTextDataObject}{wxtextdataobject}, 

diff --git a/docs/latex/wx/filesysh.tex b/docs/latex/wx/filesysh.tex
index 4444ef92717229fda19a864013c1b147f509a54b..7e0a91ed86c0ab6228b93e5291c93cfe44f85b83 100644 (file)
--- a/docs/latex/wx/filesysh.tex
+++ b/docs/latex/wx/filesysh.tex
@@ -118,7 +118,7 @@ This method is only called if \helpref{CanOpen}{wxfilesystemhandlercanopen} retu
 
 Returns next filename that matches parameters passed to \helpref{FindFirst}{wxfilesystemfindfirst}.
 
-This method is only called if \helpref{CanRead}{wxfilesystemhandlercanread} returns TRUE and FindFirst
+This method is only called if \helpref{CanOpen}{wxfilesystemhandlercanopen} returns TRUE and FindFirst
 returned a non-empty string.
 
 \membersection{wxFileSystemHandler::OpenFile}\label{wxfilesystemhandleropenfile}

diff --git a/docs/latex/wx/tab.tex b/docs/latex/wx/tab.tex
index 993a3274252d76c8480b9f253dad1764b1bb5c82..104546afa172ba8a08617d022b649974eca8d1ff 100644 (file)
--- a/docs/latex/wx/tab.tex
+++ b/docs/latex/wx/tab.tex
@@ -2,6 +2,9 @@
 
 A dialog suitable for handling tabs.
 
+Please note that the preferred class for programming tabbed windows is \helpref{wxNotebook}{wxnotebook}.
+This class is retained for backward compatibility.
+
 \wxheading{Derived from}
 
 \helpref{wxDialog}{wxdialog}\\
@@ -50,6 +53,9 @@ Returns the tab view associated with the dialog box.
 
 A panel suitable for handling tabs.
 
+Please note that the preferred class for programming tabbed windows is \helpref{wxNotebook}{wxnotebook}.
+This class is retained for backward compatibility.
+
 \wxheading{Derived from}
 
 \helpref{wxPanel}{wxpanel}\\
@@ -90,6 +96,9 @@ Returns the tab view associated with the panel.
 
 You will rarely need to use this class directly.
 
+Please note that the preferred class for programming tabbed windows is \helpref{wxNotebook}{wxnotebook}.
+This class is retained for backward compatibility.
+
 \wxheading{Derived from}
 
 \helpref{wxObject}{wxobject}
@@ -235,6 +244,9 @@ Sets the width and height for this tab.
 
 Responsible for drawing tabs onto a window, and dealing with input.
 
+Please note that the preferred class for programming tabbed windows is \helpref{wxNotebook}{wxnotebook}.
+This class is retained for backward compatibility.
+
 \wxheading{Derived from}
 
 \helpref{wxObject}{wxobject}

diff --git a/docs/latex/wx/tclipbrd.tex b/docs/latex/wx/tclipbrd.tex
index fc91daa9c95511119aa12335c55ffcdf0a6703c3..5074b2121905b37bc8946ea4645fcd26e36c13b7 100644 (file)
--- a/docs/latex/wx/tclipbrd.tex
+++ b/docs/latex/wx/tclipbrd.tex
@@ -9,7 +9,7 @@
 %% Licence:     wxWindows licence
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\section{Clipboard and drag and drop overview}\label{wxdndoverview}\label{wxclipboardonfigoverview}
+\section{Clipboard and drag and drop overview}\label{wxdndoverview}
 
 Classes: \helpref{wxDataObject}{wxdataobject},
  \helpref{wxClipboard}{wxclipboard},

diff --git a/docs/latex/wx/ttab.tex b/docs/latex/wx/ttab.tex
index d044e8193610785dcc132208e16c1af6bd51448e..cca81808e8cd0d9e6227ac3055072e6f64da38c9 100644 (file)
--- a/docs/latex/wx/ttab.tex
+++ b/docs/latex/wx/ttab.tex
@@ -9,6 +9,10 @@ used to switch between panels or other information. Tabs are most
 commonly used in dialog boxes where the number of options is too great
 to fit on one dialog.
 
+{\bf Please note} that the preferred class for programming tabbed windows is \helpref{wxNotebook}{wxnotebook}.
+The old tab classes are retained for backward compatibility and also to implement
+wxNotebook on platforms that don't have native tab controls.
+
 \wxheading{The appearance and behaviour of a wxTabbedDialog}
 
 The following screenshot shows the appearance of the sample tabbed dialog application.

diff --git a/docs/latex/wx/txtdatob.tex b/docs/latex/wx/txtdatob.tex
index 342408feebbd28f2d1459ba2afe2514814270912..f25842b589b512a0ca2e4e2c20a7bc858db8662a 100644 (file)
--- a/docs/latex/wx/txtdatob.tex
+++ b/docs/latex/wx/txtdatob.tex
@@ -31,7 +31,7 @@ overridden to increase efficiency.
 
 \wxheading{See also}
 
-\helpref{Clipboard and drag and drop overview}{wxclipboardonfigoverview}, 
+\helpref{Clipboard and drag and drop overview}{wxdndoverview}, 
 \helpref{wxDataObject}{wxdataobject}, 
 \helpref{wxDataObjectSimple}{wxdataobjectsimple}, 
 \helpref{wxFileDataObject}{wxfiledataobject}, 

diff --git a/docs/latex/wx/wx.hpj b/docs/latex/wx/wx.hpj
index b8f8205dae8a33657c9877ff3e290e66e4c3e2a9..e925941ccfaf1406ae213b1dcf0caaff4569332e 100644 (file)
--- a/docs/latex/wx/wx.hpj
+++ b/docs/latex/wx/wx.hpj
@@ -1,14 +1,14 @@
 [OPTIONS]
-BMROOT=L:\wxWindows\docs\latex\wx ; Assume that bitmaps are where the source is
+BMROOT=d:\wx2\wxWind~1\docs\latex\wx ; Assume that bitmaps are where the source is
 TITLE=wxWindows Manual
 CONTENTS=Contents
 COMPRESS=HIGH
 
 [FILES]
-Wx.rtf
+wx.rtf
 
 [CONFIG]
-CreateButton("Up", "&Up", "JumpId(`Wx.hlp', `Contents')")
+CreateButton("Up", "&Up", "JumpId(`wx.hlp', `Contents')")
 BrowseButtons()
 
 [MAP]

diff --git a/samples/bombs/bombs1.cpp b/samples/bombs/bombs1.cpp
index f9b24f48eb1e304e11cc56bbe2f67e3e22299156..0b77417dcc62bf3f4ffc74ca98070fc7a73fe538 100644 (file)
--- a/samples/bombs/bombs1.cpp
+++ b/samples/bombs/bombs1.cpp
@@ -167,7 +167,7 @@ void BombsCanvasClass::Refresh(int xc1, int yc1, int xc2, int yc2)
 // Called when the canvas receives a mouse event.
 void BombsCanvasClass::OnEvent(wxMouseEvent& event)
 {
-  long fx, fy;
+  wxCoord fx, fy;
   event.GetPosition(&fx, &fy);
   int x = fx/(x_cell*X_UNIT);
   int y = fy/(y_cell*Y_UNIT);