Partial fix for #15196: wxRichTextCell caret issues (dghart)

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

diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h
index 4b9e089fbaa06fa342958ce540dfda03274bd98f..8b2620bf4a4bcaa0e6930ff3d83b82d7343933b0 100644 (file)
--- a/include/wx/motif/icon.h
+++ b/include/wx/motif/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,8 +41,13 @@ public:
 
     virtual ~wxIcon();
 
-    bool LoadFile(const wxString& name, wxBitmapType type = wxICON_DEFAULT_TYPE,
-                  int desiredWidth = -1, int desiredHeight = -1);
+    bool LoadFile(const wxString& name, wxBitmapType type,
+                  int desiredWidth, int desiredHeight);
+
+    // unhide the base class version
+    virtual bool LoadFile(const wxString& name,
+                          wxBitmapType flags = wxICON_DEFAULT_TYPE)
+        { return LoadFile(name, flags); }
 
     // create from bitmap (which should have a mask unless it's monochrome):
     // there shouldn't be any implicit bitmap -> icon conversion (i.e. no