Refactored & cleaned up wxChoice & wxComboBox code, fixed client data

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

diff --git a/include/wx/mgl/icon.h b/include/wx/mgl/icon.h
index 66c235033e48993c8cb449210d8c6d35c79aa4cc..ca3007a15b746d4070fa63507010a35c92d98d73 100644 (file)
--- a/include/wx/mgl/icon.h
+++ b/include/wx/mgl/icon.h
@@ -3,7 +3,7 @@
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Purpose:
 // Author:      Vaclav Slavik
 // Id:          $Id$

-// Copyright:   (c) 2001 Vaclav Slavik
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -39,9 +39,9 @@ public:
 
     // For compatibility with wxMSW where desired size is sometimes required to
     // distinguish between multiple icons in a resource.
 
     // For compatibility with wxMSW where desired size is sometimes required to
     // distinguish between multiple icons in a resource.

-    wxIcon(const wxString& filename, wxBitmapType type = wxBITMAP_TYPE_ICO_RESOURCE,
+    wxIcon(const wxString& filename, int type = wxBITMAP_TYPE_ICO_RESOURCE,

            int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ) :
            int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ) :

-           wxBitmap(filename, type) {}
+           wxBitmap(filename, (wxBitmapType)type) {}

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