Make wxLog::EnableLogging() and wxLogNull thread-specific.

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

diff --git a/include/wx/generic/icon.h b/include/wx/generic/icon.h
index d7b13446b01c58e13bc0b6243eb746764c83b2e2..3a1f5072acd160792bd4029dee145fa42bf1cbf9 100644 (file)
--- a/include/wx/generic/icon.h
+++ b/include/wx/generic/icon.h
@@ -42,12 +42,13 @@ public:
     {
     }
 
-    bool LoadFile(const wxString& name, wxBitmapType flags = wxICON_DEFAULT_TYPE,
-                  int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1)
+    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):