Fixes

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

diff --git a/docs/latex/book/book.tex b/docs/latex/book/book.tex
index b01c2730df9ebdb56ffc5ac07aba45427d26afda..e9bee7984a9a7ac09156f26b63c110434a4ccf8b 100644 (file)
--- a/docs/latex/book/book.tex
+++ b/docs/latex/book/book.tex
@@ -44,122 +44,122 @@ Robin Dunn, et al}
 \tableofcontents
 
 % Chapter 01: Introduction, advocacy, etc.
 \tableofcontents
 
 % Chapter 01: Introduction, advocacy, etc.

-\input chap_intro.tex
+\input chap\_intro.tex

 %
 % Chapter 02: Installing wxWindows (and what tools to use)
 %
 % Chapter 02: Installing wxWindows (and what tools to use)

-\input chap_install.tex
+\input chap\_install.tex

 %
 % Chapter 03: C++ and wxWindows. Summarises the sorts of constructs used/not used, plus wxString class, some conventions. Vadim suggests putting it in 1st chapter but I think it deserves a chapter of its own.
 %
 % Chapter 03: C++ and wxWindows. Summarises the sorts of constructs used/not used, plus wxString class, some conventions. Vadim suggests putting it in 1st chapter but I think it deserves a chapter of its own.

-\input chap_cpp.tex
+\input chap\_cpp.tex

 %
 % Chapter 04: Getting started: Hello World. Introduces app class, frames, menus, status bar, message box
 %
 % Chapter 04: Getting started: Hello World. Introduces app class, frames, menus, status bar, message box

-\input chap_getstart.tex
+\input chap\_getstart.tex

 %
 % Chapter 05: Basic event handling
 %
 % Chapter 05: Basic event handling

-\input chap_basic_events.tex
+\input chap\_basic\_events.tex

 %
 % Chapter 06: Frames and menubars. The components of a frame, menubars. 
 %
 % Chapter 06: Frames and menubars. The components of a frame, menubars. 

-\input chap_frames.tex
+\input chap\_frames.tex

 %
 % Chapter 07: Toolbars and status bars
 %
 % Chapter 07: Toolbars and status bars

-\input chap_toolbars.tex
+\input chap\_toolbars.tex

 %
 % Chapter 08: Basic controls
 %
 % Chapter 08: Basic controls

-\input chap_basic_controls.tex
+\input chap\_basic\_controls.tex

 %
 % Chapter 09: Common dialogs
 %
 % Chapter 09: Common dialogs

-\input chap_common_dialogs.tex
+\input chap\_common\_dialogs.tex

 %
 % Chapter 10: Custom dialogs and resources (XML)
 %
 % Chapter 10: Custom dialogs and resources (XML)

-\input chap_custom_dialogs.tex
+\input chap\_custom\_dialogs.tex

 %
 % Chapter 11: Drawing on device contexts
 %
 % Chapter 11: Drawing on device contexts

-\input chap_drawing.tex
+\input chap\_drawing.tex

 %
 % Chapter 12: Handling input (mouse, keyboard, joystick)
 %
 % Chapter 12: Handling input (mouse, keyboard, joystick)

-\input chap_input.tex
+\input chap\_input.tex

 %
 % Chapter 14: Sizers
 %
 %
 % Chapter 14: Sizers
 %

-\input chap_sizers.tex
+\input chap\_sizers.tex

 %
 % Chapter 15: Images and bitmaps
 %
 % Chapter 15: Images and bitmaps

-\input chap_images.tex
+\input chap\_images.tex

 %
 % Chapter 16: Clipboard and drag and drop
 %
 % Chapter 16: Clipboard and drag and drop

-\input chap_clipboard_dnd.tex
+\input chap\_clipboard\_dnd.tex

 %
 % Chapter 17: Advanced controls (list,tree,notebook,splitter,wxWizard,wxCalCtrl...)
 %
 % Chapter 17: Advanced controls (list,tree,notebook,splitter,wxWizard,wxCalCtrl...)

-\input chap_advanced_controls.tex
+\input chap\_advanced\_controls.tex

 %
 % Chapter 18: Document/view classes
 %
 % Chapter 18: Document/view classes

-\input chap_docview.tex
+\input chap\_docview.tex

 %
 % Chapter 19: Scrolling
 %
 % Chapter 19: Scrolling

-\input chap_scrolling.tex
+\input chap\_scrolling.tex

 %
 % Chapter 20: MDI
 %
 % Chapter 20: MDI

-\input chap_mdi.tex
+\input chap\_mdi.tex

 %
 % Chapter 21: Printing
 %
 % Chapter 21: Printing

-\input chap_printing.tex
+\input chap\_printing.tex

 %
 % Chapter 22: Providing help in your applications
 %
 % Chapter 22: Providing help in your applications

-\input chap_help.tex
+\input chap\_help.tex

 %
 % Chapter 23: Strings and internationalization
 %
 % Chapter 23: Strings and internationalization

-\input chap_strings.tex
+\input chap\_strings.tex

 %
 %

-\input chap_data_classes.tex
+\input chap\_data\_classes.tex

 % Chapter 24: Collection and container classes
 %
 % Chapter 25: Memory management and debugging (including wxLog)
 % Chapter 24: Collection and container classes
 %
 % Chapter 25: Memory management and debugging (including wxLog)

-\input chap_memory.tex
+\input chap\_memory.tex

 %
 % Chapter 26: Run-time class information
 %
 % Chapter 26: Run-time class information

-\input chap_runtime.tex
+\input chap\_runtime.tex

 %
 % Chapter 27: Advanced event handling (user-defined events, ...)
 %
 % Chapter 27: Advanced event handling (user-defined events, ...)

-\input chap_advanced_events.tex
+\input chap\_advanced\_events.tex

 %
 % Chapter 28: Communication classes, including wxSocket
 %
 % Chapter 28: Communication classes, including wxSocket

-\input chap_comms.tex
+\input chap\_comms.tex

 %
 % Chapter 29: Database classes
 %
 % Chapter 29: Database classes

-\input chap_database.tex
+\input chap\_database.tex

 %
 % Chapter 30: File and stream classes
 %
 % Chapter 30: File and stream classes

-\input chap_file_stream.tex
+\input chap\_file\_stream.tex

 %
 % Chapter 31: Configuration classes
 %
 % Chapter 31: Configuration classes

-\input chap_config.tex
+\input chap\_config.tex

 %
 % Chapter 32: Time, timers and idle processing
 %
 % Chapter 32: Time, timers and idle processing

-\input chap_time.tex
+\input chap\_time.tex

 %
 % Chapter 33: Writing multithreading applications
 %
 % Chapter 33: Writing multithreading applications

-\input chap_multithreading.tex
+\input chap\_multithreading.tex

 %
 % Chapter 34: Perfecting your UI (Adapting to system settings, accelerators, ...)
 %
 % Chapter 34: Perfecting your UI (Adapting to system settings, accelerators, ...)

-\input chap_perfecting.tex
+\input chap\_perfecting.tex

 %
 % Chapter 35: Platform-specific programming (metafiles, OLE automation, taskbar, ...)
 %
 % Chapter 35: Platform-specific programming (metafiles, OLE automation, taskbar, ...)

-\input chap_platform.tex
+\input chap\_platform.tex

 %
 % Chapter 36: Using wxHTML
 %
 % Chapter 36: Using wxHTML

-\input chap_wxhtml.tex
+\input chap\_wxhtml.tex

 %
 % Chapter 37: Using wxPython
 %
 % Chapter 37: Using wxPython

-\input chap_wxpython.tex
+\input chap\_wxpython.tex

 %
 % Chapter 38: wxBase?
 %
 % Chapter 38: wxBase?

-\input chap_wxbase.tex
+\input chap\_wxbase.tex

 %
 % Appendix: Comparison with other toolkits: MFC, Qt etc.
 %
 % Appendix: Comparison with other toolkits: MFC, Qt etc.

-\input chap_comparison.tex
+\input chap\_comparison.tex

 %
 % Appendix: a compendium of external resources, libraries etc.
 %
 % Appendix: a compendium of external resources, libraries etc.

-\input chap_resources.tex
+\input chap\_resources.tex

 
 \bibliography{refs}
 \addcontentsline{toc}{chapter}{Bibliography}
 
 \bibliography{refs}
 \addcontentsline{toc}{chapter}{Bibliography}

diff --git a/docs/latex/book/makefile.vc b/docs/latex/book/makefile.vc
index ba3256f59cf0ef888325f61cf4b5d7c6a7b4cc00..e66c8655802647b94137a0a3920305fa69d31d65 100644 (file)
--- a/docs/latex/book/makefile.vc
+++ b/docs/latex/book/makefile.vc
@@ -14,6 +14,8 @@ WXDIR=d:\wx2\wxWindows
 
 DOCDIR = $(WXDIR)\docs
 
 
 DOCDIR = $(WXDIR)\docs
 

+WAITFLAG=/wait
+

 # Making documents
 docs:   bookhlp bookhtml bookpdfrtf htb htmlhelp
 alldocs: docs
 # Making documents
 docs:   bookhlp bookhtml bookpdfrtf htb htmlhelp
 alldocs: docs


@@ -61,8 +63,9 @@ $(DOCDIR)\html\book\book.htm:         $(DOCDIR)\latex\book\book.tex
 $(DOCDIR)\htmlhelp\book.chm : $(DOCDIR)\html\book\book.htm $(DOCDIR)\html\book\book.hhp
        cd $(DOCDIR)\html\book
        -hhc book.hhp
 $(DOCDIR)\htmlhelp\book.chm : $(DOCDIR)\html\book\book.htm $(DOCDIR)\html\book\book.hhp
        cd $(DOCDIR)\html\book
        -hhc book.hhp

-    -mkdir ..\..\htmlhelp
-    move book.chm ..\..\htmlhelp
+        -mkdir ..\..\htmlhelp
+        -erase ..\..\htmlhelp\book.chm
+        move book.chm ..\..\htmlhelp

        cd $(THISDIR)
 
 $(WXDIR)\docs\latex\book\book.dvi:     $(DOCDIR)/latex/book/body.tex $(DOCDIR)/latex/book/book.tex
        cd $(THISDIR)
 
 $(WXDIR)\docs\latex\book\book.dvi:     $(DOCDIR)/latex/book/body.tex $(DOCDIR)/latex/book/book.tex


@@ -100,11 +103,11 @@ touchbook:
 updatedocs: touchbook alldocs
 
 cleandocs:
 updatedocs: touchbook alldocs
 
 cleandocs:

-    -erase /Y $(DOCDIR)\html\book\book.htm
-    -erase /Y $(DOCDIR)\pdf\book.rtf
-    -erase /Y $(DOCDIR)\latex\book\book.rtf
-    -erase /Y $(DOCDIR)\htmlhelp\book.chm
-    -erase /Y $(DOCDIR)\htb\book.htb
+    -erase $(DOCDIR)\html\book\*.htm
+    -erase $(DOCDIR)\pdf\book.rtf
+    -erase $(DOCDIR)\latex\book\book.rtf
+    -erase $(DOCDIR)\htmlhelp\book.chm
+    -erase $(DOCDIR)\htb\book.htb

 
 # Start Word, running the GeneratePDF macro. MakeManual.dot should be in the
 # Office StartUp folder, and PDFMaker should be installed.
 
 # Start Word, running the GeneratePDF macro. MakeManual.dot should be in the
 # Office StartUp folder, and PDFMaker should be installed.