fixing 'id' objc.h collisions, listbox rewrite

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

diff --git a/include/wx/imagjpeg.h b/include/wx/imagjpeg.h
index bf7594fae1cc3c3f15470eb951b4a26dc3454b93..6a579864b9baf3caea316b16b72fd1d1fa39271b 100644 (file)
--- a/include/wx/imagjpeg.h
+++ b/include/wx/imagjpeg.h
@@ -10,27 +10,16 @@
 #ifndef _WX_IMAGJPEG_H_
 #define _WX_IMAGJPEG_H_
 
 #ifndef _WX_IMAGJPEG_H_
 #define _WX_IMAGJPEG_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "imagjpeg.h"
-#endif
-
-#include "wx/image.h"
-
-// defines for wxImage::SetOption
-#define wxIMAGE_OPTION_RESOLUTION            wxString(_T("Resolution"))
-#define wxIMAGE_OPTION_RESOLUTIONUNIT        wxString(_T("ResolutionUnit"))
-
-enum
-{
-    wxIMAGE_RESOLUTION_INCHES = 1,
-    wxIMAGE_RESOLUTION_CM = 2
-};
+#include "wx/defs.h"

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

+
+#include "wx/image.h"
+

 class WXDLLEXPORT wxJPEGHandler: public wxImageHandler
 {
 public:
 class WXDLLEXPORT wxJPEGHandler: public wxImageHandler
 {
 public:


@@ -45,16 +34,15 @@ public:
 #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 );
 #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 );

+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_