removed duplicate method def

[wxWidgets.git] / wxPython / src / image.i

diff --git a/wxPython/src/image.i b/wxPython/src/image.i
index ee6606d097ed606af0fb302c4993bdf616488756..be25dd688dab6f57ebf2fbede866fd10142afd7a 100644 (file)
--- a/wxPython/src/image.i
+++ b/wxPython/src/image.i
@@ -317,6 +317,7 @@ public:
     static void AddHandler( wxImageHandler *handler );
     static void InsertHandler( wxImageHandler *handler );
     static bool RemoveHandler( const wxString& name );
     static void AddHandler( wxImageHandler *handler );
     static void InsertHandler( wxImageHandler *handler );
     static bool RemoveHandler( const wxString& name );

+    static wxString GetImageExtWildcard();

 
 
     %addmethods {
 
 
     %addmethods {


@@ -339,7 +340,7 @@ public:
 
 
 // Alternate constructors
 
 
 // Alternate constructors

-%new wxImage* wxEmptyImage(int width=0, int height=0);
+%new wxImage* wxEmptyImage(int width=0, int height=0, bool clear = TRUE);

 %new wxImage* wxImageFromMime(const wxString& name, const wxString& mimetype, int index = -1);
 %new wxImage* wxImageFromBitmap(const wxBitmap &bitmap);
 %new wxImage* wxImageFromData(int width, int height, unsigned char* data);
 %new wxImage* wxImageFromMime(const wxString& name, const wxString& mimetype, int index = -1);
 %new wxImage* wxImageFromBitmap(const wxBitmap &bitmap);
 %new wxImage* wxImageFromData(int width, int height, unsigned char* data);


@@ -347,11 +348,11 @@ public:
 %new wxImage* wxImageFromStreamMime(wxInputStream& stream, const wxString& mimetype, int index = -1 );
 
 %{
 %new wxImage* wxImageFromStreamMime(wxInputStream& stream, const wxString& mimetype, int index = -1 );
 
 %{

-    wxImage* wxEmptyImage(int width=0, int height=0) {
-        if (width == 0 && height == 0)
-            return new wxImage;
+    wxImage* wxEmptyImage(int width=0, int height=0, bool clear = TRUE) {
+        if (width > 0 && height > 0)
+            return new wxImage(width, height, clear);

         else
         else

-            return new wxImage(width, height);
+            return new wxImage;

     }
 
 
     }
 
 


@@ -399,6 +400,7 @@ void wxInitAllImageHandlers();
 #if 0
 %}
 
 #if 0
 %}
 

+// See also wxPy_ReinitStockObjects in helpers.cpp

 extern wxImage    wxNullImage;
 
 %readwrite
 extern wxImage    wxNullImage;
 
 %readwrite