Refactor wxEventLoopSource-related code.

[wxWidgets.git] / src / osx / core / bitmap.cpp

diff --git a/src/osx/core/bitmap.cpp b/src/osx/core/bitmap.cpp
index dc09e4a12ba684d5ff65e499c277895e56e57073..331788487f330aac1b10d4ae7782b15b91b0eb1d 100644 (file)
--- a/src/osx/core/bitmap.cpp
+++ b/src/osx/core/bitmap.cpp
@@ -21,6 +21,8 @@
 #endif
 
 #include "wx/metafile.h"
 #endif
 
 #include "wx/metafile.h"

+#include "wx/xpmdecod.h"
+

 #include "wx/rawbmp.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
 #include "wx/rawbmp.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)


@@ -65,11 +67,9 @@ public:
     void Free();
     void SetOk( bool isOk) { m_ok = isOk; }
 
     void Free();
     void SetOk( bool isOk) { m_ok = isOk; }
 

-#if WXWIN_COMPATIBILITY_2_8

     void SetWidth( int width ) { m_width = width; }
     void SetHeight( int height ) { m_height = height; }
     void SetDepth( int depth ) { m_depth = depth; }
     void SetWidth( int width ) { m_width = width; }
     void SetHeight( int height ) { m_height = height; }
     void SetDepth( int depth ) { m_depth = depth; }

-#endif

 
     int GetWidth() const { return m_width; }
     int GetHeight() const { return m_height; }
 
     int GetWidth() const { return m_width; }
     int GetHeight() const { return m_height; }


@@ -109,7 +109,7 @@ public:
     CGContextRef  GetBitmapContext() const;
 
     int           GetBytesPerRow() const { return m_bytesPerRow; }
     CGContextRef  GetBitmapContext() const;
 
     int           GetBytesPerRow() const { return m_bytesPerRow; }

-private:
+    private :

     bool Create(int width , int height , int depth);
     void Init();
 
     bool Create(int width , int height , int depth);
     void Init();
 


@@ -510,10 +510,10 @@ IconRef wxBitmapRefData::GetIconRef()
             {
                 // setup the header properly
 
             {
                 // setup the header properly
 

-                Handle data;
-                Handle maskdata;
-                unsigned char * maskptr;
-                unsigned char * ptr;
+                Handle data = NULL ;
+                Handle maskdata = NULL ;
+                unsigned char * maskptr = NULL ;
+                unsigned char * ptr = NULL ;

                 size_t datasize, masksize ;
 
                 datasize = sz * sz * 4 ;
                 size_t datasize, masksize ;
 
                 datasize = sz * sz * 4 ;


@@ -639,6 +639,9 @@ CGImageRef wxBitmapRefData::CreateCGImage() const
     {
         if ( m_depth != 1 && m_bitmapMask == NULL )
         {
     {
         if ( m_depth != 1 && m_bitmapMask == NULL )
         {

+#if 0
+            // in order for this code to work properly, wxMask would have to invert black and white
+            // in the native bitmap

             if ( m_bitmapMask )
             {
                 CGImageRef tempImage = CGBitmapContextCreateImage( m_hBitmap );
             if ( m_bitmapMask )
             {
                 CGImageRef tempImage = CGBitmapContextCreateImage( m_hBitmap );


@@ -648,6 +651,7 @@ CGImageRef wxBitmapRefData::CreateCGImage() const
                 CGImageRelease(tempImage);
             }
             else
                 CGImageRelease(tempImage);
             }
             else

+#endif

                 image = CGBitmapContextCreateImage( m_hBitmap );
         }
         else
                 image = CGBitmapContextCreateImage( m_hBitmap );
         }
         else


@@ -1403,7 +1407,6 @@ bool wxBitmap::HasAlpha() const
    return M_BITMAPDATA->HasAlpha() ;
 }
 
    return M_BITMAPDATA->HasAlpha() ;
 }
 

-#if WXWIN_COMPATIBILITY_2_8

 void wxBitmap::SetWidth(int w)
 {
     AllocExclusive();
 void wxBitmap::SetWidth(int w)
 {
     AllocExclusive();


@@ -1421,7 +1424,6 @@ void wxBitmap::SetDepth(int d)
     AllocExclusive();
     M_BITMAPDATA->SetDepth(d);
 }
     AllocExclusive();
     M_BITMAPDATA->SetDepth(d);
 }

-#endif // WXWIN_COMPATIBILITY_2_8

 
 void wxBitmap::SetOk(bool isOk)
 {
 
 void wxBitmap::SetOk(bool isOk)
 {