compilation fix after wxFont changes (closes #10152)

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

diff --git a/include/wx/imagjpeg.h b/include/wx/imagjpeg.h
index da25d5c7ec250757d5f5b11f7343103890272aae..976e3585766290302ccb6caaea607cde1c410f6c 100644 (file)
--- a/include/wx/imagjpeg.h
+++ b/include/wx/imagjpeg.h
@@ -10,41 +10,39 @@
 #ifndef _WX_IMAGJPEG_H_
 #define _WX_IMAGJPEG_H_
 
 #ifndef _WX_IMAGJPEG_H_
 #define _WX_IMAGJPEG_H_
 

-#ifdef __GNUG__
-#pragma interface "imagjpeg.h"
-#endif
-
-#include "wx/image.h"
+#include "wx/defs.h"

 
 //-----------------------------------------------------------------------------
 // wxJPEGHandler
 //-----------------------------------------------------------------------------
 
 #if wxUSE_LIBJPEG
 
 //-----------------------------------------------------------------------------
 // wxJPEGHandler
 //-----------------------------------------------------------------------------
 
 #if wxUSE_LIBJPEG

-class WXDLLEXPORT wxJPEGHandler: public wxImageHandler
-{
-  DECLARE_DYNAMIC_CLASS(wxJPEGHandler)

 
 

-public:
+#include "wx/image.h"

 
 

-  inline wxJPEGHandler()
-  {
-      m_name = "JPEG file";
-      m_extension = "jpg";
-      m_type = wxBITMAP_TYPE_JPEG;
-      m_mime = "image/jpeg";
-  };
+class WXDLLIMPEXP_CORE wxJPEGHandler: public wxImageHandler
+{
+public:
+    inline wxJPEGHandler()
+    {
+        m_name = wxT("JPEG file");
+        m_extension = wxT("jpg");
+        m_type = wxBITMAP_TYPE_JPEG;
+        m_mime = wxT("image/jpeg");
+    }

 
 #if wxUSE_STREAMS
 
 #if wxUSE_STREAMS

-  virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=0 );
-  virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
-  virtual bool DoCanRead( wxInputStream& stream );
-#endif
-};
+    virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 );
+    virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true );
+protected:
+    virtual bool DoCanRead( wxInputStream& stream );

 #endif
 
 #endif
 

+private:
+    DECLARE_DYNAMIC_CLASS(wxJPEGHandler)
+};

 
 

+#endif // wxUSE_LIBJPEG

 
 

-#endif
-  // _WX_IMAGJPEG_H_
+#endif // _WX_IMAGJPEG_H_