don't define min/max macros in windows.h (closes 1052256)

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

diff --git a/include/wx/imagjpeg.h b/include/wx/imagjpeg.h
index 07a1095c1bea4e39d2e1e139b842d53ec8aaacac..e51491e8f7559e6f13b28c0bb1597eee48b15ae7 100644 (file)
--- a/include/wx/imagjpeg.h
+++ b/include/wx/imagjpeg.h
@@ -16,15 +16,6 @@
 
 #include "wx/image.h"
 
 
 #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
-};

 
 //-----------------------------------------------------------------------------
 // wxJPEGHandler
 
 //-----------------------------------------------------------------------------
 // wxJPEGHandler


@@ -43,8 +34,8 @@ public:
     }
 
 #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 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
 
     virtual bool DoCanRead( wxInputStream& stream );
 #endif
 


@@ -53,8 +44,5 @@ private:
 };
 #endif
 
 };
 #endif
 

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