Implemented wxToggleButton under Motif.

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

diff --git a/include/wx/image.h b/include/wx/image.h
index 848f5e324a36777d77b8577e5cc2d6773d42c58b..a165ad27949b1d21ad65820d365a5f04c8a9fd61 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -18,7 +18,9 @@
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/gdicmn.h"
-#include "wx/bitmap.h"
+#if WXWIN_COMPATIBILITY_2_2
+#  include "wx/bitmap.h"
+#endif
 #include "wx/hashmap.h"
 
 #if wxUSE_STREAMS
@@ -35,6 +37,7 @@
 
 class WXDLLEXPORT wxImageHandler;
 class WXDLLEXPORT wxImage;
+class WXDLLEXPORT wxPalette;
 
 //-----------------------------------------------------------------------------
 // wxImageHandler
@@ -97,7 +100,7 @@ public:
 
 WX_DECLARE_EXPORTED_HASH_MAP(unsigned long, wxImageHistogramEntry,
                              wxIntegerHash, wxIntegerEqual,
-                             wxImageHistogram)
+                             wxImageHistogram);
 
 //-----------------------------------------------------------------------------
 // wxImage
@@ -122,8 +125,8 @@ public:
 
 #if WXWIN_COMPATIBILITY_2_2 && wxUSE_GUI
     // conversion to/from wxBitmap (deprecated, use wxBitmap's methods instead):
-    wxImage( const wxBitmap &bitmap );
-    wxBitmap ConvertToBitmap() const;
+    wxDEPRECATED( wxImage(const wxBitmap &bitmap) );
+    wxDEPRECATED( wxBitmap ConvertToBitmap() const );
 #ifdef __WXGTK__
     wxBitmap ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue ) const;
 #endif