oops, removed duplicate SetIcons[s]() added in last commit

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

diff --git a/include/wx/imagjpeg.h b/include/wx/imagjpeg.h
index bf7594fae1cc3c3f15470eb951b4a26dc3454b93..465947e67a0a3feabbbbf7586a208a29b14db04e 100644 (file)
--- a/include/wx/imagjpeg.h
+++ b/include/wx/imagjpeg.h
@@ -14,23 +14,16 @@
 #pragma interface "imagjpeg.h"
 #endif
 
 #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:


@@ -51,10 +44,8 @@ public:
 private:
     DECLARE_DYNAMIC_CLASS(wxJPEGHandler)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxJPEGHandler)
 };

-#endif

 
 

+#endif // wxUSE_LIBJPEG

 
 

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