From 88b1927cb3da30ac43126d57bff6ccd5b5822c73 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Fri, 22 Oct 1999 13:12:08 +0000
Subject: [PATCH] More broken code corrections; broken Latex file corrections.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/latex/wx/font.tex       |  8 +++++++-
 docs/latex/wx/function.tex   | 12 ++++++------
 docs/latex/wx/image.tex      |  3 +--
 docs/latex/wx/tbitmap.tex    |  6 +++---
 docs/latex/wx/tclipbrd.tex   | 36 ++++++++++++++++++++----------------
 docs/latex/wx/tunicode.tex   |  6 +++---
 include/wx/msw/ole/dataobj.h |  2 --
 src/msw/ole/dataobj.cpp      |  2 --
 8 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/docs/latex/wx/font.tex b/docs/latex/wx/font.tex
index d8c5046c3a..31190c2259 100644
--- a/docs/latex/wx/font.tex
+++ b/docs/latex/wx/font.tex
@@ -77,7 +77,7 @@ a default typeface will chosen based on the family.}
 \twocolitem{{\bf wxFONTENCODING\_SYSTEM}}{Default system encoding.}
 \twocolitem{{\bf wxFONTENCODING\_DEFAULT}}{Default application encoding: this
 is the encoding set by calls to 
-\helpref{SetDefaultEncoding}{wxfontsetdefaultencoding} and which may beset to,
+\helpref{SetDefaultEncoding}{wxfontsetdefaultencoding} and which may be set to,
 say, KOI8 to create all fonts by default with KOI8 encoding. Initially, the
 default application encoding is the same as default system encoding.}
 \twocolitem{{\bf wxFONTENCODING\_ISO8859\_1...15}}{ISO8859 encodings.}
@@ -184,6 +184,12 @@ weight identifiers.
 
 \helpref{wxFont::SetWeight}{wxfontsetweight}
 
+\membersection{wxFont::SetDefaultEncoding}\label{wxfontsetdefaultencoding}
+
+\func{static void}{SetDefaultEncoding}{\param{wxFontEncoding }{encoding}}
+
+Sets the default font encoding.
+
 \membersection{wxFont::SetFaceName}\label{wxfontsetfacename}
 
 \func{void}{SetFaceName}{\param{const wxString\& }{faceName}}
diff --git a/docs/latex/wx/function.tex b/docs/latex/wx/function.tex
index 60d9863169..0bf399b079 100644
--- a/docs/latex/wx/function.tex
+++ b/docs/latex/wx/function.tex
@@ -1947,7 +1947,7 @@ base classes.
 
 <wx/object.h>
 
-\membersection{wxBITMAP}\label{wxbitmap}
+\membersection{wxBITMAP}\label{wxbitmapmacro}
 
 \func{}{wxBITMAP}{bitmapName}
 
@@ -1957,8 +1957,8 @@ avoid using {\tt #ifdef}s when creating bitmaps.
 
 \wxheading{See also}
 
-\helpref{Bitmaps and icons overview}{wxbitmapoverview},
-\helpref{wxICON}{wxicon}
+\helpref{Bitmaps and icons overview}{wxbitmapoverview}, 
+\helpref{wxICON}{wxiconmacro}
 
 \wxheading{Include files}
 
@@ -2011,7 +2011,7 @@ Example:
 
 \helpref{RTTI overview}{runtimeclassoverview}
 
-\membersection{wxICON}\label{wxicon}
+\membersection{wxICON}\label{wxiconmacro}
 
 \func{}{wxICON}{iconName}
 
@@ -2021,8 +2021,8 @@ avoid using {\tt #ifdef}s when creating icons.
 
 \wxheading{See also}
 
-\helpref{Bitmaps and icons overview}{wxbitmapoverview},
-\helpref{wxBITMAP}{wxbitmap}
+\helpref{Bitmaps and icons overview}{wxbitmapoverview}, 
+\helpref{wxBITMAP}{wxbitmapmacro}
 
 \wxheading{Include files}
 
diff --git a/docs/latex/wx/image.tex b/docs/latex/wx/image.tex
index 07e43de3ce..d6befa064b 100644
--- a/docs/latex/wx/image.tex
+++ b/docs/latex/wx/image.tex
@@ -310,8 +310,7 @@ of a given handler class in an application session.}
 \func{bool}{LoadFile}{\param{const wxString\&}{ name}, \param{const wxString\&}{ mimetype}}
 
 Loads an image from a file. If no handler type is provided, the library will
-try to use wxBITMAP\_TYPE\_BMP or all known handlers previously installed
-through a call to \helpref{wxImage::InitAllHandlers}{wximageinitallhandlers}.
+try to use wxBITMAP\_TYPE\_BMP.
 
 \func{bool}{LoadFile}{\param{wxInputStream\&}{ stream}, \param{long}{ type}}
 
diff --git a/docs/latex/wx/tbitmap.tex b/docs/latex/wx/tbitmap.tex
index 64bde5334c..5a3ed4efac 100644
--- a/docs/latex/wx/tbitmap.tex
+++ b/docs/latex/wx/tbitmap.tex
@@ -30,7 +30,7 @@ XPM icon file to be available at run-time.
 #endif
 \end{verbatim}
 
-A macro, \helpref{wxICON}{wxicon}, is available which creates an icon using an XPM
+A macro, \helpref{wxICON}{wxiconmacro}, is available which creates an icon using an XPM
 on the appropriate platform, or an icon resource on Windows.
 
 \begin{verbatim}
@@ -47,8 +47,8 @@ wxIcon icon("mondrian");
 #endif
 \end{verbatim}
 
-There is also a corresponding \helpref{wxBITMAP}{wxbitmap} macro which allows
-to create the bitmaps in much the same way as \helpref{wxICON}{wxicon} creates
+There is also a corresponding \helpref{wxBITMAP}{wxbitmapmacro} macro which allows
+to create the bitmaps in much the same way as \helpref{wxICON}{wxiconmacro} creates
 icons. It assumes that bitmaps live in resources under Windows or OS2 and XPM
 files under all other platforms (for XPMs, the corresponding file must be
 included before this macro is used, of course, and the name of the bitmap
diff --git a/docs/latex/wx/tclipbrd.tex b/docs/latex/wx/tclipbrd.tex
index e44c023308..14dc176ba9 100644
--- a/docs/latex/wx/tclipbrd.tex
+++ b/docs/latex/wx/tclipbrd.tex
@@ -12,34 +12,33 @@
 \section{Clipboard and drag and drop overview}\label{wxclipboardonfigoverview}
 
 Classes: \helpref{wxDataObject}{wxdataobject},
-         \helpref{wxClipboard}{wxclipboard},
-         \helpref{wxDataFormat}{wxdataformat},
-         \helpref{wxDropSource}{wxdropsource},
-         \helpref{wxDropTarget}{wxdroptarget}
+ \helpref{wxClipboard}{wxclipboard},
+ \helpref{wxDataFormat}{wxdataformat},
+ \helpref{wxDropSource}{wxdropsource},
+ \helpref{wxDropTarget}{wxdroptarget}
 
 This overview discusses data transfer through clipboard or drag and drop. In
 wxWindows, these two ways to transfer data (either between different
 applications or inside one and the same) are very similar which allows to
-implement both of them using almost the same code - or, to say it in other
+implement both of them using almost the same code - or in other
 words, if you implement drag and drop support for your application, you get
 clipboard support for free and vice versa.
 
 In the heart of both clipboard and drag and drop operations lies the 
-\helpref{wxDataObject}{wxdataobject} class. The objects of this (or, to be
-precise, derived from it) class represent the data which is being carried by
+\helpref{wxDataObject}{wxdataobject} class. The objects of this class (or, to be
+precise, classes derived from it) represent the data which is being carried by
 the mouse during drag and drop operation or copied to or pasted from the
-clipboard. \helpref{wxDataObject}{wxdataobject} is a "smart" piece of data
-because it knows which \helpref{formats}{wxdataformat} it supports (see 
-\helpref{GetFormatCount}{wxdataobjectgetformatcount} and 
-\helpref{GetAllFormats}{wxdataobjectgetallformats}) and knows how to render
-itself in any of them (see \helpref{GetDataHere.}{wxdataobjectgetdatahere}).
+clipboard. wxDataObject is a "smart" piece of data
+because it knows which formats it supports (see 
+GetFormatCount and GetAllFormats) and knows how to render
+itself in any of them (see GetDataHere).
 It can also receive its value from the outside in a format it supports if it
-implements \helpref{SetData}{wxdataobjectsetdata} method.
+implements the SetData method.
 
 Both clipboard and drag and drop operations have two sides: the source and
-target, the data provider and the data receiver (which may be the same
+target, the data provider and the data receiver. These which may be in the same
 application and even the same window when, for example, you drag some text from
-one position to another in a word processor). Let us describe what each of them
+one position to another in a word processor. Let us describe what each of them
 should do.
 
 \subsection{The data provider (source) duties}{wxdataobjectsource}
@@ -60,7 +59,7 @@ other hand, the object for drag and drop operation must only exist while
 afterwards and so can be created either on heap or on stack (i.e. as a local
 variable).
 
-Another small difference si that in the case of clipboard operation, the
+Another small difference is that in the case of clipboard operation, the
 application usually knows in advance whether it copies or cuts (i.e. copies and
 deletes) data - in fact, this usually depends on which menu item the user
 chose. But for drag and drop it can only know it after 
@@ -76,3 +75,8 @@ no data in (any of) the supported format(s) is available. If it returns {\tt
 TRUE}, the data has been successfully transfered to wxDataObject.
 
 {\bf TODO} document drag and drop side when the API is finalised
+% !!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+% Vadim, please remember the new line at the end of each file. Please
+% also remember to compile the .hlp file to check for bad references etc.,
+% before checking in. I have removed references that were unresolved. - JACS
+
diff --git a/docs/latex/wx/tunicode.tex b/docs/latex/wx/tunicode.tex
index ba41720007..4b3d865e16 100644
--- a/docs/latex/wx/tunicode.tex
+++ b/docs/latex/wx/tunicode.tex
@@ -147,12 +147,12 @@ ANSI strings (a notable exception is the entire Win32 API which accepts either
 Unicode or ANSI strings and which thus makes it unnecessary to ever perform
 any convertions in the program).
 
-To get a ANSI string from a wxString, you may use 
-\helpref{mb\_str()}{wxstringmbstr} function which always returns an ANSI
+To get a ANSI string from a wxString, you may use the 
+mb\_str() function which always returns an ANSI
 string (independently of the mode - while the usual 
 \helpref{c\_str()}{wxstringcstr} returns a pointer to the internal
 representation which is either ASCII or Unicode). More rarely used, but still
-useful, is \helpref{wc\_str()}{wxstringwcstr} function which always returns
+useful, is wc\_str() function which always returns
 the Unicode string.
 
 % TODO describe fn_str(), wx_str(), wxCharBuf classes, ...
diff --git a/include/wx/msw/ole/dataobj.h b/include/wx/msw/ole/dataobj.h
index fe47ce3bf3..123f390ede 100644
--- a/include/wx/msw/ole/dataobj.h
+++ b/include/wx/msw/ole/dataobj.h
@@ -39,10 +39,8 @@ public:
     // return TRUE if we support this format in "Get" direction
     bool IsSupportedFormat(const wxDataFormat& format) const;
 
-#ifdef __WXDEBUG__
     // function to return symbolic name of clipboard format (for debug messages)
     static const char *GetFormatName(wxDataFormat format);
-#endif // Debug
 
 private:
     IDataObject *m_pIDataObject; // pointer to the COM interface
diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index 46cfd66c4b..30f46b1cf0 100644
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -668,7 +668,6 @@ bool wxDataObject::IsSupportedFormat(const wxDataFormat& format) const
     }
 }
 
-#ifdef __WXDEBUG__
 const char *wxDataObject::GetFormatName(wxDataFormat format)
 {
   // case 'xxx' is not a valid value for switch of enum 'wxDataFormat'
@@ -703,7 +702,6 @@ const char *wxDataObject::GetFormatName(wxDataFormat format)
     #pragma warning(default:4063)
   #endif // VC++
 }
-#endif // Debug
 
 // ----------------------------------------------------------------------------
 // wxBitmapDataObject supports CF_DIB format
-- 
2.50.0

