Remove declarations of two non-existent functions in wxMSW wxListCtrl.

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

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index 320d587437672b22ca4ccd1b60d97cc34bd98278..46eebf25c5f2f249eee98cf0dedc766091476346 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -183,13 +183,17 @@ public:
     {
         m_modeOld = ::SetStretchBltMode(m_hdc, COLORONCOLOR);
         if ( !m_modeOld )
     {
         m_modeOld = ::SetStretchBltMode(m_hdc, COLORONCOLOR);
         if ( !m_modeOld )

-            wxLogLastError(_T("SetStretchBltMode"));
+        {
+            wxLogLastError(wxT("SetStretchBltMode"));
+        }

     }
 
     ~StretchBltModeChanger()
     {
         if ( !::SetStretchBltMode(m_hdc, m_modeOld) )
     }
 
     ~StretchBltModeChanger()
     {
         if ( !::SetStretchBltMode(m_hdc, m_modeOld) )

-            wxLogLastError(_T("SetStretchBltMode"));
+        {
+            wxLogLastError(wxT("SetStretchBltMode"));
+        }

     }
 
 private:
     }
 
 private:


@@ -251,7 +255,7 @@ private:
     const wxChar *m_dllName;
 };
 
     const wxChar *m_dllName;
 };
 

-static wxOnceOnlyDLLLoader wxMSIMG32DLL(_T("msimg32"));
+static wxOnceOnlyDLLLoader wxMSIMG32DLL(wxT("msimg32"));

 
 // we must ensure that DLLs are unloaded before the static objects cleanup time
 // because we may hit the notorious DllMain() dead lock in this case if wx is
 
 // we must ensure that DLLs are unloaded before the static objects cleanup time
 // because we may hit the notorious DllMain() dead lock in this case if wx is


@@ -464,7 +468,7 @@ void wxMSWDCImpl::SetClippingHrgn(WXHRGN hrgn)
 #else // !WinCE
     if ( ::ExtSelectClipRgn(GetHdc(), (HRGN)hrgn, RGN_AND) == ERROR )
     {
 #else // !WinCE
     if ( ::ExtSelectClipRgn(GetHdc(), (HRGN)hrgn, RGN_AND) == ERROR )
     {

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

 
         return;
     }
 
         return;
     }


@@ -487,7 +491,7 @@ void wxMSWDCImpl::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h
                                 LogicalToDeviceY(y + h));
     if ( !hrgn )
     {
                                 LogicalToDeviceY(y + h));
     if ( !hrgn )
     {

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

     }
     else
     {
     }
     else
     {


@@ -637,7 +641,7 @@ bool wxMSWDCImpl::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
 {
     WXMICROWIN_CHECK_HDC_RET(false)
 
 {
     WXMICROWIN_CHECK_HDC_RET(false)
 

-    wxCHECK_MSG( col, false, _T("NULL colour parameter in wxMSWDCImpl::GetPixel") );
+    wxCHECK_MSG( col, false, wxT("NULL colour parameter in wxMSWDCImpl::GetPixel") );

 
     // get the color of the pixel
     COLORREF pixelcolor = ::GetPixel(GetHdc(), XLOG2DEV(x), YLOG2DEV(y));
 
     // get the color of the pixel
     COLORREF pixelcolor = ::GetPixel(GetHdc(), XLOG2DEV(x), YLOG2DEV(y));


@@ -1170,7 +1174,7 @@ void wxMSWDCImpl::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool
 {
     WXMICROWIN_CHECK_HDC
 
 {
     WXMICROWIN_CHECK_HDC
 

-    wxCHECK_RET( bmp.IsOk(), _T("invalid bitmap in wxMSWDCImpl::DrawBitmap") );
+    wxCHECK_RET( bmp.IsOk(), wxT("invalid bitmap in wxMSWDCImpl::DrawBitmap") );

 
     int width = bmp.GetWidth(),
         height = bmp.GetHeight();
 
     int width = bmp.GetWidth(),
         height = bmp.GetHeight();


@@ -1465,7 +1469,7 @@ void wxMSWDCImpl::SetFont(const wxFont& font)
         HGDIOBJ hfont = ::SelectObject(GetHdc(), GetHfontOf(font));
         if ( hfont == HGDI_ERROR )
         {
         HGDIOBJ hfont = ::SelectObject(GetHdc(), GetHfontOf(font));
         if ( hfont == HGDI_ERROR )
         {

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

         }
         else // selected ok
         {
         }
         else // selected ok
         {


@@ -1481,7 +1485,7 @@ void wxMSWDCImpl::SetFont(const wxFont& font)
         {
             if ( ::SelectObject(GetHdc(), (HPEN) m_oldFont) == HGDI_ERROR )
             {
         {
             if ( ::SelectObject(GetHdc(), (HPEN) m_oldFont) == HGDI_ERROR )
             {

-                wxLogLastError(_T("SelectObject(old font)"));
+                wxLogLastError(wxT("SelectObject(old font)"));

             }
 
             m_oldFont = 0;
             }
 
             m_oldFont = 0;


@@ -1503,7 +1507,7 @@ void wxMSWDCImpl::SetPen(const wxPen& pen)
         HGDIOBJ hpen = ::SelectObject(GetHdc(), GetHpenOf(pen));
         if ( hpen == HGDI_ERROR )
         {
         HGDIOBJ hpen = ::SelectObject(GetHdc(), GetHpenOf(pen));
         if ( hpen == HGDI_ERROR )
         {

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

         }
         else // selected ok
         {
         }
         else // selected ok
         {


@@ -1519,7 +1523,7 @@ void wxMSWDCImpl::SetPen(const wxPen& pen)
         {
             if ( ::SelectObject(GetHdc(), (HPEN) m_oldPen) == HGDI_ERROR )
             {
         {
             if ( ::SelectObject(GetHdc(), (HPEN) m_oldPen) == HGDI_ERROR )
             {

-                wxLogLastError(_T("SelectObject(old pen)"));
+                wxLogLastError(wxT("SelectObject(old pen)"));

             }
 
             m_oldPen = 0;
             }
 
             m_oldPen = 0;


@@ -1539,26 +1543,33 @@ void wxMSWDCImpl::SetBrush(const wxBrush& brush)
     if ( brush.IsOk() )
     {
         // we must make sure the brush is aligned with the logical coordinates
     if ( brush.IsOk() )
     {
         // we must make sure the brush is aligned with the logical coordinates

-        // before selecting it
+        // before selecting it or using the same brush for the background of
+        // different windows would result in discontinuities
+        wxSize sizeBrushBitmap = wxDefaultSize;

         wxBitmap *stipple = brush.GetStipple();
         if ( stipple && stipple->IsOk() )
         wxBitmap *stipple = brush.GetStipple();
         if ( stipple && stipple->IsOk() )

+            sizeBrushBitmap = stipple->GetSize();
+        else if ( brush.IsHatch() )
+            sizeBrushBitmap = wxSize(8, 8);
+
+        if ( sizeBrushBitmap.IsFullySpecified() )

         {
             if ( !::SetBrushOrgEx
                     (
                         GetHdc(),
         {
             if ( !::SetBrushOrgEx
                     (
                         GetHdc(),

-                        m_deviceOriginX % stipple->GetWidth(),
-                        m_deviceOriginY % stipple->GetHeight(),
+                        m_deviceOriginX % sizeBrushBitmap.x,
+                        m_deviceOriginY % sizeBrushBitmap.y,

                         NULL                    // [out] previous brush origin
                     ) )
             {
                         NULL                    // [out] previous brush origin
                     ) )
             {

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

             }
         }
 
         HGDIOBJ hbrush = ::SelectObject(GetHdc(), GetHbrushOf(brush));
         if ( hbrush == HGDI_ERROR )
         {
             }
         }
 
         HGDIOBJ hbrush = ::SelectObject(GetHdc(), GetHbrushOf(brush));
         if ( hbrush == HGDI_ERROR )
         {

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

         }
         else // selected ok
         {
         }
         else // selected ok
         {


@@ -1574,7 +1585,7 @@ void wxMSWDCImpl::SetBrush(const wxBrush& brush)
         {
             if ( ::SelectObject(GetHdc(), (HPEN) m_oldBrush) == HGDI_ERROR )
             {
         {
             if ( ::SelectObject(GetHdc(), (HPEN) m_oldBrush) == HGDI_ERROR )
             {

-                wxLogLastError(_T("SelectObject(old brush)"));
+                wxLogLastError(wxT("SelectObject(old brush)"));

             }
 
             m_oldBrush = 0;
             }
 
             m_oldBrush = 0;


@@ -1710,7 +1721,7 @@ void wxMSWDCImpl::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y
     HFONT hfontOld;
     if ( font )
     {
     HFONT hfontOld;
     if ( font )
     {

-        wxASSERT_MSG( font->IsOk(), _T("invalid font in wxMSWDCImpl::GetTextExtent") );
+        wxASSERT_MSG( font->IsOk(), wxT("invalid font in wxMSWDCImpl::GetTextExtent") );

 
         hfontOld = (HFONT)::SelectObject(GetHdc(), GetHfontOf(*font));
     }
 
         hfontOld = (HFONT)::SelectObject(GetHdc(), GetHfontOf(*font));
     }


@@ -1723,7 +1734,7 @@ void wxMSWDCImpl::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y
     const size_t len = string.length();
     if ( !::GetTextExtentPoint32(GetHdc(), string.wx_str(), len, &sizeRect) )
     {
     const size_t len = string.length();
     if ( !::GetTextExtentPoint32(GetHdc(), string.wx_str(), len, &sizeRect) )
     {

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

     }
 
 #if !defined(_WIN32_WCE) || (_WIN32_WCE >= 400)
     }
 
 #if !defined(_WIN32_WCE) || (_WIN32_WCE >= 400)


@@ -1883,7 +1894,7 @@ void wxMSWDCImpl::SetMapMode(wxMappingMode mode)
                 break;
 
             default:
                 break;
 
             default:

-                wxFAIL_MSG( _T("unknown mapping mode in SetMapMode") );
+                wxFAIL_MSG( wxT("unknown mapping mode in SetMapMode") );

         }
     }
 
         }
     }
 


@@ -1974,7 +1985,7 @@ bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
                          wxRasterOperationMode rop, bool useMask,
                          wxCoord xsrcMask, wxCoord ysrcMask)
 {
                          wxRasterOperationMode rop, bool useMask,
                          wxCoord xsrcMask, wxCoord ysrcMask)
 {

-    wxCHECK_MSG( source, false, _T("wxMSWDCImpl::Blit(): NULL wxDC pointer") );
+    wxCHECK_MSG( source, false, wxT("wxMSWDCImpl::Blit(): NULL wxDC pointer") );

 
     WXMICROWIN_CHECK_HDC_RET(false)
 
 
     WXMICROWIN_CHECK_HDC_RET(false)
 


@@ -2228,7 +2239,7 @@ bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
                         dwRop
                     ) )
             {
                         dwRop
                     ) )
             {

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

             }
             else
             {
             }
             else
             {


@@ -2241,7 +2252,7 @@ bool wxMSWDCImpl::DoStretchBlit(wxCoord xdest, wxCoord ydest,
             if ( !::BitBlt(GetHdc(), xdest, ydest, dstWidth, dstHeight,
                            hdcSrc, xsrc, ysrc, dwRop) )
             {
             if ( !::BitBlt(GetHdc(), xdest, ydest, dstWidth, dstHeight,
                            hdcSrc, xsrc, ysrc, dwRop) )
             {

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

             }
             else
             {
             }
             else
             {


@@ -2278,7 +2289,7 @@ void wxMSWDCImpl::DoGetSizeMM(int *w, int *h) const
     {
         int wTotal = ::GetDeviceCaps(GetHdc(), HORZRES);
 
     {
         int wTotal = ::GetDeviceCaps(GetHdc(), HORZRES);
 

-        wxCHECK_RET( wTotal, _T("0 width device?") );
+        wxCHECK_RET( wTotal, wxT("0 width device?") );

 
         *w = (wPixels * ::GetDeviceCaps(GetHdc(), HORZSIZE)) / wTotal;
     }
 
         *w = (wPixels * ::GetDeviceCaps(GetHdc(), HORZSIZE)) / wTotal;
     }


@@ -2287,7 +2298,7 @@ void wxMSWDCImpl::DoGetSizeMM(int *w, int *h) const
     {
         int hTotal = ::GetDeviceCaps(GetHdc(), VERTRES);
 
     {
         int hTotal = ::GetDeviceCaps(GetHdc(), VERTRES);
 

-        wxCHECK_RET( hTotal, _T("0 height device?") );
+        wxCHECK_RET( hTotal, wxT("0 height device?") );

 
         *h = (hPixels * ::GetDeviceCaps(GetHdc(), VERTSIZE)) / hTotal;
     }
 
         *h = (hPixels * ::GetDeviceCaps(GetHdc(), VERTSIZE)) / hTotal;
     }


@@ -2451,8 +2462,8 @@ static bool AlphaBlt(HDC hdcDst,
                      HDC hdcSrc,
                      const wxBitmap& bmp)
 {
                      HDC hdcSrc,
                      const wxBitmap& bmp)
 {

-    wxASSERT_MSG( bmp.IsOk() && bmp.HasAlpha(), _T("AlphaBlt(): invalid bitmap") );
-    wxASSERT_MSG( hdcDst && hdcSrc, _T("AlphaBlt(): invalid HDC") );
+    wxASSERT_MSG( bmp.IsOk() && bmp.HasAlpha(), wxT("AlphaBlt(): invalid bitmap") );
+    wxASSERT_MSG( hdcDst && hdcSrc, wxT("AlphaBlt(): invalid HDC") );

 
     // do we have AlphaBlend() and company in the headers?
 #if defined(AC_SRC_OVER) && wxUSE_DYNLIB_CLASS
 
     // do we have AlphaBlend() and company in the headers?
 #if defined(AC_SRC_OVER) && wxUSE_DYNLIB_CLASS


@@ -2462,7 +2473,7 @@ static bool AlphaBlt(HDC hdcDst,
                                         BLENDFUNCTION);
 
     static AlphaBlend_t
                                         BLENDFUNCTION);
 
     static AlphaBlend_t

-        pfnAlphaBlend = (AlphaBlend_t)wxMSIMG32DLL.GetSymbol(_T("AlphaBlend"));
+        pfnAlphaBlend = (AlphaBlend_t)wxMSIMG32DLL.GetSymbol(wxT("AlphaBlend"));

     if ( pfnAlphaBlend )
     {
         BLENDFUNCTION bf;
     if ( pfnAlphaBlend )
     {
         BLENDFUNCTION bf;


@@ -2479,7 +2490,7 @@ static bool AlphaBlt(HDC hdcDst,
             return true;
         }
 
             return true;
         }
 

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

     }
 #else
     wxUnusedVar(hdcSrc);
     }
 #else
     wxUnusedVar(hdcSrc);


@@ -2517,7 +2528,7 @@ wxAlphaBlend(HDC hdcDst, int xDst, int yDst,
 
     if ( !::BitBlt(hdcMem, 0, 0, dstWidth, dstHeight, hdcDst, xDst, yDst, SRCCOPY) )
     {
 
     if ( !::BitBlt(hdcMem, 0, 0, dstWidth, dstHeight, hdcDst, xDst, yDst, SRCCOPY) )
     {

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

     }
 
     // combine them with the source bitmap using alpha
     }
 
     // combine them with the source bitmap using alpha


@@ -2525,7 +2536,7 @@ wxAlphaBlend(HDC hdcDst, int xDst, int yDst,
                      dataSrc((wxBitmap &)bmpSrc);
 
     wxCHECK_RET( dataDst && dataSrc,
                      dataSrc((wxBitmap &)bmpSrc);
 
     wxCHECK_RET( dataDst && dataSrc,

-                    _T("failed to get raw data in wxAlphaBlend") );
+                    wxT("failed to get raw data in wxAlphaBlend") );

 
     wxAlphaPixelData::Iterator pDst(dataDst),
                                pSrc(dataSrc);
 
     wxAlphaPixelData::Iterator pDst(dataDst),
                                pSrc(dataSrc);


@@ -2559,7 +2570,7 @@ wxAlphaBlend(HDC hdcDst, int xDst, int yDst,
     // and finally blit them back to the destination DC
     if ( !::BitBlt(hdcDst, xDst, yDst, dstWidth, dstHeight, hdcMem, 0, 0, SRCCOPY) )
     {
     // and finally blit them back to the destination DC
     if ( !::BitBlt(hdcDst, xDst, yDst, dstWidth, dstHeight, hdcMem, 0, 0, SRCCOPY) )
     {

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

     }
 }
 
     }
 }
 


@@ -2577,7 +2588,7 @@ void wxMSWDCImpl::DoGradientFillLinear (const wxRect& rect,
     typedef BOOL
         (WINAPI *GradientFill_t)(HDC, PTRIVERTEX, ULONG, PVOID, ULONG, ULONG);
     static GradientFill_t pfnGradientFill =
     typedef BOOL
         (WINAPI *GradientFill_t)(HDC, PTRIVERTEX, ULONG, PVOID, ULONG, ULONG);
     static GradientFill_t pfnGradientFill =

-        (GradientFill_t)wxMSIMG32DLL.GetSymbol(_T("GradientFill"));
+        (GradientFill_t)wxMSIMG32DLL.GetSymbol(wxT("GradientFill"));

 
     if ( pfnGradientFill )
     {
 
     if ( pfnGradientFill )
     {


@@ -2622,7 +2633,7 @@ void wxMSWDCImpl::DoGradientFillLinear (const wxRect& rect,
             return;
         }
 
             return;
         }
 

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

     }
 #endif // wxUSE_DYNLIB_CLASS
 
     }
 #endif // wxUSE_DYNLIB_CLASS
 


@@ -2635,7 +2646,7 @@ static DWORD wxGetDCLayout(HDC hdc)
 {
     typedef DWORD (WINAPI *GetLayout_t)(HDC);
     static GetLayout_t
 {
     typedef DWORD (WINAPI *GetLayout_t)(HDC);
     static GetLayout_t

-        wxDL_INIT_FUNC(s_pfn, GetLayout, wxDynamicLibrary(_T("gdi32.dll")));
+        wxDL_INIT_FUNC(s_pfn, GetLayout, wxDynamicLibrary(wxT("gdi32.dll")));

 
     return s_pfnGetLayout ? s_pfnGetLayout(hdc) : (DWORD)-1;
 }
 
     return s_pfnGetLayout ? s_pfnGetLayout(hdc) : (DWORD)-1;
 }


@@ -2654,7 +2665,7 @@ void wxMSWDCImpl::SetLayoutDirection(wxLayoutDirection dir)
 {
     typedef DWORD (WINAPI *SetLayout_t)(HDC, DWORD);
     static SetLayout_t
 {
     typedef DWORD (WINAPI *SetLayout_t)(HDC, DWORD);
     static SetLayout_t

-        wxDL_INIT_FUNC(s_pfn, SetLayout, wxDynamicLibrary(_T("gdi32.dll")));
+        wxDL_INIT_FUNC(s_pfn, SetLayout, wxDynamicLibrary(wxT("gdi32.dll")));

     if ( !s_pfnSetLayout )
         return;
 
     if ( !s_pfnSetLayout )
         return;