Fix crash when auto-sizing a wxDataViewCtrl column.

[wxWidgets.git] / include / wx / generic / icon.h

diff --git a/include/wx/generic/icon.h b/include/wx/generic/icon.h
index bc20e9f175605c0c7cca2eaf3e0932f8c9998179..7a336d37cee3ebcb07eb415c62bedf0e32694794 100644 (file)
--- a/include/wx/generic/icon.h
+++ b/include/wx/generic/icon.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -42,12 +41,13 @@ public:
     {
     }
 
-    bool LoadFile(const wxString& name, wxBitmapType flags = wxICON_DEFAULT_TYPE,
+    bool LoadFile(const wxString& name, wxBitmapType flags,
                   int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight))
         { return wxBitmap::LoadFile(name, flags); }
 
     // unhide the base class version
-    virtual bool LoadFile(const wxString& name, wxBitmapType flags)
+    virtual bool LoadFile(const wxString& name,
+                          wxBitmapType flags = wxICON_DEFAULT_TYPE)
         { return wxBitmap::LoadFile(name, flags); }
 
     // create from bitmap (which should have a mask unless it's monochrome):