corrected conditional compilation

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

diff --git a/include/wx/mac/bitmap.h b/include/wx/mac/bitmap.h
index b06e1030e8dd71ebd97f54f5a61e1b28e68409f8..5e58198e537a874619a7a671c1fec5f7284655ba 100644 (file)
--- a/include/wx/mac/bitmap.h
+++ b/include/wx/mac/bitmap.h
@@ -69,7 +69,7 @@ protected:
   WXHBITMAP m_maskBitmap;
 };
 
   WXHBITMAP m_maskBitmap;
 };
 

-enum { kMacBitmapTypeUnknownType , kMacBitmapTypeGrafWorld, kMacBitmapTypePict } ;
+enum { kMacBitmapTypeUnknownType , kMacBitmapTypeGrafWorld, kMacBitmapTypePict , kMacBitmapTypeIcon } ;

 
 class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
 {
 
 class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
 {


@@ -92,6 +92,7 @@ public:
        int                                             m_bitmapType ;
        PicHandle                       m_hPict ;
        WXHBITMAP     m_hBitmap;
        int                                             m_bitmapType ;
        PicHandle                       m_hPict ;
        WXHBITMAP     m_hBitmap;

+       WXHICON m_hIcon ;

   wxMask *      m_bitmapMask; // Optional mask
 };
 
   wxMask *      m_bitmapMask; // Optional mask
 };
 


@@ -211,6 +212,8 @@ protected:
 public:
   void SetHBITMAP(WXHBITMAP bmp);
   WXHBITMAP GetHBITMAP() const;
 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;
 
   
   PicHandle GetPict() const;