Commented out wxAutoNSAutoreleasePool in CallOnInit()

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

diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h
index cbb4f53c69abe990af27b58798e96414619eac30..1f2fab60b99e669e0ef34bb4c55c20fab01f8a31 100644 (file)
--- a/include/wx/motif/icon.h
+++ b/include/wx/motif/icon.h
@@ -12,59 +12,58 @@
 #ifndef _WX_ICON_H_
 #define _WX_ICON_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "icon.h"
 #endif
 
 #include "wx/bitmap.h"
 
-/*
-// Same as for wxBitmap
-class WXDLLEXPORT wxIconRefData: public wxBitmapRefData
-{
-    friend class WXDLLEXPORT wxBitmap;
-    friend class WXDLLEXPORT wxIcon;
-public:
-    wxIconRefData();
-    ~wxIconRefData();
-};
-*/
-
-#define M_ICONDATA ((wxBitmapRefData *)m_refData)
-#define M_ICONHANDLERDATA ((wxBitmapRefData *)bitmap->GetRefData())
-
 // Icon
-class WXDLLEXPORT wxIcon: public wxBitmap
+class WXDLLEXPORT wxIcon : public wxBitmap
 {
-  DECLARE_DYNAMIC_CLASS(wxIcon)
-
 public:
-  wxIcon();
-
-  // Copy constructors
-  inline wxIcon(const wxIcon& icon) { Ref(icon); }
+    wxIcon();
+    
+    // Copy constructors
+    inline wxIcon(const wxIcon& icon) { Ref(icon); }
+    
+    // Initialize with XBM data
+    wxIcon(const char bits[], int width, int height);
+    
+    // Initialize with XPM data
+    wxIcon(const char **data);
+    wxIcon(char **data);
+    
+    wxIcon(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_XPM,
+           int desiredWidth = -1, int desiredHeight = -1)
+    {
+        LoadFile(name, type, desiredWidth, desiredHeight);
+    }
 
-  // Initialize with XBM data
-  wxIcon(const char bits[], int width, int height);
+    wxIcon(const wxIconLocation& loc)
+    {
+        LoadFile(loc.GetFileName());
+    }
 
-  // Initialize with XPM data
-  wxIcon(char **data);
+    ~wxIcon();
+    
+    bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_XPM,
+                  int desiredWidth = -1, int desiredHeight = -1);
 
-  wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_XPM,
-    int desiredWidth = -1, int desiredHeight = -1);
-  ~wxIcon();
+    // 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);
+    
+    wxIcon& operator = (const wxIcon& icon)
+        { if (this != &icon) Ref(icon); return *this; }
+    bool operator == (const wxIcon& icon) const
+        { return m_refData == icon.m_refData; }
+    bool operator != (const wxIcon& icon) const
+        { return !(*this == icon); }
 
-  bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_XPM,
-      int desiredWidth = -1, int desiredHeight = -1);
-//  bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_XBM)
-//    { return wxBitmap::LoadFile(name, type); }
 
-  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; }
-
-  virtual bool Ok() const { return ((m_refData != NULL) && (M_ICONDATA->m_ok)); }
+    DECLARE_DYNAMIC_CLASS(wxIcon);
 };
 
-#endif
-    // _WX_ICON_H_
+#endif // _WX_ICON_H_