Fix line indices translation in wxGrid::DoEndDragResizeLine().

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

diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp
index 1e8ff645c6a280c778a80dfcef5d0c836055f76e..e903a33e8b10bc3877aa66b98c95fe7bc17b862a 100644 (file)
--- a/src/msw/bitmap.cpp
+++ b/src/msw/bitmap.cpp
@@ -56,7 +56,7 @@
 #endif // no CLR_INVALID
 
 // ----------------------------------------------------------------------------
 #endif // no CLR_INVALID
 
 // ----------------------------------------------------------------------------

-// Bitmap data
+// wxBitmapRefData

 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxBitmapRefData : public wxGDIImageRefData
 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxBitmapRefData : public wxGDIImageRefData


@@ -92,12 +92,12 @@ public:
     // MSW-specific
     // ------------
 
     // MSW-specific
     // ------------
 

-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL

     // this field is solely for error checking: we detect selecting a bitmap
     // into more than one DC at once or deleting a bitmap still selected into a
     // DC (both are serious programming errors under Windows)
     wxDC         *m_selectedInto;
     // this field is solely for error checking: we detect selecting a bitmap
     // into more than one DC at once or deleting a bitmap still selected into a
     // DC (both are serious programming errors under Windows)
     wxDC         *m_selectedInto;

-#endif // __WXDEBUG__
+#endif // wxDEBUG_LEVEL

 
 #if wxUSE_WXDIB
     // when GetRawData() is called for a DDB we need to convert it to a DIB
 
 #if wxUSE_WXDIB
     // when GetRawData() is called for a DDB we need to convert it to a DIB


@@ -185,7 +185,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
 
 wxBitmapRefData::wxBitmapRefData()
 {
 
 wxBitmapRefData::wxBitmapRefData()
 {

-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL

     m_selectedInto = NULL;
 #endif
     m_bitmapMask = NULL;
     m_selectedInto = NULL;
 #endif
     m_bitmapMask = NULL;


@@ -202,7 +202,7 @@ wxBitmapRefData::wxBitmapRefData()
 wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData& data)
                : wxGDIImageRefData(data)
 {
 wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData& data)
                : wxGDIImageRefData(data)
 {

-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL

     m_selectedInto = NULL;
 #endif
 
     m_selectedInto = NULL;
 #endif
 


@@ -215,7 +215,7 @@ wxBitmapRefData::wxBitmapRefData(const wxBitmapRefData& data)
     //        CloneGDIRefData()
 
     wxASSERT_MSG( !data.m_isDIB,
     //        CloneGDIRefData()
 
     wxASSERT_MSG( !data.m_isDIB,

-                    _T("can't copy bitmap locked for raw access!") );
+                    wxT("can't copy bitmap locked for raw access!") );

     m_isDIB = false;
 
     m_hasAlpha = data.m_hasAlpha;
     m_isDIB = false;
 
     m_hasAlpha = data.m_hasAlpha;


@@ -227,7 +227,7 @@ void wxBitmapRefData::Free()
                   wxT("deleting bitmap still selected into wxMemoryDC") );
 
 #if wxUSE_WXDIB
                   wxT("deleting bitmap still selected into wxMemoryDC") );
 
 #if wxUSE_WXDIB

-    wxASSERT_MSG( !m_dib, _T("forgot to call wxBitmap::UngetRawData()!") );
+    wxASSERT_MSG( !m_dib, wxT("forgot to call wxBitmap::UngetRawData()!") );

 #endif
 
     if ( m_hBitmap)
 #endif
 
     if ( m_hBitmap)


@@ -238,8 +238,7 @@ void wxBitmapRefData::Free()
         }
     }
 
         }
     }
 

-    delete m_bitmapMask;
-    m_bitmapMask = NULL;
+    wxDELETE(m_bitmapMask);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -323,7 +322,7 @@ bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon,
     switch ( transp )
     {
         default:
     switch ( transp )
     {
         default:

-            wxFAIL_MSG( _T("unknown wxBitmapTransparency value") );
+            wxFAIL_MSG( wxT("unknown wxBitmapTransparency value") );

 
         case wxBitmapTransparency_None:
             // nothing to do, refData->m_hasAlpha is false by default
 
         case wxBitmapTransparency_None:
             // nothing to do, refData->m_hasAlpha is false by default


@@ -408,7 +407,7 @@ bool wxBitmap::CopyFromIcon(const wxIcon& icon, wxBitmapTransparency transp)
 
 bool wxBitmap::CopyFromDIB(const wxDIB& dib)
 {
 
 bool wxBitmap::CopyFromDIB(const wxDIB& dib)
 {

-    wxCHECK_MSG( dib.IsOk(), false, _T("invalid DIB in CopyFromDIB") );
+    wxCHECK_MSG( dib.IsOk(), false, wxT("invalid DIB in CopyFromDIB") );

 
 #ifdef SOMETIMES_USE_DIB
     HBITMAP hbitmap = dib.CreateDDB();
 
 #ifdef SOMETIMES_USE_DIB
     HBITMAP hbitmap = dib.CreateDDB();


@@ -512,11 +511,6 @@ wxBitmap::wxBitmap(const char bits[], int width, int height, int depth)
 #endif
 }
 
 #endif
 }
 

-wxBitmap::wxBitmap(int w, int h, int d)
-{
-    (void)Create(w, h, d);
-}
-

 wxBitmap::wxBitmap(int w, int h, const wxDC& dc)
 {
     (void)Create(w, h, dc);
 wxBitmap::wxBitmap(int w, int h, const wxDC& dc)
 {
     (void)Create(w, h, dc);


@@ -539,7 +533,7 @@ bool wxBitmap::Create(int width, int height, int depth)
 
 bool wxBitmap::Create(int width, int height, const wxDC& dc)
 {
 
 bool wxBitmap::Create(int width, int height, const wxDC& dc)
 {

-    wxCHECK_MSG( dc.IsOk(), false, _T("invalid HDC in wxBitmap::Create()") );
+    wxCHECK_MSG( dc.IsOk(), false, wxT("invalid HDC in wxBitmap::Create()") );

 
     const wxMSWDCImpl *impl = wxDynamicCast( dc.GetImpl(), wxMSWDCImpl );
 
 
     const wxMSWDCImpl *impl = wxDynamicCast( dc.GetImpl(), wxMSWDCImpl );
 


@@ -815,7 +809,7 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth)
 bool wxBitmap::CreateFromImage(const wxImage& image, const wxDC& dc)
 {
     wxCHECK_MSG( dc.IsOk(), false,
 bool wxBitmap::CreateFromImage(const wxImage& image, const wxDC& dc)
 {
     wxCHECK_MSG( dc.IsOk(), false,

-                    _T("invalid HDC in wxBitmap::CreateFromImage()") );
+                    wxT("invalid HDC in wxBitmap::CreateFromImage()") );

 
     const wxMSWDCImpl *impl = wxDynamicCast( dc.GetImpl(), wxMSWDCImpl );
 
 
     const wxMSWDCImpl *impl = wxDynamicCast( dc.GetImpl(), wxMSWDCImpl );
 


@@ -842,7 +836,7 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth, WXHDC hdc)
         return false;
 
     const bool hasAlpha = image.HasAlpha();
         return false;
 
     const bool hasAlpha = image.HasAlpha();

-    
+

     if (depth == -1)
       depth = dib.GetDepth();
 
     if (depth == -1)
       depth = dib.GetDepth();
 


@@ -910,7 +904,7 @@ bool wxBitmap::CreateFromImage(const wxImage& image, int depth, WXHDC hdc)
         hbitmap = ::CreateBitmap(w, h, 1, 1, data);
         if ( !hbitmap )
         {
         hbitmap = ::CreateBitmap(w, h, 1, 1, data);
         if ( !hbitmap )
         {

-            wxLogLastError(_T("CreateBitmap(mask)"));
+            wxLogLastError(wxT("CreateBitmap(mask)"));

         }
         else
         {
         }
         else
         {


@@ -1135,13 +1129,13 @@ wxBitmap wxBitmap::GetSubBitmapOfHDC( const wxRect& rect, WXHDC hdc ) const
 
         if ( !selectDst )
         {
 
         if ( !selectDst )
         {

-            wxLogLastError(_T("SelectObject(destBitmap)"));
+            wxLogLastError(wxT("SelectObject(destBitmap)"));

         }
 
         if ( !::BitBlt(dcDst, 0, 0, rect.width, rect.height,
                        (HDC)hdc, rect.x, rect.y, SRCCOPY) )
         {
         }
 
         if ( !::BitBlt(dcDst, 0, 0, rect.width, rect.height,
                        (HDC)hdc, rect.x, rect.y, SRCCOPY) )
         {

-            wxLogLastError(_T("BitBlt"));
+            wxLogLastError(wxT("BitBlt"));

         }
     }
 
         }
     }
 


@@ -1156,7 +1150,7 @@ wxBitmap wxBitmap::GetSubBitmapOfHDC( const wxRect& rect, WXHDC hdc ) const
         if ( !::BitBlt(dcDst, 0, 0, rect.width, rect.height,
                        dcSrc, rect.x, rect.y, SRCCOPY) )
         {
         if ( !::BitBlt(dcDst, 0, 0, rect.width, rect.height,
                        dcSrc, rect.x, rect.y, SRCCOPY) )
         {

-            wxLogLastError(_T("BitBlt"));
+            wxLogLastError(wxT("BitBlt"));

         }
 
         wxMask *mask = new wxMask((WXHBITMAP) hbmpMask);
         }
 
         wxMask *mask = new wxMask((WXHBITMAP) hbmpMask);


@@ -1175,13 +1169,13 @@ wxBitmap wxBitmap::GetSubBitmapOfHDC( const wxRect& rect, WXHDC hdc ) const
 wxPalette* wxBitmap::GetPalette() const
 {
     return GetBitmapData() ? &GetBitmapData()->m_bitmapPalette
 wxPalette* wxBitmap::GetPalette() const
 {
     return GetBitmapData() ? &GetBitmapData()->m_bitmapPalette

-                           : (wxPalette *) NULL;
+                           : NULL;

 }
 #endif
 
 wxMask *wxBitmap::GetMask() const
 {
 }
 #endif
 
 wxMask *wxBitmap::GetMask() const
 {

-    return GetBitmapData() ? GetBitmapData()->GetMask() : (wxMask *) NULL;
+    return GetBitmapData() ? GetBitmapData()->GetMask() : NULL;

 }
 
 wxBitmap wxBitmap::GetMaskBitmap() const
 }
 
 wxBitmap wxBitmap::GetMaskBitmap() const


@@ -1193,14 +1187,14 @@ wxBitmap wxBitmap::GetMaskBitmap() const
     return bmp;
 }
 
     return bmp;
 }
 

-#ifdef __WXDEBUG__
-

 wxDC *wxBitmap::GetSelectedInto() const
 {
 wxDC *wxBitmap::GetSelectedInto() const
 {

-    return GetBitmapData() ? GetBitmapData()->m_selectedInto : (wxDC *) NULL;
-}
-
+#if wxDEBUG_LEVEL
+    return GetBitmapData() ? GetBitmapData()->m_selectedInto : NULL;
+#else
+    return NULL;

 #endif
 #endif

+}

 
 void wxBitmap::UseAlpha()
 {
 
 void wxBitmap::UseAlpha()
 {


@@ -1217,15 +1211,15 @@ bool wxBitmap::HasAlpha() const
 // wxBitmap setters
 // ----------------------------------------------------------------------------
 
 // wxBitmap setters
 // ----------------------------------------------------------------------------
 

-#ifdef __WXDEBUG__
-

 void wxBitmap::SetSelectedInto(wxDC *dc)
 {
 void wxBitmap::SetSelectedInto(wxDC *dc)
 {

+#if wxDEBUG_LEVEL

     if ( GetBitmapData() )
         GetBitmapData()->m_selectedInto = dc;
     if ( GetBitmapData() )
         GetBitmapData()->m_selectedInto = dc;

-}
-
+#else
+    wxUnusedVar(dc);

 #endif
 #endif

+}

 
 #if wxUSE_PALETTE
 
 
 #if wxUSE_PALETTE
 


@@ -1267,7 +1261,7 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
     if ( !GetBitmapData()->m_isDIB )
     {
         wxCHECK_MSG( !GetBitmapData()->m_dib, NULL,
     if ( !GetBitmapData()->m_isDIB )
     {
         wxCHECK_MSG( !GetBitmapData()->m_dib, NULL,

-                        _T("GetRawData() may be called only once") );
+                        wxT("GetRawData() may be called only once") );

 
         wxDIB *dib = new wxDIB(*this);
         if ( !dib->IsOk() )
 
         wxDIB *dib = new wxDIB(*this);
         if ( !dib->IsOk() )


@@ -1290,7 +1284,7 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
     DIBSECTION ds;
     if ( ::GetObject(hDIB, sizeof(ds), &ds) != sizeof(DIBSECTION) )
     {
     DIBSECTION ds;
     if ( ::GetObject(hDIB, sizeof(ds), &ds) != sizeof(DIBSECTION) )
     {

-        wxFAIL_MSG( _T("failed to get DIBSECTION from a DIB?") );
+        wxFAIL_MSG( wxT("failed to get DIBSECTION from a DIB?") );

 
         return NULL;
     }
 
         return NULL;
     }


@@ -1298,7 +1292,7 @@ void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp)
     // check that the bitmap is in correct format
     if ( ds.dsBm.bmBitsPixel != bpp )
     {
     // check that the bitmap is in correct format
     if ( ds.dsBm.bmBitsPixel != bpp )
     {

-        wxFAIL_MSG( _T("incorrect bitmap type in wxBitmap::GetRawData()") );
+        wxFAIL_MSG( wxT("incorrect bitmap type in wxBitmap::GetRawData()") );

 
         return NULL;
     }
 
         return NULL;
     }


@@ -1434,7 +1428,7 @@ bool wxMask::Create(const wxBitmap& bitmap)
 {
 #ifndef __WXMICROWIN__
     wxCHECK_MSG( bitmap.Ok() && bitmap.GetDepth() == 1, false,
 {
 #ifndef __WXMICROWIN__
     wxCHECK_MSG( bitmap.Ok() && bitmap.GetDepth() == 1, false,

-                 _T("can't create mask from invalid or not monochrome bitmap") );
+                 wxT("can't create mask from invalid or not monochrome bitmap") );

 
     if ( m_maskBitmap )
     {
 
     if ( m_maskBitmap )
     {


@@ -1493,7 +1487,7 @@ bool wxMask::Create(const wxBitmap& bitmap, int paletteIndex)
 bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 {
 #ifndef __WXMICROWIN__
 bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 {
 #ifndef __WXMICROWIN__

-    wxCHECK_MSG( bitmap.Ok(), false, _T("invalid bitmap in wxMask::Create") );
+    wxCHECK_MSG( bitmap.Ok(), false, wxT("invalid bitmap in wxMask::Create") );

 
     if ( m_maskBitmap )
     {
 
     if ( m_maskBitmap )
     {


@@ -1520,7 +1514,7 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour)
 
     // SelectObject() will fail
     wxASSERT_MSG( !bitmap.GetSelectedInto(),
 
     // SelectObject() will fail
     wxASSERT_MSG( !bitmap.GetSelectedInto(),

-                  _T("bitmap can't be selected in another DC") );
+                  wxT("bitmap can't be selected in another DC") );

 
     HGDIOBJ hbmpSrcOld = ::SelectObject(srcDC, GetHbitmapOf(bitmap));
     if ( !hbmpSrcOld )
 
     HGDIOBJ hbmpSrcOld = ::SelectObject(srcDC, GetHbitmapOf(bitmap));
     if ( !hbmpSrcOld )


@@ -1694,7 +1688,7 @@ HICON wxBitmapToIconOrCursor(const wxBitmap& bmp,
         if ( !::BitBlt(dcDst, 0, 0, bmp.GetWidth(), bmp.GetHeight(),
                        dcSrc, 0, 0, SRCAND) )
         {
         if ( !::BitBlt(dcDst, 0, 0, bmp.GetWidth(), bmp.GetHeight(),
                        dcSrc, 0, 0, SRCAND) )
         {

-            wxLogLastError(_T("BitBlt"));
+            wxLogLastError(wxT("BitBlt"));

         }
     }
 
         }
     }
 


@@ -1725,7 +1719,7 @@ HCURSOR wxBitmapToHCURSOR(const wxBitmap& bmp, int hotSpotX, int hotSpotY)
 HBITMAP wxInvertMask(HBITMAP hbmpMask, int w, int h)
 {
 #ifndef __WXMICROWIN__
 HBITMAP wxInvertMask(HBITMAP hbmpMask, int w, int h)
 {
 #ifndef __WXMICROWIN__

-    wxCHECK_MSG( hbmpMask, 0, _T("invalid bitmap in wxInvertMask") );
+    wxCHECK_MSG( hbmpMask, 0, wxT("invalid bitmap in wxInvertMask") );

 
     // get width/height from the bitmap if not given
     if ( !w || !h )
 
     // get width/height from the bitmap if not given
     if ( !w || !h )