correct access for virtuals, unneeded includes

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

diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h
index 741874298ca04f746b5409c054455f68229d33ef..8682193961c1960dbb0b2adcad5e7f943fe704c1 100644 (file)
--- a/include/wx/msw/icon.h
+++ b/include/wx/msw/icon.h
@@ -12,10 +12,6 @@
 #ifndef _WX_ICON_H_
 #define _WX_ICON_H_
 
 #ifndef _WX_ICON_H_
 #define _WX_ICON_H_
 

-#ifdef __GNUG__
-    #pragma interface "icon.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------


@@ -48,27 +44,27 @@ public:
         // default
     wxIcon() { }
 
         // default
     wxIcon() { }
 

-        // copy
-    wxIcon(const wxIcon& icon) { Ref(icon); }
-

         // from raw data
     wxIcon(const char bits[], int width, int height);
         // from raw data
     wxIcon(const char bits[], int width, int height);

+

         // from XPM data
     wxIcon(const char **data) { CreateIconFromXpm(data); }
         // from XPM data
     wxIcon(const char **data) { CreateIconFromXpm(data); }

+

     wxIcon(char **data) { CreateIconFromXpm((const char **)data); }
     wxIcon(char **data) { CreateIconFromXpm((const char **)data); }

+

         // from resource/file
     wxIcon(const wxString& name,
            long type = wxBITMAP_TYPE_ICO_RESOURCE,
            int desiredWidth = -1, int desiredHeight = -1);
 
         // from resource/file
     wxIcon(const wxString& name,
            long type = wxBITMAP_TYPE_ICO_RESOURCE,
            int desiredWidth = -1, int desiredHeight = -1);
 

+    wxIcon(const wxIconLocation& loc);
+

     virtual ~wxIcon();
 
     virtual bool LoadFile(const wxString& name,
                           long type = wxBITMAP_TYPE_ICO_RESOURCE,
                           int desiredWidth = -1, int desiredHeight = -1);
 
     virtual ~wxIcon();
 
     virtual bool LoadFile(const wxString& name,
                           long type = wxBITMAP_TYPE_ICO_RESOURCE,
                           int desiredWidth = -1, int desiredHeight = -1);
 

-    wxIcon& operator = (const wxIcon& icon)
-        { if ( *this != icon ) Ref(icon); return *this; }

     bool operator == (const wxIcon& icon) const
         { return m_refData == icon.m_refData; }
     bool operator != (const wxIcon& icon) const
     bool operator == (const wxIcon& icon) const
         { return m_refData == icon.m_refData; }
     bool operator != (const wxIcon& icon) const


@@ -91,6 +87,8 @@ protected:
         return new wxIconRefData;
     }
 
         return new wxIconRefData;
     }
 

+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+

     // create from XPM data
     void CreateIconFromXpm(const char **data);
 
     // create from XPM data
     void CreateIconFromXpm(const char **data);