Commit wxComboCtrl clipping patch from J. Salli

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

diff --git a/include/wx/image.h b/include/wx/image.h
index aa801035f6242be29b1565adafaff09ea3230e18..5aa6984d2844fa3bd23d401f9c4d6aa6734f09ac 100644 (file)
--- a/include/wx/image.h
+++ b/include/wx/image.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        image.h
+// Name:        wx/image.h

 // Purpose:     wxImage class
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Purpose:     wxImage class
 // Author:      Robert Roebling
 // RCS-ID:      $Id$


@@ -11,6 +11,9 @@
 #define _WX_IMAGE_H_
 
 #include "wx/defs.h"
 #define _WX_IMAGE_H_
 
 #include "wx/defs.h"

+
+#if wxUSE_IMAGE
+

 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/gdicmn.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/gdicmn.h"


@@ -20,8 +23,6 @@
 #  include "wx/stream.h"
 #endif
 
 #  include "wx/stream.h"
 #endif
 

-#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
 // on some systems (Unixware 7.x) index is defined as a macro in the headers
 // which breaks the compilation below
 #undef index


@@ -393,6 +394,9 @@ protected:
     // note that index must be multiplied by 3 when using it with RGB array
     long XYToIndex(int x, int y) const;
 
     // note that index must be multiplied by 3 when using it with RGB array
     long XYToIndex(int x, int y) const;
 

+    virtual wxObjectRefData* CreateRefData() const;
+    virtual wxObjectRefData* CloneRefData(const wxObjectRefData* data) const;
+

 private:
     friend class WXDLLEXPORT wxImageHandler;
 
 private:
     friend class WXDLLEXPORT wxImageHandler;
 


@@ -422,4 +426,3 @@ extern WXDLLEXPORT_DATA(wxImage)    wxNullImage;
 
 #endif
   // _WX_IMAGE_H_
 
 #endif
   // _WX_IMAGE_H_

-