fixing 'id' objc.h collisions, listbox rewrite

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

diff --git a/include/wx/gtk/icon.h b/include/wx/gtk/icon.h
index 57951a4e385cbf40a5730bfa5b7ca553c7d012b9..9cb880054ff513de2b5fedefae0709e3a789a9ca 100644 (file)
--- a/include/wx/gtk/icon.h
+++ b/include/wx/gtk/icon.h
@@ -2,20 +2,14 @@
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKICONH__
 #define __GTKICONH__
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/bitmap.h"
@@ -24,29 +18,42 @@
 // classes
 //-----------------------------------------------------------------------------
 
-class wxIcon;
+class WXDLLIMPEXP_CORE wxIcon;
 
 //-----------------------------------------------------------------------------
 // wxIcon
 //-----------------------------------------------------------------------------
 
-class wxIcon: public wxBitmap
+class WXDLLIMPEXP_CORE wxIcon: public wxBitmap
 {
-  DECLARE_DYNAMIC_CLASS(wxIcon)
-
 public:
-
-  wxIcon(void) {};
-
-  inline wxIcon(const wxIcon& icon) { Ref(icon); }
-  inline wxIcon(const wxIcon* icon) { if (icon) Ref(*icon); }
-
-  wxIcon( char **bits, const int width = -1, const int height = -1 ) :
-    wxBitmap( bits ) {};
-    
-  inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; }
-  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();
+    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, wxBitmapType 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(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);
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxIcon)
 };