added a wxTreeEvent ctor taking the associated wxTreeCtrl and optional wxTreeItemId...

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

diff --git a/include/wx/mgl/icon.h b/include/wx/mgl/icon.h
index a555b7055237666b9fcaaab11205040d8001c2de..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);
 


@@ -44,11 +38,10 @@ public:
            wxBitmap(filename, (wxBitmapType)type) {}
 
     wxIcon(const wxIconLocation& loc)
            wxBitmap(filename, (wxBitmapType)type) {}
 
     wxIcon(const wxIconLocation& loc)

-        : wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_ICO)
+        : wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_ANY)

     {
     }
 
     {
     }
 

-    wxIcon& operator=(const wxIcon& icon);

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