SetTextColour is gone

[wxWidgets.git] / include / wx / mac / carbon / icon.h

diff --git a/include/wx/mac/carbon/icon.h b/include/wx/mac/carbon/icon.h
index bdc0ff755f6a2e459f7b4f4b88803561456b6879..34fe306a7eb0c0771cfd5e74a82992adc485c800 100644 (file)
--- a/include/wx/mac/carbon/icon.h
+++ b/include/wx/mac/carbon/icon.h
@@ -12,50 +12,51 @@
 #ifndef _WX_ICON_H_
 #define _WX_ICON_H_
 
 #ifndef _WX_ICON_H_
 #define _WX_ICON_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "icon.h"
-#endif
-

 #include "wx/bitmap.h"
 
 // Icon
 #include "wx/bitmap.h"
 
 // Icon

-class WXDLLEXPORT wxIcon: public wxBitmap
+class WXDLLEXPORT wxIcon: public wxGDIObject

 {
 public:
 {
 public:

-  wxIcon();
-
-  // Copy constructors
-  wxIcon(const wxIcon& icon)
-      : wxBitmap()
-      { Ref(icon); }
+    wxIcon();

 
 

-  wxIcon(const char **data);
-  wxIcon(char **data);
-  wxIcon(const char bits[], int width , int height );
-  wxIcon(const wxString& name, int flags = wxBITMAP_TYPE_ICON_RESOURCE,
+    wxIcon(const char **data);
+    wxIcon(char **data);
+    wxIcon(const char bits[], int width , int height );
+    wxIcon(const wxString& name, int flags = wxBITMAP_TYPE_ICON_RESOURCE,

          int desiredWidth = -1, int desiredHeight = -1);
          int desiredWidth = -1, int desiredHeight = -1);

-  wxIcon(const wxIconLocation& loc)
-  {
+    wxIcon(const wxIconLocation& loc)
+    {

       LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICON);
       LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICON);

-  }
-  ~wxIcon();
+    }
+    virtual ~wxIcon();

 
 

-  bool LoadFile(const wxString& name, wxBitmapType flags /* = wxBITMAP_TYPE_ICON_RESOURCE */ ,
+    bool LoadFile(const wxString& name, wxBitmapType flags /* = wxBITMAP_TYPE_ICON_RESOURCE */ ,

       int desiredWidth /* = -1 */ , int desiredHeight = -1);
       int desiredWidth /* = -1 */ , int desiredHeight = -1);

-  bool LoadFile(const wxString& name ,wxBitmapType flags = wxBITMAP_TYPE_ICON_RESOURCE )
+    bool LoadFile(const wxString& name ,wxBitmapType flags = wxBITMAP_TYPE_ICON_RESOURCE )

       { return LoadFile( name , flags , -1 , -1 ) ; }
 
       { return LoadFile( name , flags , -1 , -1 ) ; }
 

-  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 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);
+
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;
+    int GetWidth() const;
+    int GetHeight() const;
+    int GetDepth() const;
+    void SetWidth(int w);
+    void SetHeight(int h);
+    void SetDepth(int d);
+    void SetOk(bool isOk);

 
 

-  // 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);
+    WXHICON GetHICON() const ;

 
 

-  DECLARE_DYNAMIC_CLASS(wxIcon)
+    DECLARE_DYNAMIC_CLASS(wxIcon)

 };
 
 /*
 };
 
 /*


@@ -81,9 +82,9 @@ class WXDLLEXPORT wxICONResourceHandler: public wxBitmapHandler
 public:
   inline wxICONResourceHandler()
   {
 public:
   inline wxICONResourceHandler()
   {

-    m_name = wxT("ICON resource");
-    m_extension = wxEmptyString;
-    m_type = wxBITMAP_TYPE_ICON_RESOURCE;
+    SetName(wxT("ICON resource"));
+    SetExtension(wxEmptyString);
+    SetType(wxBITMAP_TYPE_ICON_RESOURCE);

   };
 
   virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
   };
 
   virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,