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

change wxImage::InitAllHandlers to wxInitAllImageHandlers and put it in a separate file

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Sylvain Bougnoux
1999-09-20 19:05:49 +00:00
parent 6e58e01afa
commit b5a4a47df5
4 changed files with 17 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,6 +80,17 @@ See \helpref{wxFindFirstFile}{wxfindfirstfile} for an example.
Returns the Windows directory under Windows; on other platforms returns the empty string. Returns the Windows directory under Windows; on other platforms returns the empty string.
\membersection{::wxInitAllImageHandlers}\label{wxinitallimagehandlers}
\func{void}{wxInitAllImageHandlers}{\void}
Adds some common image format handlers, which, depending on wxWindows
configuration, can be handlers for BMP (loading) (always installed), GIF
(loading and saving), PCX (loading and saving), PNM (loading and saving as raw
rgb), PNG (loading and saving), JPEG (loading and saving), file formats.
See also: \helpref{wxImage}{wximage} \helpref{wxImageHandler}{wximagehandler}
\membersection{::wxIsAbsolutePath} \membersection{::wxIsAbsolutePath}
\func{bool}{wxIsAbsolutePath}{\param{const wxString\& }{filename}} \func{bool}{wxIsAbsolutePath}{\param{const wxString\& }{filename}}

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

@@ -21,6 +21,7 @@ wxDC::DrawBitmap.
\wxheading{See also} \wxheading{See also}
\helpref{wxBitmap}{wxbitmap} \helpref{wxBitmap}{wxbitmap}
\helpref{wxInitAllImageHandlers}{wxinitallimagehandlers}
\latexignore{\rtfignore{\wxheading{Members}}} \latexignore{\rtfignore{\wxheading{Members}}}
@@ -274,19 +275,6 @@ Gets the width of the image in pixels.
Returns TRUE if there is a mask active, FALSE otherwise. Returns TRUE if there is a mask active, FALSE otherwise.
\membersection{wxImage::InitAllHandlers}\label{wximageinitallhandlers}
\func{static void}{InitAllHandlers}{\void}
Adds some common image format handlers, which, depending on wxWindows
configuration, can be handlers for BMP (loading) (always installed), GIF
(loading and saving), PCX (loading and saving), PNM (loading and saving as raw
rgb), PNG (loading and saving), JPEG (loading and saving), file formats.
\wxheading{See also}
\helpref{wxImageHandler}{wximagehandler}
\membersection{wxImage::InitStandardHandlers} \membersection{wxImage::InitStandardHandlers}
\func{static void}{InitStandardHandlers}{\void} \func{static void}{InitStandardHandlers}{\void}
@@ -300,7 +288,7 @@ the user.
\wxheading{See also} \wxheading{See also}
\helpref{wxImageHandler}{wximagehandler} \helpref{wxImageHandler}{wximagehandler}
\helpref{wxImage::InitAllHandlers}{wximageinitallhandlers} \helpref{wxInitAllImageHandlers}{wxinitallimagehandlers}
\membersection{wxImage::InsertHandler} \membersection{wxImage::InsertHandler}
@@ -606,6 +594,7 @@ created by IJG.)
\wxheading{See also} \wxheading{See also}
\helpref{wxImage}{wximage} \helpref{wxImage}{wximage}
\helpref{wxInitAllImageHandlers}{wxinitallimagehandlers}
\latexignore{\rtfignore{\wxheading{Members}}} \latexignore{\rtfignore{\wxheading{Members}}}

5
include/wx/image.h
View File

@@ -356,14 +356,15 @@ public:
static void CleanUpHandlers(); static void CleanUpHandlers();
static void InitStandardHandlers(); static void InitStandardHandlers();
static void InitAllHandlers();
protected: protected:
static wxList sm_handlers; static wxList sm_handlers;
}; };
extern void wxInitAllImageHandlers();
#endif #endif
// _WX_IMAGE_H_ // _WX_IMAGE_H_

19
src/common/image.cpp
View File

@@ -610,25 +610,6 @@ void wxImage::InitStandardHandlers()
AddHandler( new wxBMPHandler ); AddHandler( new wxBMPHandler );
} }
void wxImage::InitAllHandlers()
{
#if wxUSE_LIBPNG
AddHandler( new wxPNGHandler );
#endif
#if wxUSE_LIBJPEG
AddHandler( new wxJPEGHandler );
#endif
#if wxUSE_GIF
AddHandler( new wxGIFHandler );
#endif
#if wxUSE_PNM
AddHandler( new wxPNMHandler );
#endif
#if wxUSE_PCX
AddHandler( new wxPCXHandler );
#endif
}
void wxImage::CleanUpHandlers() void wxImage::CleanUpHandlers()
{ {
wxNode *node = sm_handlers.First(); wxNode *node = sm_handlers.First();