Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added CS_OWNDC fix to wxGLCanvas and corrected sample makefiles

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-10-28 11:35:45 +00:00
parent f6e9f05fa7
commit 87b501f0f7
7 changed files with 147 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/msw/cursor.cpp
View File

@@ -78,7 +78,7 @@ wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int ho
M_CURSORDATA->m_destroyCursor = FALSE;
M_CURSORDATA->m_hCursor = 0;
M_CURSORDATA->m_ok = FALSE;
if (flags & wxBITMAP_TYPE_CUR_RESOURCE)
if (flags == wxBITMAP_TYPE_CUR_RESOURCE)
{
#ifdef __WIN95__
M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadImage(wxGetInstance(), cursor_file, IMAGE_CURSOR, 0, 0, 0);
@@ -90,7 +90,7 @@ wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int ho
else
M_CURSORDATA->m_ok = FALSE;
}
else if (flags & wxBITMAP_TYPE_CUR)
else if (flags == wxBITMAP_TYPE_CUR)
{
#ifdef __WIN95__
M_CURSORDATA->m_hCursor = (WXHCURSOR) LoadImage(wxGetInstance(), cursor_file, IMAGE_CURSOR, 0, 0, LR_LOADFROMFILE);
@@ -101,14 +101,14 @@ wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int ho
#endif
#endif
}
else if (flags & wxBITMAP_TYPE_ICO)
else if (flags == wxBITMAP_TYPE_ICO)
{
#if wxUSE_RESOURCE_LOADING_IN_MSW
M_CURSORDATA->m_hCursor = (WXHCURSOR) IconToCursor(WXSTRINGCAST cursor_file, wxGetInstance(), hotSpotX, hotSpotY, &M_CURSORDATA->m_width, &M_CURSORDATA->m_height);
M_CURSORDATA->m_destroyCursor = TRUE;
#endif
}
else if (flags & wxBITMAP_TYPE_BMP)
else if (flags == wxBITMAP_TYPE_BMP)
{
#if wxUSE_RESOURCE_LOADING_IN_MSW
HBITMAP hBitmap = 0;