Toolbar/tooltip udates

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

diff --git a/include/wx/mac/icon.h b/include/wx/mac/icon.h
index df475672ba243c5a826fb59cf52864485ffeb66e..e1aa18fea541706b14d12faf370060a83193b15f 100644 (file)
--- a/include/wx/mac/icon.h
+++ b/include/wx/mac/icon.h
@@ -18,23 +18,6 @@
 
 #include "wx/bitmap.h"
 
 
 #include "wx/bitmap.h"
 

-class WXDLLEXPORT wxIconRefData: public wxBitmapRefData
-{
-    friend class WXDLLEXPORT wxBitmap;
-    friend class WXDLLEXPORT wxIcon;
-public:
-    wxIconRefData();
-    ~wxIconRefData();
-
-public:
-/* TODO: whatever your actual icon handle is
-  WXHICON m_hIcon;
-*/
-};
-
-#define M_ICONDATA ((wxIconRefData *)m_refData)
-#define M_ICONHANDLERDATA ((wxIconRefData *)bitmap->GetRefData())
-

 // Icon
 class WXDLLEXPORT wxIcon: public wxBitmap
 {
 // Icon
 class WXDLLEXPORT wxIcon: public wxBitmap
 {


@@ -44,36 +27,38 @@ public:
   wxIcon();
 
   // Copy constructors
   wxIcon();
 
   // Copy constructors

-  inline wxIcon(const wxIcon& icon) { Ref(icon); }
-
-  wxIcon(const char bits[], int width, int height);
-  wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE,
+  wxIcon(const wxIcon& icon)
+      : wxBitmap()
+      { Ref(icon); }
+
+  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);
   ~wxIcon();
 
     int desiredWidth = -1, int desiredHeight = -1);
   ~wxIcon();
 

-  bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE,
-      int desiredWidth = -1, int desiredHeight = -1);
+  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 ) ; } 

 
   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; }
 
   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; }

-
-/* TODO: implementation
-  void SetHICON(WXHICON ico);
-  inline WXHICON GetHICON() const { return (M_ICONDATA ? M_ICONDATA->m_hIcon : 0); }
-*/
-
-/* TODO */
-  virtual bool Ok() const { return (m_refData != NULL) ; }
+  
+  // 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);

 };
 
 };
 

-/* Example handlers. TODO: write your own handlers for relevant types.
-
-class WXDLLEXPORT wxICOFileHandler: public wxBitmapHandler
+/*
+class WXDLLEXPORT wxICONFileHandler: public wxBitmapHandler

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxICOFileHandler)
+  DECLARE_DYNAMIC_CLASS(wxICONFileHandler)

 public:
 public:

-  inline wxICOFileHandler()
+  inline wxICONFileHandler()

   {
        m_name = "ICO icon file";
        m_extension = "ico";
   {
        m_name = "ICO icon file";
        m_extension = "ico";


@@ -83,16 +68,17 @@ public:
   virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
       int desiredWidth = -1, int desiredHeight = -1);
 };
   virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
       int desiredWidth = -1, int desiredHeight = -1);
 };

+*/

 
 

-class WXDLLEXPORT wxICOResourceHandler: public wxBitmapHandler
+class WXDLLEXPORT wxICONResourceHandler: public wxBitmapHandler

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxICOResourceHandler)
+  DECLARE_DYNAMIC_CLASS(wxICONResourceHandler)

 public:
 public:

-  inline wxICOResourceHandler()
+  inline wxICONResourceHandler()

   {
   {

-       m_name = "ICO resource";
-       m_extension = "ico";
-       m_type = wxBITMAP_TYPE_ICO_RESOURCE;
+       m_name = "ICON resource";
+       m_extension = "";
+       m_type = wxBITMAP_TYPE_ICON_RESOURCE;

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


@@ -100,7 +86,5 @@ public:
 
 };
 
 
 };
 

-*/
-

 #endif
     // _WX_ICON_H_
 #endif
     // _WX_ICON_H_