avoid deferred show with Fluxbox, its support for _NET_REQUEST_FRAME_EXTENTS is broken

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

diff --git a/src/msw/imaglist.cpp b/src/msw/imaglist.cpp
index 4fb0fbb83dae37d837ecea3bb15abe0b7c8ef98b..b499da63b5cda4fe00debc919b8328c307b6b887 100644 (file)
--- a/src/msw/imaglist.cpp
+++ b/src/msw/imaglist.cpp
@@ -119,7 +119,7 @@ wxImageList::~wxImageList()
 // Returns the number of images in the image list.
 int wxImageList::GetImageCount() const
 {
 // Returns the number of images in the image list.
 int wxImageList::GetImageCount() const
 {

-    wxASSERT_MSG( m_hImageList, _T("invalid image list") );
+    wxASSERT_MSG( m_hImageList, wxT("invalid image list") );

 
     return ImageList_GetImageCount(GetHImageList());
 }
 
     return ImageList_GetImageCount(GetHImageList());
 }


@@ -127,7 +127,7 @@ int wxImageList::GetImageCount() const
 // Returns the size (same for all images) of the images in the list
 bool wxImageList::GetSize(int WXUNUSED(index), int &width, int &height) const
 {
 // Returns the size (same for all images) of the images in the list
 bool wxImageList::GetSize(int WXUNUSED(index), int &width, int &height) const
 {

-    wxASSERT_MSG( m_hImageList, _T("invalid image list") );
+    wxASSERT_MSG( m_hImageList, wxT("invalid image list") );

 
     return ImageList_GetIconSize(GetHImageList(), &width, &height) != 0;
 }
 
     return ImageList_GetIconSize(GetHImageList(), &width, &height) != 0;
 }


@@ -247,9 +247,9 @@ bool wxImageList::Draw(int index,
     wxMSWDCImpl *msw_impl = wxDynamicCast( impl, wxMSWDCImpl );
     if (!msw_impl)
        return false;
     wxMSWDCImpl *msw_impl = wxDynamicCast( impl, wxMSWDCImpl );
     if (!msw_impl)
        return false;

-    
+

     HDC hDC = GetHdcOf(*msw_impl);
     HDC hDC = GetHdcOf(*msw_impl);

-    wxCHECK_MSG( hDC, false, _T("invalid wxDC in wxImageList::Draw") );
+    wxCHECK_MSG( hDC, false, wxT("invalid wxDC in wxImageList::Draw") );

 
     COLORREF clr = CLR_NONE;    // transparent by default
     if ( solidBackground )
 
     COLORREF clr = CLR_NONE;    // transparent by default
     if ( solidBackground )