corrected wxICON for Mac OS (Classic and X)

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

diff --git a/include/wx/mac/bitmap.h b/include/wx/mac/bitmap.h
index 84e7153375ece20bac7abac68973c4d1e520ffa3..5e58198e537a874619a7a671c1fec5f7284655ba 100644 (file)
--- a/include/wx/mac/bitmap.h
+++ b/include/wx/mac/bitmap.h
@@ -69,7 +69,7 @@ protected:
   WXHBITMAP m_maskBitmap;
 };
 
-enum { kMacBitmapTypeUnknownType , kMacBitmapTypeGrafWorld, kMacBitmapTypePict } ;
+enum { kMacBitmapTypeUnknownType , kMacBitmapTypeGrafWorld, kMacBitmapTypePict , kMacBitmapTypeIcon } ;
 
 class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
 {
@@ -92,6 +92,7 @@ public:
        int                                             m_bitmapType ;
        PicHandle                       m_hPict ;
        WXHBITMAP     m_hBitmap;
+       WXHICON m_hIcon ;
   wxMask *      m_bitmapMask; // Optional mask
 };
 
@@ -142,8 +143,9 @@ public:
   wxBitmap(const char bits[], int width, int height, int depth = 1);
 
   // Initialize with XPM data
-  wxBitmap(const char **data);
-  wxBitmap(char **data);
+  bool CreateFromXpm(const char **bits);
+  wxBitmap(const char **bits);
+  wxBitmap(char **bits);
 
   // Load a file or resource
   wxBitmap(const wxString& name, long type = wxBITMAP_TYPE_PICT_RESOURCE);
@@ -210,6 +212,8 @@ protected:
 public:
   void SetHBITMAP(WXHBITMAP bmp);
   WXHBITMAP GetHBITMAP() const;
+  void SetHICON(WXHICON ico);
+  inline WXHICON GetHICON() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_hIcon : 0); }
   
   PicHandle GetPict() const;