Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More broken code corrections; broken Latex file corrections.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-10-22 13:12:08 +00:00
parent e01c8145b1
commit 88b1927cb3
8 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/latex/wx/font.tex
View File

@@ -184,6 +184,12 @@ weight identifiers.
\helpref{wxFont::SetWeight}{wxfontsetweight} \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} \membersection{wxFont::SetFaceName}\label{wxfontsetfacename}
\func{void}{SetFaceName}{\param{const wxString\& }{faceName}} \func{void}{SetFaceName}{\param{const wxString\& }{faceName}}

8
docs/latex/wx/function.tex
View File

@@ -1947,7 +1947,7 @@ base classes.
<wx/object.h> <wx/object.h>
\membersection{wxBITMAP}\label{wxbitmap} \membersection{wxBITMAP}\label{wxbitmapmacro}
\func{}{wxBITMAP}{bitmapName} \func{}{wxBITMAP}{bitmapName}
@@ -1958,7 +1958,7 @@ avoid using {\tt #ifdef}s when creating bitmaps.
\wxheading{See also} \wxheading{See also}
\helpref{Bitmaps and icons overview}{wxbitmapoverview}, \helpref{Bitmaps and icons overview}{wxbitmapoverview},
\helpref{wxICON}{wxicon} \helpref{wxICON}{wxiconmacro}
\wxheading{Include files} \wxheading{Include files}
@@ -2011,7 +2011,7 @@ Example:
\helpref{RTTI overview}{runtimeclassoverview} \helpref{RTTI overview}{runtimeclassoverview}
\membersection{wxICON}\label{wxicon} \membersection{wxICON}\label{wxiconmacro}
\func{}{wxICON}{iconName} \func{}{wxICON}{iconName}
@@ -2022,7 +2022,7 @@ avoid using {\tt #ifdef}s when creating icons.
\wxheading{See also} \wxheading{See also}
\helpref{Bitmaps and icons overview}{wxbitmapoverview}, \helpref{Bitmaps and icons overview}{wxbitmapoverview},
\helpref{wxBITMAP}{wxbitmap} \helpref{wxBITMAP}{wxbitmapmacro}
\wxheading{Include files} \wxheading{Include files}

3
docs/latex/wx/image.tex
View File

@@ -310,8 +310,7 @@ of a given handler class in an application session.}
\func{bool}{LoadFile}{\param{const wxString\&}{ name}, \param{const wxString\&}{ mimetype}} \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 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 try to use wxBITMAP\_TYPE\_BMP.
through a call to \helpref{wxImage::InitAllHandlers}{wximageinitallhandlers}.
\func{bool}{LoadFile}{\param{wxInputStream\&}{ stream}, \param{long}{ type}} \func{bool}{LoadFile}{\param{wxInputStream\&}{ stream}, \param{long}{ type}}

6
docs/latex/wx/tbitmap.tex
View File

@@ -30,7 +30,7 @@ XPM icon file to be available at run-time.
#endif #endif
\end{verbatim} \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. on the appropriate platform, or an icon resource on Windows.
\begin{verbatim} \begin{verbatim}
@@ -47,8 +47,8 @@ wxIcon icon("mondrian");
#endif #endif
\end{verbatim} \end{verbatim}
There is also a corresponding \helpref{wxBITMAP}{wxbitmap} macro which allows There is also a corresponding \helpref{wxBITMAP}{wxbitmapmacro} macro which allows
to create the bitmaps in much the same way as \helpref{wxICON}{wxicon} creates 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 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 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 included before this macro is used, of course, and the name of the bitmap

28
docs/latex/wx/tclipbrd.tex
View File

@@ -20,26 +20,25 @@ Classes: \helpref{wxDataObject}{wxdataobject},
This overview discusses data transfer through clipboard or drag and drop. In This overview discusses data transfer through clipboard or drag and drop. In
wxWindows, these two ways to transfer data (either between different wxWindows, these two ways to transfer data (either between different
applications or inside one and the same) are very similar which allows to 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 words, if you implement drag and drop support for your application, you get
clipboard support for free and vice versa. clipboard support for free and vice versa.
In the heart of both clipboard and drag and drop operations lies the In the heart of both clipboard and drag and drop operations lies the
\helpref{wxDataObject}{wxdataobject} class. The objects of this (or, to be \helpref{wxDataObject}{wxdataobject} class. The objects of this class (or, to be
precise, derived from it) class represent the data which is being carried by 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 the mouse during drag and drop operation or copied to or pasted from the
clipboard. \helpref{wxDataObject}{wxdataobject} is a "smart" piece of data clipboard. wxDataObject is a "smart" piece of data
because it knows which \helpref{formats}{wxdataformat} it supports (see because it knows which formats it supports (see
\helpref{GetFormatCount}{wxdataobjectgetformatcount} and GetFormatCount and GetAllFormats) and knows how to render
\helpref{GetAllFormats}{wxdataobjectgetallformats}) and knows how to render itself in any of them (see GetDataHere).
itself in any of them (see \helpref{GetDataHere.}{wxdataobjectgetdatahere}).
It can also receive its value from the outside in a format it supports if it 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 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 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. should do.
\subsection{The data provider (source) duties}{wxdataobjectsource} \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 afterwards and so can be created either on heap or on stack (i.e. as a local
variable). 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 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 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 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. TRUE}, the data has been successfully transfered to wxDataObject.
{\bf TODO} document drag and drop side when the API is finalised {\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

6
docs/latex/wx/tunicode.tex
View File

@@ -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 Unicode or ANSI strings and which thus makes it unnecessary to ever perform
any convertions in the program). any convertions in the program).
To get a ANSI string from a wxString, you may use To get a ANSI string from a wxString, you may use the
\helpref{mb\_str()}{wxstringmbstr} function which always returns an ANSI mb\_str() function which always returns an ANSI
string (independently of the mode - while the usual string (independently of the mode - while the usual
\helpref{c\_str()}{wxstringcstr} returns a pointer to the internal \helpref{c\_str()}{wxstringcstr} returns a pointer to the internal
representation which is either ASCII or Unicode). More rarely used, but still 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. the Unicode string.
% TODO describe fn_str(), wx_str(), wxCharBuf classes, ... % TODO describe fn_str(), wx_str(), wxCharBuf classes, ...

2
include/wx/msw/ole/dataobj.h
View File

@@ -39,10 +39,8 @@ public:
// return TRUE if we support this format in "Get" direction // return TRUE if we support this format in "Get" direction
bool IsSupportedFormat(const wxDataFormat& format) const; bool IsSupportedFormat(const wxDataFormat& format) const;
#ifdef __WXDEBUG__
// function to return symbolic name of clipboard format (for debug messages) // function to return symbolic name of clipboard format (for debug messages)
static const char *GetFormatName(wxDataFormat format); static const char *GetFormatName(wxDataFormat format);
#endif // Debug
private: private:
IDataObject *m_pIDataObject; // pointer to the COM interface IDataObject *m_pIDataObject; // pointer to the COM interface

2
src/msw/ole/dataobj.cpp
View File

@@ -668,7 +668,6 @@ bool wxDataObject::IsSupportedFormat(const wxDataFormat& format) const
} }
} }
#ifdef __WXDEBUG__
const char *wxDataObject::GetFormatName(wxDataFormat format) const char *wxDataObject::GetFormatName(wxDataFormat format)
{ {
// case 'xxx' is not a valid value for switch of enum 'wxDataFormat' // 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) #pragma warning(default:4063)
#endif // VC++ #endif // VC++
} }
#endif // Debug
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxBitmapDataObject supports CF_DIB format // wxBitmapDataObject supports CF_DIB format