added wxIconLocation; minor fixes to wxIcon on some platforms

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-21 13:39:40 +00:00
parent 75f7af39d1
commit aaf7ab431b
16 changed files with 224 additions and 44 deletions
--- a/include/wx/os2/icon.h
+++ b/include/wx/os2/icon.h
@@ -66,6 +66,11 @@ public:
           ,int             nDesiredWidth = -1
           ,int             nDesiredHeight = -1
          );
+    wxIcon(const wxIconLocation& loc)
+    {
+        LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICO);
+    }
+
    ~wxIcon();

    bool LoadFile( const wxString& rName