use GetText() instead of GetText(wxString&), made some methods inline

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

diff --git a/src/mac/bitmap.cpp b/src/mac/bitmap.cpp
index 5d2b9fa638534fd3948b2ee7ab75379782e97ee5..9e47fe6728743bb64979844460917be6bcc1d4ca 100644 (file)
--- a/src/mac/bitmap.cpp
+++ b/src/mac/bitmap.cpp
@@ -21,13 +21,12 @@
 #include "wx/icon.h"
 #include "wx/log.h"
 #include "wx/image.h"
 #include "wx/icon.h"
 #include "wx/log.h"
 #include "wx/image.h"

+#include "wx/xpmdecod.h"

 
 

-extern "C" 
+extern "C"

 {
 {

-#ifdef __UNIX__
-    #include "xpm/xpm.h"
-#else
-       #include "xpm.h"
+#ifdef OBSOLETE_XPM_DATA_HANDLER
+  #include "xpm.h"

 #endif
 } ;
 
 #endif
 } ;
 


@@ -200,9 +199,10 @@ wxBitmapRefData::wxBitmapRefData()
     m_quality = 0;
     m_numColors = 0;
     m_bitmapMask = NULL;
     m_quality = 0;
     m_numColors = 0;
     m_bitmapMask = NULL;

-               m_hBitmap = NULL ;
-               m_hPict = NULL ;
-               m_bitmapType = kMacBitmapTypeUnknownType ;
+    m_hBitmap = NULL ;
+    m_hPict = NULL ;
+    m_hIcon = NULL ;
+    m_bitmapType = kMacBitmapTypeUnknownType ;

 }
 
 wxBitmapRefData::~wxBitmapRefData()
 }
 
 wxBitmapRefData::~wxBitmapRefData()


@@ -227,6 +227,13 @@ wxBitmapRefData::~wxBitmapRefData()
                                }
                        }
                        break ;
                                }
                        }
                        break ;

+               case kMacBitmapTypeIcon :
+               if ( m_hIcon )
+               {
+                       DisposeCIcon( m_hIcon ) ;
+                       m_hIcon = NULL ;
+               }
+               

                default :
                        // unkown type ?
                        break ;
                default :
                        // unkown type ?
                        break ;


@@ -265,55 +272,54 @@ wxBitmap::wxBitmap(const char bits[], int the_width, int the_height, int no_bits
     M_BITMAPDATA->m_numColors = 0;
     if ( no_bits == 1 )
     {
     M_BITMAPDATA->m_numColors = 0;
     if ( no_bits == 1 )
     {

-       M_BITMAPDATA->m_bitmapType = kMacBitmapTypeGrafWorld ;
-       M_BITMAPDATA->m_hBitmap = wxMacCreateGWorld( the_width , the_height , no_bits ) ;
-       M_BITMAPDATA->m_ok = (M_BITMAPDATA->m_hBitmap != NULL ) ;
+        M_BITMAPDATA->m_bitmapType = kMacBitmapTypeGrafWorld ;
+        M_BITMAPDATA->m_hBitmap = wxMacCreateGWorld( the_width , the_height , no_bits ) ;
+        M_BITMAPDATA->m_ok = (M_BITMAPDATA->m_hBitmap != NULL ) ;

        
        

-       CGrafPtr        origPort ;
-       GDHandle        origDevice ;
+        CGrafPtr       origPort ;
+        GDHandle       origDevice ;

        
        

-       GetGWorld( &origPort , &origDevice ) ;
-       SetGWorld( M_BITMAPDATA->m_hBitmap , NULL ) ;
-       LockPixels( GetGWorldPixMap( M_BITMAPDATA->m_hBitmap ) ) ;
+        GetGWorld( &origPort , &origDevice ) ;
+        SetGWorld( M_BITMAPDATA->m_hBitmap , NULL ) ;
+        LockPixels( GetGWorldPixMap( M_BITMAPDATA->m_hBitmap ) ) ;

        
        

-       // bits is a char array
+        // bits is a char array

        
        

-       unsigned char* linestart = (unsigned char*) bits ;
-       int linesize = ( the_width / (sizeof(unsigned char) * 8)) ;
-       if ( the_width % (sizeof(unsigned char) * 8) ) {
-           linesize += sizeof(unsigned char);
-       }
+        unsigned char* linestart = (unsigned char*) bits ;
+        int linesize = ( the_width / (sizeof(unsigned char) * 8)) ;
+        if ( the_width % (sizeof(unsigned char) * 8) ) {
+            linesize += sizeof(unsigned char);
+        }

        
        

-       RGBColor colors[2] = { 
-           { 0xFFFF , 0xFFFF , 0xFFFF } ,
-           { 0, 0 , 0 } 
-       } ;
+        RGBColor colors[2] = { 
+            { 0xFFFF , 0xFFFF , 0xFFFF } ,
+            { 0, 0 , 0 } 
+        } ;

        
        

-       for ( int y = 0 ; y < the_height ; ++y , linestart += linesize )
-       {
-           for ( int x = 0 ; x < the_width ; ++x )
-           {
-               int index = x / 8 ;
-               int bit = x % 8 ;
-               int mask = 1 << bit ;
-               if ( linestart[index] & mask )
-               {
-                   SetCPixel( x , y , &colors[1] ) ;
-               }
-               else
-               {
-                   SetCPixel( x , y , &colors[0] ) ;
-               }
-           }
-           
-       }
-       UnlockPixels( GetGWorldPixMap( M_BITMAPDATA->m_hBitmap ) ) ;
+        for ( int y = 0 ; y < the_height ; ++y , linestart += linesize )
+        {
+            for ( int x = 0 ; x < the_width ; ++x )
+            {
+                int index = x / 8 ;
+                int bit = x % 8 ;
+                int mask = 1 << bit ;
+                if ( linestart[index] & mask )
+                {
+                    SetCPixel( x , y , &colors[1] ) ;
+                }
+                else
+                {
+                    SetCPixel( x , y , &colors[0] ) ;
+                }
+            }
+        }
+        UnlockPixels( GetGWorldPixMap( M_BITMAPDATA->m_hBitmap ) ) ;

        
        

-       SetGWorld( origPort , origDevice ) ;
+        SetGWorld( origPort , origDevice ) ;

     }
     else
     {
     }
     else
     {

-       wxFAIL_MSG(wxT("multicolor BITMAPs not yet implemented"));
+        wxFAIL_MSG(wxT("multicolor BITMAPs not yet implemented"));

     }
     
     if ( wxTheBitmapList ) {
     }
     
     if ( wxTheBitmapList ) {


@@ -345,14 +351,33 @@ wxBitmap::wxBitmap(const wxString& filename, long type)
         wxTheBitmapList->AddBitmap(this);
 }
 
         wxTheBitmapList->AddBitmap(this);
 }
 

-wxBitmap::wxBitmap(const char **data)
+bool wxBitmap::CreateFromXpm(const char **bits)

 {
 {

-    (void) Create((void *)data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
+    wxCHECK_MSG( bits != NULL, FALSE, wxT("invalid bitmap data") )
+    wxXPMDecoder decoder;
+    wxImage img = decoder.ReadData(bits);
+    wxCHECK_MSG( img.Ok(), FALSE, wxT("invalid bitmap data") )    
+    *this = wxBitmap(img);   
+    if ( wxTheBitmapList ) wxTheBitmapList->AddBitmap(this);
+    return TRUE;

 }
 
 }
 

-wxBitmap::wxBitmap(char **data)
+wxBitmap::wxBitmap(const char **bits)

 {
 {

-    (void) Create((void *)data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
+#ifdef OBSOLETE_XPM_DATA_HANDLER
+    (void) Create((void *)bits, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
+#else
+    (void) CreateFromXpm(bits);
+#endif
+}
+
+wxBitmap::wxBitmap(char **bits)
+{
+#ifdef OBSOLETE_XPM_DATA_HANDLER
+    (void) Create((void *)bits, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
+#else
+    (void) CreateFromXpm((const char **)bits);
+#endif

 }
 
 wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const
 }
 
 wxBitmap wxBitmap::GetSubBitmap(const wxRect &rect) const


@@ -471,7 +496,7 @@ void wxBitmap::SetHBITMAP(WXHBITMAP bmp)
 {
     M_BITMAPDATA->m_bitmapType = kMacBitmapTypeGrafWorld ;
     M_BITMAPDATA->m_hBitmap = bmp ;
 {
     M_BITMAPDATA->m_bitmapType = kMacBitmapTypeGrafWorld ;
     M_BITMAPDATA->m_hBitmap = bmp ;

-               M_BITMAPDATA->m_ok = (M_BITMAPDATA->m_hBitmap != NULL ) ;
+       M_BITMAPDATA->m_ok = (M_BITMAPDATA->m_hBitmap != NULL ) ;

 }
 
 bool wxBitmap::LoadFile(const wxString& filename, long type)
 }
 
 bool wxBitmap::LoadFile(const wxString& filename, long type)


@@ -567,7 +592,7 @@ wxBitmap::wxBitmap(const wxImage& image, int depth)
 
     // Create mask
     if ( image.HasMask() ) {
 
     // Create mask
     if ( image.HasMask() ) {

-        wxMask *mask = new wxMask( maskBitmap );
+        SetMask(new wxMask( maskBitmap ));

     }
     
     UnlockPixels( GetGWorldPixMap(GetHBITMAP()) );
     }
     
     UnlockPixels( GetGWorldPixMap(GetHBITMAP()) );


@@ -1264,7 +1289,7 @@ bool wxXPMFileHandler::SaveFile(wxBitmap *bitmap, const wxString& name, int type
 #endif
 }
 
 #endif
 }
 

-
+#ifdef OBSOLETE_XPM_DATA_HANDLER

 class WXDLLEXPORT wxXPMDataHandler: public wxBitmapHandler
 {
   DECLARE_DYNAMIC_CLASS(wxXPMDataHandler)
 class WXDLLEXPORT wxXPMDataHandler: public wxBitmapHandler
 {
   DECLARE_DYNAMIC_CLASS(wxXPMDataHandler)


@@ -1282,10 +1307,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler)
 
 bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth)
 {
 
 bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth)
 {

-       XImage *                ximage = NULL ;
-       XImage *                xshapeimage = NULL ;
-       int                     ErrorStatus;
-       XpmAttributes   xpmAttr;
+    XImage *           ximage = NULL ;
+    XImage *           xshapeimage = NULL ;
+    int                ErrorStatus;
+    XpmAttributes      xpmAttr;

 
     xpmAttr.valuemask = XpmReturnInfos; // get infos back
     ErrorStatus = XpmCreateImageFromData( GetMainDevice() , (char **)data,
 
     xpmAttr.valuemask = XpmReturnInfos; // get infos back
     ErrorStatus = XpmCreateImageFromData( GetMainDevice() , (char **)data,


@@ -1293,27 +1318,27 @@ bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *data, long flags, int widt
 
     if (ErrorStatus == XpmSuccess)
     {
 
     if (ErrorStatus == XpmSuccess)
     {

-                       M_BITMAPHANDLERDATA->m_ok = FALSE;
-                       M_BITMAPHANDLERDATA->m_numColors = 0;
-                       M_BITMAPHANDLERDATA->m_hBitmap = ximage->gworldptr ;
+        M_BITMAPHANDLERDATA->m_ok = FALSE;
+        M_BITMAPHANDLERDATA->m_numColors = 0;
+        M_BITMAPHANDLERDATA->m_hBitmap = ximage->gworldptr ;

          
          

-                       M_BITMAPHANDLERDATA->m_width = ximage->width;
-                       M_BITMAPHANDLERDATA->m_height = ximage->height;
-                       M_BITMAPHANDLERDATA->m_depth = ximage->depth;
-                       M_BITMAPHANDLERDATA->m_numColors = xpmAttr.npixels;
+        M_BITMAPHANDLERDATA->m_width = ximage->width;
+        M_BITMAPHANDLERDATA->m_height = ximage->height;
+        M_BITMAPHANDLERDATA->m_depth = ximage->depth;
+        M_BITMAPHANDLERDATA->m_numColors = xpmAttr.npixels;

        XpmFreeAttributes(&xpmAttr);
        XpmFreeAttributes(&xpmAttr);

-           M_BITMAPHANDLERDATA->m_ok = TRUE;
-                       ximage->gworldptr = NULL ;
-                       XImageFree(ximage); // releases the malloc, but does not detroy
+        M_BITMAPHANDLERDATA->m_ok = TRUE;
+        ximage->gworldptr = NULL ;
+        XImageFree(ximage); // releases the malloc, but does not detroy

                                  // the bitmap
                                  // the bitmap

-                       M_BITMAPHANDLERDATA->m_bitmapType = kMacBitmapTypeGrafWorld ;
-                       if ( xshapeimage != NULL )
-                       {
-                               wxMask* m = new wxMask() ;
-                               m->SetMaskBitmap( xshapeimage->gworldptr ) ;
-                               M_BITMAPHANDLERDATA->m_bitmapMask = m ;
-                       }
-                       return TRUE;
+        M_BITMAPHANDLERDATA->m_bitmapType = kMacBitmapTypeGrafWorld ;
+        if ( xshapeimage != NULL )
+        {
+               wxMask* m = new wxMask() ;
+               m->SetMaskBitmap( xshapeimage->gworldptr ) ;
+               M_BITMAPHANDLERDATA->m_bitmapMask = m ;
+        }
+        return TRUE;

     } 
     else
     {
     } 
     else
     {


@@ -1322,6 +1347,7 @@ bool wxXPMDataHandler::Create(wxBitmap *bitmap, void *data, long flags, int widt
     }
   return FALSE;
 }
     }
   return FALSE;
 }

+#endif

 
 class WXDLLEXPORT wxBMPResourceHandler: public wxBitmapHandler
 {
 
 class WXDLLEXPORT wxBMPResourceHandler: public wxBitmapHandler
 {


@@ -1416,10 +1442,12 @@ void wxBitmap::CleanUpHandlers()
 
 void wxBitmap::InitStandardHandlers()
 {
 
 void wxBitmap::InitStandardHandlers()
 {

-       AddHandler( new wxPICTResourceHandler ) ;
-       AddHandler( new wxICONResourceHandler ) ;
-       AddHandler(new wxXPMFileHandler);
-       AddHandler(new wxXPMDataHandler);
-       AddHandler(new wxBMPResourceHandler);
-       AddHandler(new wxBMPFileHandler);
+    AddHandler(new wxPICTResourceHandler) ;
+    AddHandler(new wxICONResourceHandler) ;
+    AddHandler(new wxXPMFileHandler);
+#ifdef OBSOLETE_XPM_DATA_HANDLER
+    AddHandler(new wxXPMDataHandler);
+#endif
+    AddHandler(new wxBMPResourceHandler);
+    AddHandler(new wxBMPFileHandler);

 }
 }