Added GSocket/wxSocket alias to socket.h to prevent us from using GSocket

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

diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h
index 038d778613b9dc45058510a364c14e1051832afd..3e0c24729cfcc2b09ca73043eff3ce5161fe8a44 100644 (file)
--- a/include/wx/os2/icon.h
+++ b/include/wx/os2/icon.h
@@ -49,8 +49,6 @@ public:
   wxIcon(const char bits[], int width, int height);
   wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE,
     int desiredWidth = -1, int desiredHeight = -1);
-  wxIcon( char **bits, int width=-1, int height=-1 );
-
   ~wxIcon();
 
   bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE,
@@ -68,9 +66,11 @@ public:
 /* TODO */
   virtual bool Ok() const { return (m_refData != NULL) ; }
 private:
-  // supress VisAge hiding warning
-  bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_BMP_RESOURCE)
-  { return(wxBitmap::LoadFile(name, type)); }
+  // supress virtual function hiding warning
+  virtual bool LoadFile( const wxString& name
+                        ,long type = wxBITMAP_TYPE_BMP_RESOURCE
+                       )
+   { return(wxBitmap::LoadFile(name, type)); };
 };
 
 /* Example handlers. TODO: write your own handlers for relevant types.