wxToolBar support in wxUniv/wxFrame

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

diff --git a/include/wx/imagbmp.h b/include/wx/imagbmp.h
index 1906bf224f3321a51283f8a6f6d05efd6fc63544..82388570e5796b593765a1da96d691cac84f5ac6 100644 (file)
--- a/include/wx/imagbmp.h
+++ b/include/wx/imagbmp.h
@@ -41,22 +41,58 @@ enum
 class WXDLLEXPORT wxBMPHandler : public wxImageHandler
 {
 public:
 class WXDLLEXPORT wxBMPHandler : public wxImageHandler
 {
 public:

-  wxBMPHandler()
-  {
-      m_name = _T("BMP file");
-      m_extension = _T("bmp");
-      m_type = wxBITMAP_TYPE_BMP;
-      m_mime = _T("image/bmp");
-  };
+    wxBMPHandler()
+    {
+        m_name = _T("BMP file");
+        m_extension = _T("bmp");
+        m_type = wxBITMAP_TYPE_BMP;
+        m_mime = _T("image/bmp");
+    };

 
 #if wxUSE_STREAMS
 
 #if wxUSE_STREAMS

+

   virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
   virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );

+  virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=0 );
+  virtual bool DoCanRead( wxInputStream& stream );
+                                
+protected:
+  bool DoLoadDib (wxImage * image, int width, int height, int bpp, int ncolors, int comp,
+                off_t bmpOffset, wxInputStream& stream,
+                bool verbose, bool IsBmp, bool hasPalette  ) ;
+  bool LoadDib( wxImage *image, wxInputStream& stream, bool verbose, bool IsBmp  ) ;
+
+#endif // wxUSE_STREAMS

 
 

+private:
+     DECLARE_DYNAMIC_CLASS(wxBMPHandler)
+};
+
+
+// ----------------------------------------------------------------------------
+// wxICOHandler
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxICOHandler : public wxBMPHandler
+{
+public:
+    wxICOHandler()
+    {
+        m_name = _T("ICO file");
+        m_extension = _T("ico");
+        m_type = wxBITMAP_TYPE_ICO;
+        m_mime = _T("image/icon");
+    };
+
+#if wxUSE_STREAMS
+
+  virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );

   virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=0 );
   virtual bool DoCanRead( wxInputStream& stream );
   virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=0 );
   virtual bool DoCanRead( wxInputStream& stream );

+                

 #endif // wxUSE_STREAMS
 
 #endif // wxUSE_STREAMS
 

-  DECLARE_DYNAMIC_CLASS(wxBMPHandler)
+private:
+    DECLARE_DYNAMIC_CLASS(wxBMPHandler)

 };
 
 
 };