Implement wxCOL_WIDTH_AUTOSIZE on OS X.

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

diff --git a/include/wx/cocoa/icon.h b/include/wx/cocoa/icon.h
index f7bdd3b1c25fae5b3ef0c10613f336d85228b780..3d1f3f86153e133f1f18135a8e32090fe75d4ed7 100644 (file)
--- a/include/wx/cocoa/icon.h
+++ b/include/wx/cocoa/icon.h
@@ -6,7 +6,7 @@
 // Created:     2003/08/11
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/08/11
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_ICON_H__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COCOA_ICON_H__


@@ -18,27 +18,23 @@
 // ========================================================================
 // wxIcon
 // ========================================================================
 // ========================================================================
 // wxIcon
 // ========================================================================

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

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxIcon)

 public:
     wxIcon();
 
 public:
     wxIcon();
 

-    wxIcon(const char **data) { CreateFromXpm(data); }
-    wxIcon(char **data) { CreateFromXpm((const char**)data); }
+    wxIcon(const char* const* data) { CreateFromXpm(data); }

     wxIcon(const char bits[], int width , int height );
     wxIcon(const char bits[], int width , int height );

-    wxIcon(const wxString& name, int flags = wxBITMAP_TYPE_ICON_RESOURCE,
-        int desiredWidth = -1, int desiredHeight = -1);
+    wxIcon(const wxString& name, int flags = wxICON_DEFAULT_TYPE,
+           int desiredWidth = -1, int desiredHeight = -1);

     wxIcon(const wxIconLocation& loc)
     {
         LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICON);
     }
     virtual ~wxIcon();
 
     wxIcon(const wxIconLocation& loc)
     {
         LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICON);
     }
     virtual ~wxIcon();
 

-    bool LoadFile(const wxString& name, wxBitmapType flags /* = wxBITMAP_TYPE_ICON_RESOURCE */ ,
-        int desiredWidth /* = -1 */ , int desiredHeight = -1);
-    bool LoadFile(const wxString& name, wxBitmapType flags = wxBITMAP_TYPE_ICON_RESOURCE )
-    {   return LoadFile( name , flags , -1 , -1 ) ; }
+    bool LoadFile(const wxString& name, wxBitmapType flags = wxICON_DEFAULT_TYPE,
+                  int desiredWidth=-1, int desiredHeight=-1);

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


@@ -49,12 +45,20 @@ public:
     // ctors, assignment operators...), but it's ok to have such function
     void CopyFromBitmap(const wxBitmap& bmp);
 
     // ctors, assignment operators...), but it's ok to have such function
     void CopyFromBitmap(const wxBitmap& bmp);
 

-    bool Ok() const;

     int GetWidth() const;
     int GetHeight() const;
 
     int GetWidth() const;
     int GetHeight() const;
 

+    wxSize GetSize() const { return wxSize(GetWidth(), GetHeight()); }
+

     WX_NSImage GetNSImage() const;
     WX_NSImage GetNSImage() const;

-    bool CreateFromXpm(const char **bits);
+    bool CreateFromXpm(const char* const* bits);
+
+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxIcon)

 };
 
 #endif // _WX_COCOA_ICON_H__
 };
 
 #endif // _WX_COCOA_ICON_H__