reorder the classes, putting first the basic ones and towards the end of the file...

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

diff --git a/interface/wx/image.h b/interface/wx/image.h
index 8c9208bf35236b0cec160db2aa67af834feca575..a6086356f7c654533858eaef45e436b483f34388 100644 (file)
--- a/interface/wx/image.h
+++ b/interface/wx/image.h
@@ -702,7 +702,7 @@ public:
 
         @see wxImageHandler
     */
 
         @see wxImageHandler
     */

-    static wxList GetHandlers();
+    static wxList& GetHandlers();

 
     /**
         Gets the height of the image in pixels.
 
     /**
         Gets the height of the image in pixels.


@@ -1446,6 +1446,12 @@ public:
     wxImage& operator=(const wxImage& image);
 };
 
     wxImage& operator=(const wxImage& image);
 };
 

+/**
+    An instance of an empty image without an alpha channel.
+*/
+wxImage wxNullImage;
+
+

 // ============================================================================
 // Global functions/macros
 // ============================================================================
 // ============================================================================
 // Global functions/macros
 // ============================================================================