No *.h in src/common/ anymore.

[wxWidgets.git] / src / mac / carbon / bitmap.cpp

diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index 2deb6dc221c65989ca3e8984c8ca12d9fad1a9f2..a43d731eb391d8adbd857c71579b10fba551dced 100644 (file)
--- a/src/mac/carbon/bitmap.cpp
+++ b/src/mac/carbon/bitmap.cpp
@@ -9,11 +9,11 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "bitmap.h"
 #endif
 
-#include "wx/defs.h"
+#include "wx/wxprec.h"
 
 #include "wx/bitmap.h"
 #include "wx/icon.h"
@@ -324,12 +324,12 @@ void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bi
                 if ( bitmap.GetMask() )
                 {
                     info->u.cIconHandle = wxMacCreateCIcon( MAC_WXHBITMAP(bmap->m_hBitmap) , MAC_WXHBITMAP(bitmap.GetMask()->GetMaskBitmap()) ,
-                                                           24 , bmap->m_width ) ;
+                                                           8 , bmap->m_width ) ;
                 }
                 else
                 {
                     info->u.cIconHandle = wxMacCreateCIcon( MAC_WXHBITMAP(bmap->m_hBitmap) , NULL ,
-                                                           24 , bmap->m_width ) ;
+                                                           8 , bmap->m_width ) ;
                 }
             }
             else
@@ -1287,9 +1287,9 @@ class WXDLLEXPORT wxPICTResourceHandler: public wxBitmapHandler
 public:
     inline wxPICTResourceHandler()
     {
-        m_name = wxT("Macintosh Pict resource");
-        m_extension = wxEmptyString;
-        m_type = wxBITMAP_TYPE_PICT_RESOURCE;
+        SetName(wxT("Macintosh Pict resource"));
+        SetExtension(wxEmptyString);
+        SetType(wxBITMAP_TYPE_PICT_RESOURCE);
     };
 
     virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,