From 677a9e28b5090cae0275744e8047a86c9d003177 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 4 Feb 2003 00:57:47 +0000 Subject: [PATCH] fix for warnings when wxUSE_RESOURCE_LOADING_IN_MSW == 0 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/cursor.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/msw/cursor.cpp b/src/msw/cursor.cpp index 527c1dca2d..f1bbdb1336 100644 --- a/src/msw/cursor.cpp +++ b/src/msw/cursor.cpp @@ -326,18 +326,16 @@ wxCursor::wxCursor(const wxString& filename, hcursor = ::LoadCursorFromFile(filename); break; - case wxBITMAP_TYPE_ICO: #if wxUSE_RESOURCE_LOADING_IN_MSW + case wxBITMAP_TYPE_ICO: hcursor = IconToCursor((wxChar *)filename.c_str(), wxGetInstance(), hotSpotX, hotSpotY, NULL, NULL); -#endif // wxUSE_RESOURCE_LOADING_IN_MSW break; case wxBITMAP_TYPE_BMP: { -#if wxUSE_RESOURCE_LOADING_IN_MSW HBITMAP hBitmap = 0; HPALETTE hPalette = 0; if ( wxReadDIB((wxChar *)filename.c_str(), &hBitmap, &hPalette) ) @@ -352,12 +350,12 @@ wxCursor::wxCursor(const wxString& filename, DeleteObject(hBitmap); } else -#endif // wxUSE_RESOURCE_LOADING_IN_MSW { hcursor = NULL; } } break; +#endif // wxUSE_RESOURCE_LOADING_IN_MSW default: wxFAIL_MSG( _T("unknown cursor resource type") ); -- 2.50.0