[ 1494561 ] wxComboCtrl vertical size fix.

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

diff --git a/include/wx/mgl/icon.h b/include/wx/mgl/icon.h
index ca3007a15b746d4070fa63507010a35c92d98d73..03d1c437a106ae683f5cd7902bd4c4effe601aa2 100644 (file)
--- a/include/wx/mgl/icon.h
+++ b/include/wx/mgl/icon.h
@@ -7,14 +7,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __WX_ICON_H__
 #define __WX_ICON_H__
 
 #ifndef __WX_ICON_H__
 #define __WX_ICON_H__
 

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

 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/bitmap.h"
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/bitmap.h"


@@ -33,7 +28,6 @@ class WXDLLEXPORT wxIcon: public wxBitmap
 {
 public:
     wxIcon() : wxBitmap() {}
 {
 public:
     wxIcon() : wxBitmap() {}

-    wxIcon(const wxIcon& icon);

     wxIcon(const char **bits, int width=-1, int height=-1);
     wxIcon(char **bits, int width=-1, int height=-1);
 
     wxIcon(const char **bits, int width=-1, int height=-1);
     wxIcon(char **bits, int width=-1, int height=-1);
 


@@ -42,16 +36,20 @@ public:
     wxIcon(const wxString& filename, int type = wxBITMAP_TYPE_ICO_RESOURCE,
            int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ) :
            wxBitmap(filename, (wxBitmapType)type) {}
     wxIcon(const wxString& filename, int type = wxBITMAP_TYPE_ICO_RESOURCE,
            int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ) :
            wxBitmap(filename, (wxBitmapType)type) {}

-    
-    wxIcon& operator = (const wxIcon& icon);
-    inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }
-    inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; }
+
+    wxIcon(const wxIconLocation& loc)
+        : wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_ANY)
+    {
+    }
+
+    bool operator==(const wxIcon& icon) const { return m_refData == icon.m_refData; }
+    bool operator!=(const wxIcon& icon) const { return !(*this == icon); }

 
     // create from bitmap (which should have a mask unless it's monochrome):
     // there shouldn't be any implicit bitmap -> icon conversion (i.e. no
     // ctors, assignment operators...), but it's ok to have such function
     void CopyFromBitmap(const wxBitmap& bmp);
 
     // create from bitmap (which should have a mask unless it's monochrome):
     // there shouldn't be any implicit bitmap -> icon conversion (i.e. no
     // ctors, assignment operators...), but it's ok to have such function
     void CopyFromBitmap(const wxBitmap& bmp);

-  
+

 private:
     DECLARE_DYNAMIC_CLASS(wxIcon)
 };
 private:
     DECLARE_DYNAMIC_CLASS(wxIcon)
 };