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

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

diff --git a/docs/latex/wx/function.tex b/docs/latex/wx/function.tex
index 2c9f8258ef30bfe36e6d0fe9884e9b1ad8d2aaa9..0aca78aa505ca030117adb2520ae764ddc382552 100644 (file)
--- a/docs/latex/wx/function.tex
+++ b/docs/latex/wx/function.tex
@@ -80,6 +80,17 @@ See \helpref{wxFindFirstFile}{wxfindfirstfile} for an example.
 
 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}
 
 \func{bool}{wxIsAbsolutePath}{\param{const wxString\& }{filename}}

diff --git a/docs/latex/wx/image.tex b/docs/latex/wx/image.tex
index 3184dd7479945e41fd0622eeeda1f4b37f7672b6..07e43de3cebcfd2fbda41cc98bb06357b880211e 100644 (file)
--- a/docs/latex/wx/image.tex
+++ b/docs/latex/wx/image.tex
@@ -21,6 +21,7 @@ wxDC::DrawBitmap.
 \wxheading{See also}
 
 \helpref{wxBitmap}{wxbitmap}
+\helpref{wxInitAllImageHandlers}{wxinitallimagehandlers}
 
 \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.
 
-\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}
 
 \func{static void}{InitStandardHandlers}{\void}
@@ -300,7 +288,7 @@ the user.
 \wxheading{See also}
 
 \helpref{wxImageHandler}{wximagehandler}
-\helpref{wxImage::InitAllHandlers}{wximageinitallhandlers}
+\helpref{wxInitAllImageHandlers}{wxinitallimagehandlers}
 
 \membersection{wxImage::InsertHandler}
 
@@ -606,6 +594,7 @@ created by IJG.)
 \wxheading{See also}
 
 \helpref{wxImage}{wximage}
+\helpref{wxInitAllImageHandlers}{wxinitallimagehandlers}
 
 \latexignore{\rtfignore{\wxheading{Members}}}
 

diff --git a/include/wx/image.h b/include/wx/image.h
index cb20ca4bc2e99c77d2459f9c12a8a5126c12aacb..e4d78863ab2df78fab0a09fcd878aeab2d280acf 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -356,14 +356,15 @@ public:
 
   static void CleanUpHandlers();
   static void InitStandardHandlers();
-  static void InitAllHandlers();
-
+ 
 protected:
 
   static wxList sm_handlers;
 
 };
 
+extern void wxInitAllImageHandlers();
+
 #endif
   // _WX_IMAGE_H_
 

diff --git a/src/common/image.cpp b/src/common/image.cpp
index b0b91397f924be9c1022ee4270bf0d42c2a061e6..ab36e52be6d04b5260e104fd2823efe0c9cd274f 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -610,25 +610,6 @@ void wxImage::InitStandardHandlers()
   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()
 {
     wxNode *node = sm_handlers.First();