Add some missing methods to match other implementations

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

diff --git a/src/mac/carbon/bitmap.cpp b/src/mac/carbon/bitmap.cpp
index 7ef70887d623c316d3b79f42610d43c03c3ee2e1..67ec56751220ebc2870d375b53315b3c4531777f 100644 (file)
--- a/src/mac/carbon/bitmap.cpp
+++ b/src/mac/carbon/bitmap.cpp
@@ -445,7 +445,7 @@ wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits
     if ( no_bits == 1 )
     {
         M_BITMAPDATA->m_bitmapType = kMacBitmapTypeGrafWorld ;
     if ( no_bits == 1 )
     {
         M_BITMAPDATA->m_bitmapType = kMacBitmapTypeGrafWorld ;

-        MAC_WXHBITMAP(M_BITMAPDATA->m_hBitmap) = wxMacCreateGWorld( the_width , the_height , no_bits ) ;
+        M_BITMAPDATA->m_hBitmap = wxMacCreateGWorld( the_width , the_height , no_bits ) ;

         M_BITMAPDATA->m_ok = (MAC_WXHBITMAP(M_BITMAPDATA->m_hBitmap) != NULL ) ;
 
         CGrafPtr    origPort ;
         M_BITMAPDATA->m_ok = (MAC_WXHBITMAP(M_BITMAPDATA->m_hBitmap) != NULL ) ;
 
         CGrafPtr    origPort ;


@@ -551,7 +551,9 @@ wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
    wxBitmapRefData *ref = (wxBitmapRefData *)ret.GetRefData();
 
    ref->m_numColors     = M_BITMAPDATA->m_numColors;
    wxBitmapRefData *ref = (wxBitmapRefData *)ret.GetRefData();
 
    ref->m_numColors     = M_BITMAPDATA->m_numColors;

-   ref->m_bitmapPalette = M_BITMAPDATA->m_bitmapPalette;
+#if wxUSE_PALETTE
+    ref->m_bitmapPalette = M_BITMAPDATA->m_bitmapPalette;
+#endif // wxUSE_PALETTE

    ref->m_bitmapType    = M_BITMAPDATA->m_bitmapType;
 
    // Copy sub region of this bitmap
    ref->m_bitmapType    = M_BITMAPDATA->m_bitmapType;
 
    // Copy sub region of this bitmap


@@ -721,7 +723,6 @@ bool wxBitmap::Create(void *data, wxBitmapType type, int width, int height, int
 wxBitmap::wxBitmap(const wxImage& image, int depth)
 {
     wxCHECK_RET( image.Ok(), wxT("invalid image") )
 wxBitmap::wxBitmap(const wxImage& image, int depth)
 {
     wxCHECK_RET( image.Ok(), wxT("invalid image") )

-    wxCHECK_RET( depth == -1, wxT("invalid bitmap depth") )

 
     m_refData = new wxBitmapRefData();
 
 
     m_refData = new wxBitmapRefData();
 


@@ -1031,6 +1032,7 @@ void wxBitmap::SetOk(bool isOk)
     M_BITMAPDATA->m_ok = isOk;
 }
 
     M_BITMAPDATA->m_ok = isOk;
 }
 

+#if wxUSE_PALETTE

 wxPalette *wxBitmap::GetPalette() const
 {
    wxCHECK_MSG( Ok(), NULL, wxT("Invalid bitmap  GetPalette()") );
 wxPalette *wxBitmap::GetPalette() const
 {
    wxCHECK_MSG( Ok(), NULL, wxT("Invalid bitmap  GetPalette()") );


@@ -1045,6 +1047,7 @@ void wxBitmap::SetPalette(const wxPalette& palette)
 
     M_BITMAPDATA->m_bitmapPalette = palette ;
 }
 
     M_BITMAPDATA->m_bitmapPalette = palette ;
 }

+#endif // wxUSE_PALETTE

 
 void wxBitmap::SetMask(wxMask *mask)
 {
 
 void wxBitmap::SetMask(wxMask *mask)
 {