wxCocoa: CodeWarrior (like GCC) mangles struct X and @class X identically.

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

diff --git a/include/wx/imagjpeg.h b/include/wx/imagjpeg.h
index 999bc889cb1f57d64919724741bb330a69be7542..70e9541d594400588f862460c2be2c08d1da3141 100644 (file)
--- a/include/wx/imagjpeg.h
+++ b/include/wx/imagjpeg.h
@@ -10,7 +10,7 @@
 #ifndef _WX_IMAGJPEG_H_
 #define _WX_IMAGJPEG_H_
 
 #ifndef _WX_IMAGJPEG_H_
 #define _WX_IMAGJPEG_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "imagjpeg.h"
 #endif
 
 #pragma interface "imagjpeg.h"
 #endif
 


@@ -23,23 +23,23 @@
 #if wxUSE_LIBJPEG
 class WXDLLEXPORT wxJPEGHandler: public wxImageHandler
 {
 #if wxUSE_LIBJPEG
 class WXDLLEXPORT wxJPEGHandler: public wxImageHandler
 {

-  DECLARE_DYNAMIC_CLASS(wxJPEGHandler)
-

 public:
 public:

-
-  inline wxJPEGHandler()
-  {
-      m_name = "JPEG file";
-      m_extension = "jpg";
-      m_type = wxBITMAP_TYPE_JPEG;
-      m_mime = "image/jpeg";
-  };
+    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=-1 );
-  virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
-  virtual bool DoCanRead( wxInputStream& stream );
+    virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=-1 );
+    virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
+    virtual bool DoCanRead( wxInputStream& stream );

 #endif
 #endif

+
+private:
+    DECLARE_DYNAMIC_CLASS(wxJPEGHandler)

 };
 #endif
 
 };
 #endif