Must clear property selection in wxPGProperty::SetChoices() or risk a crash

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

diff --git a/include/wx/imagjpeg.h b/include/wx/imagjpeg.h
index 7c9a82de9def7865e01c1cde6a37a9e8ac1aca28..873942e00ad07716a3df9327d56b68c92bfaad04 100644 (file)
--- a/include/wx/imagjpeg.h
+++ b/include/wx/imagjpeg.h
@@ -10,41 +10,41 @@
 #ifndef _WX_IMAGJPEG_H_
 #define _WX_IMAGJPEG_H_
 
 #ifndef _WX_IMAGJPEG_H_
 #define _WX_IMAGJPEG_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#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
+
+#include "wx/image.h"
+
+class WXDLLIMPEXP_CORE wxJPEGHandler: public wxImageHandler

 {
 public:
     inline wxJPEGHandler()
     {
         m_name = wxT("JPEG file");
         m_extension = wxT("jpg");
 {
 public:
     inline wxJPEGHandler()
     {
         m_name = wxT("JPEG file");
         m_extension = wxT("jpg");

+        m_altExtensions.Add(wxT("jpeg"));
+        m_altExtensions.Add(wxT("jpe"));

         m_type = wxBITMAP_TYPE_JPEG;
         m_mime = wxT("image/jpeg");
     }
 
 #if wxUSE_STREAMS
         m_type = wxBITMAP_TYPE_JPEG;
         m_mime = wxT("image/jpeg");
     }
 
 #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 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
 
 private:
     DECLARE_DYNAMIC_CLASS(wxJPEGHandler)
 };
     virtual bool DoCanRead( wxInputStream& stream );
 #endif
 
 private:
     DECLARE_DYNAMIC_CLASS(wxJPEGHandler)
 };

-#endif

 
 

+#endif // wxUSE_LIBJPEG

 
 

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