Added wxUSE_SPINCTRL,

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

diff --git a/include/wx/gtk1/icon.h b/include/wx/gtk1/icon.h
index 1611ffe6dd209b83140aaa706112b11bea1db23c..9455d6c8ab0d495d8f0f6ce4e7f00a4951adbd46 100644 (file)
--- a/include/wx/gtk1/icon.h
+++ b/include/wx/gtk1/icon.h
@@ -2,10 +2,9 @@
 // Name:        icon.h
 // Purpose:
 // Author:      Robert Roebling
 // Name:        icon.h
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -32,17 +31,26 @@ class wxIcon;
 
 class wxIcon: public wxBitmap
 {
 
 class wxIcon: public wxBitmap
 {

-  DECLARE_DYNAMIC_CLASS(wxIcon)
-

 public:
 public:

-
-  wxIcon(void);
-  wxIcon(const wxIcon& icon);
-  wxIcon(const wxIcon* icon);
-  wxIcon( char **bits, int width=-1, int height=-1 );
+    wxIcon();
+    wxIcon( const wxIcon& icon);
+    wxIcon( const char **bits, int width=-1, int height=-1 );
+
+    // For compatibility with wxMSW where desired size is sometimes required to
+    // distinguish between multiple icons in a resource.
+    wxIcon( const wxString& filename, int type = wxBITMAP_TYPE_XPM, 
+            int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ) :
+        wxBitmap(filename, type)
+    {
+    }
+    wxIcon( char **bits, int width=-1, int height=-1 );
+
+    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; }

   
   

-  inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }
-  inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; }
+private:
+    DECLARE_DYNAMIC_CLASS(wxIcon)

 };
 
 
 };