Added some standard further identifiers to help with WinCE toolbars

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

diff --git a/include/wx/image.h b/include/wx/image.h
index e56104f841f8938d2661885b6e14f087202684a6..0d8f947e3c3a2b789a170667184ca24b3cdcc5ce 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -29,6 +29,10 @@
 
 #if wxUSE_IMAGE
 
 
 #if wxUSE_IMAGE
 

+// on some systems (Unixware 7.x) index is defined as a macro in the headers
+// which breaks the compilation below
+#undef index
+

 #define wxIMAGE_OPTION_FILENAME wxString(_T("FileName"))
 
 //-----------------------------------------------------------------------------
 #define wxIMAGE_OPTION_FILENAME wxString(_T("FileName"))
 
 //-----------------------------------------------------------------------------


@@ -47,7 +51,7 @@ class WXDLLEXPORT wxImageHandler: public wxObject
 {
 public:
     wxImageHandler()
 {
 public:
     wxImageHandler()

-        : m_name(wxT("")), m_extension(wxT("")), m_mime(), m_type(0)
+        : m_name(wxEmptyString), m_extension(wxEmptyString), m_mime(), m_type(0)

         { }
 
 #if wxUSE_STREAMS
         { }
 
 #if wxUSE_STREAMS


@@ -93,7 +97,7 @@ private:
 class WXDLLEXPORT wxImageHistogramEntry
 {
 public:
 class WXDLLEXPORT wxImageHistogramEntry
 {
 public:

-    wxImageHistogramEntry() : index(0), value(0) {}
+    wxImageHistogramEntry() { index = value = 0; }

     unsigned long index;
     unsigned long value;
 };
     unsigned long index;
     unsigned long value;
 };


@@ -136,7 +140,7 @@ class WXDLLEXPORT wxImage: public wxObject
 {
 public:
     wxImage();
 {
 public:
     wxImage();

-    wxImage( int width, int height );
+    wxImage( int width, int height, bool clear = true );

     wxImage( int width, int height, unsigned char* data, bool static_data = FALSE );
     wxImage( const wxString& name, long type = wxBITMAP_TYPE_ANY, int index = -1 );
     wxImage( const wxString& name, const wxString& mimetype, int index = -1 );
     wxImage( int width, int height, unsigned char* data, bool static_data = FALSE );
     wxImage( const wxString& name, long type = wxBITMAP_TYPE_ANY, int index = -1 );
     wxImage( const wxString& name, const wxString& mimetype, int index = -1 );


@@ -149,17 +153,8 @@ public:
     wxImage( const wxImage& image );
     wxImage( const wxImage* image );
 
     wxImage( const wxImage& image );
     wxImage( const wxImage* image );
 

-#if WXWIN_COMPATIBILITY_2_2 && wxUSE_GUI
-    // conversion to/from wxBitmap (deprecated, use wxBitmap's methods instead):
-    wxDEPRECATED( wxImage(const wxBitmap &bitmap) );
-    wxDEPRECATED( wxBitmap ConvertToBitmap() const );
-#ifdef __WXGTK__
-    wxBitmap ConvertToMonoBitmap( unsigned char red, unsigned char green, unsigned char blue ) const;
-#endif
-#endif
-
-    void Create( int width, int height );
-    void Create( int width, int height, unsigned char* data, bool static_data = FALSE );
+    bool Create( int width, int height, bool clear = true );
+    bool Create( int width, int height, unsigned char* data, bool static_data = FALSE );

     void Destroy();
 
     // creates an identical copy of the image (the = operator
     void Destroy();
 
     // creates an identical copy of the image (the = operator


@@ -302,6 +297,8 @@ public:
     static wxImageHandler *FindHandler( long imageType );
     static wxImageHandler *FindHandlerMime( const wxString& mimetype );
 
     static wxImageHandler *FindHandler( long imageType );
     static wxImageHandler *FindHandlerMime( const wxString& mimetype );
 

+    static wxString GetImageExtWildcard();
+

     static void CleanUpHandlers();
     static void InitStandardHandlers();
 
     static void CleanUpHandlers();
     static void InitStandardHandlers();