adaption for CW 8.3 and quick hack for unicode text control size

[wxWidgets.git] / src / cocoa / bitmap.mm

diff --git a/src/cocoa/bitmap.mm b/src/cocoa/bitmap.mm
index 79ec8ebcf066d008c9a2cefb9c8324db7bc6a2ca..1eac66273f2e35d245d5aa155f3e3037abd0dc6b 100644 (file)
--- a/src/cocoa/bitmap.mm
+++ b/src/cocoa/bitmap.mm
@@ -159,7 +159,7 @@ WX_NSImage wxBitmap::GetNSImage(bool useMask) const
     {
         // Show before/after to prove that the bitmap itself is not changed
         // even though we just composited onto the NSImage
     {
         // Show before/after to prove that the bitmap itself is not changed
         // even though we just composited onto the NSImage

-        wxLogTrace(wxTRACE_COCOA,"Before: bpp=%d",[M_BITMAPDATA->m_cocoaNSBitmapImageRep bitsPerPixel]);
+        wxLogTrace(wxTRACE_COCOA,wxT("Before: bpp=%d"),[M_BITMAPDATA->m_cocoaNSBitmapImageRep bitsPerPixel]);

         NSImage *maskImage = [[NSImage alloc]
                 initWithSize:NSMakeSize(GetWidth(), GetHeight())];
         [maskImage addRepresentation: GetMask()->GetNSBitmapImageRep()];
         NSImage *maskImage = [[NSImage alloc]
                 initWithSize:NSMakeSize(GetWidth(), GetHeight())];
         [maskImage addRepresentation: GetMask()->GetNSBitmapImageRep()];


@@ -167,7 +167,7 @@ WX_NSImage wxBitmap::GetNSImage(bool useMask) const
         [maskImage compositeToPoint:NSZeroPoint operation:NSCompositeDestinationIn];
         [nsimage unlockFocus];
         [maskImage release];
         [maskImage compositeToPoint:NSZeroPoint operation:NSCompositeDestinationIn];
         [nsimage unlockFocus];
         [maskImage release];

-        wxLogTrace(wxTRACE_COCOA,"After: bpp=%d",[M_BITMAPDATA->m_cocoaNSBitmapImageRep bitsPerPixel]);
+        wxLogTrace(wxTRACE_COCOA,wxT("After: bpp=%d"),[M_BITMAPDATA->m_cocoaNSBitmapImageRep bitsPerPixel]);

     }
     return nsimage;
 }
     }
     return nsimage;
 }


@@ -512,11 +512,11 @@ bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
     return FALSE;
 }
 
     return FALSE;
 }
 

-template <class PixelData>
+template <typename PixelData>

 static bool wxMask_CreateFromBitmapData(PixelData srcData, const wxColour& colour, unsigned char *dstData)
 {
     wxCHECK_MSG(dstData,false,wxT("Couldn't access mask data"));
 static bool wxMask_CreateFromBitmapData(PixelData srcData, const wxColour& colour, unsigned char *dstData)
 {
     wxCHECK_MSG(dstData,false,wxT("Couldn't access mask data"));

-    class PixelData::Iterator p(srcData);
+    typename PixelData::Iterator p(srcData);

     const int nRows = srcData.GetHeight();
     const int nCols = srcData.GetWidth();
     // Total number of bytes per destination column
     const int nRows = srcData.GetHeight();
     const int nCols = srcData.GetWidth();
     // Total number of bytes per destination column


@@ -525,7 +525,7 @@ static bool wxMask_CreateFromBitmapData(PixelData srcData, const wxColour& colou
     const int width_aligned = nCols/8*8;
     for(int y=0; y<nRows; ++y)
     {
     const int width_aligned = nCols/8*8;
     for(int y=0; y<nRows; ++y)
     {

-        class PixelData::Iterator rowStart(p);
+        typename PixelData::Iterator rowStart(p);

         unsigned char *dstRow = dstData + y*dstRowLength;
         for(int x=0; x<width_aligned; x+=8)
         {
         unsigned char *dstRow = dstData + y*dstRowLength;
         for(int x=0; x<width_aligned; x+=8)
         {