wxMotif::wxFont supports encodings too (and shares 99% of font code with wxGTK)

[wxWidgets.git] / include / wx / image.h

diff --git a/include/wx/image.h b/include/wx/image.h
index a02183e100be69e00d65be1e163347cf81fcc4f9..e4d78863ab2df78fab0a09fcd878aeab2d280acf 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -36,9 +36,15 @@ class WXDLLEXPORT wxPNGHandler;
 class WXDLLEXPORT wxJPEGHandler;
 #endif
 class WXDLLEXPORT wxBMPHandler;
+#if wxUSE_GIF
 class WXDLLEXPORT wxGIFHandler;
+#endif
+#if wxUSE_PNM
 class WXDLLEXPORT wxPNMHandler;
+#endif
+#if wxUSE_PCX
 class WXDLLEXPORT wxPCXHandler;
+#endif
 class WXDLLEXPORT wxImage;
 
 //-----------------------------------------------------------------------------
@@ -100,6 +106,9 @@ public:
   virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
   virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
   virtual bool CanRead( wxInputStream& stream );
+private:
+   // hiding base class virtuals again!
+  inline bool CanRead( const wxString& name ) { return(wxImageHandler::CanRead(name)); };
 #endif
 };
 #endif
@@ -127,6 +136,9 @@ public:
   virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
   virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
   virtual bool CanRead( wxInputStream& stream );
+private:
+   // hiding base class virtuals again!
+  inline bool CanRead( const wxString& name ) { return(wxImageHandler::CanRead(name)); };
 #endif
 };
 #endif
@@ -152,6 +164,9 @@ public:
 #if wxUSE_STREAMS
   virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
   virtual bool CanRead( wxInputStream& stream );
+private:
+   // hiding base class virtuals again!
+  inline bool CanRead( const wxString& name ) { return(wxImageHandler::CanRead(name)); };
 #endif
 };
 
@@ -159,7 +174,7 @@ public:
 // wxGIFHandler
 //-----------------------------------------------------------------------------
 
-#if wxUSE_LIBGIF
+#if wxUSE_GIF
 
 class WXDLLEXPORT wxGIFHandler : public wxImageHandler
 {
@@ -179,15 +194,18 @@ public:
   virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
   virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
   virtual bool CanRead( wxInputStream& stream );
+private:
+   // hiding base class virtuals again!
+  inline bool CanRead( const wxString& name ) { return(wxImageHandler::CanRead(name)); };
 #endif
 };
-
 #endif
 
 //-----------------------------------------------------------------------------
 // wxPNMHandler
 //-----------------------------------------------------------------------------
 
+#if wxUSE_PNM
 class WXDLLEXPORT wxPNMHandler : public wxImageHandler
 {
   DECLARE_DYNAMIC_CLASS(wxPNMHandler)
@@ -206,13 +224,18 @@ public:
   virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE );
   virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
   virtual bool CanRead( wxInputStream& stream );
+private:
+   // hiding base class virtuals again!
+  inline bool CanRead( const wxString& name ) { return(wxImageHandler::CanRead(name)); };
 #endif
 };
+#endif
 
 //-----------------------------------------------------------------------------
 // wxPCXHandler
 //-----------------------------------------------------------------------------
 
+#if wxUSE_PCX
 class WXDLLEXPORT wxPCXHandler : public wxImageHandler
 {
   DECLARE_DYNAMIC_CLASS(wxPCXHandler)
@@ -233,6 +256,7 @@ public:
   virtual bool CanRead( wxInputStream& stream );
 #endif
 };
+#endif
 
 //-----------------------------------------------------------------------------
 // wxImage
@@ -332,13 +356,15 @@ public:
 
   static void CleanUpHandlers();
   static void InitStandardHandlers();
-
+ 
 protected:
 
   static wxList sm_handlers;
 
 };
 
+extern void wxInitAllImageHandlers();
+
 #endif
   // _WX_IMAGE_H_