TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

adjust color cursor loading

Browse Source
This commit is contained in:
cxgeorge 2001-10-25 19:08:16 +00:00
parent c1600736bf
commit 00173a3c50
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
panda/src/wdxdisplay/wdxGraphicsWindow.cxx
View File

@ -902,8 +902,15 @@ void wdxGraphicsWindow::config(void) {
// Note: LoadImage seems to cause win2k internal heap corruption (outputdbgstr warnings) // Note: LoadImage seems to cause win2k internal heap corruption (outputdbgstr warnings)
// if icon is more than 8bpp // if icon is more than 8bpp
// loads a .cur fmt file DWORD load_flags = LR_LOADFROMFILE;
_hMouseCursor = (HCURSOR) LoadImage(NULL, windows_mono_cursor_filename.c_str(), IMAGE_CURSOR, 0, 0, LR_LOADFROMFILE);
if(dx_full_screen) {
// I think cursors should use LR_CREATEDIBSECTION since they should not be mapped to the device palette (in the case of 256-color cursors)
// since they are not going to be used on the desktop
load_flags |= LR_CREATEDIBSECTION;
}
// loads a .cur fmt file.
_hMouseCursor = (HCURSOR) LoadImage(NULL, windows_mono_cursor_filename.c_str(), IMAGE_CURSOR, 0, 0, load_flags);
if(_hMouseCursor==NULL) { if(_hMouseCursor==NULL) {
wdxdisplay_cat.warning() << "windows cursor filename '" << windows_mono_cursor_filename << "' not found!!\n"; wdxdisplay_cat.warning() << "windows cursor filename '" << windows_mono_cursor_filename << "' not found!!\n";
@ -1232,8 +1239,16 @@ check_for_color_cursor_support(void) {
// Note: LoadImage seems to cause win2k internal heap corruption (outputdbgstr warnings) // Note: LoadImage seems to cause win2k internal heap corruption (outputdbgstr warnings)
// if icon is more than 8bpp // if icon is more than 8bpp
// loads a .cur fmt file DWORD load_flags = LR_LOADFROMFILE;
HCURSOR hNewMouseCursor = (HCURSOR) LoadImage(NULL, windows_color_cursor_filename.c_str(), IMAGE_CURSOR, 0, 0, LR_LOADFROMFILE);
if(dx_full_screen) {
// I think cursors should use LR_CREATEDIBSECTION since they should not be mapped to the device palette (in the case of 256-color cursors)
// since they are not going to be used on the desktop
load_flags |= LR_CREATEDIBSECTION;
}
// loads a .cur fmt file.
HCURSOR hNewMouseCursor = (HCURSOR) LoadImage(NULL, windows_color_cursor_filename.c_str(), IMAGE_CURSOR, 0, 0, load_flags );
if(hNewMouseCursor==NULL) { if(hNewMouseCursor==NULL) {
wdxdisplay_cat.warning() << "windows color cursor filename '" << windows_color_cursor_filename << "' not found!!\n"; wdxdisplay_cat.warning() << "windows color cursor filename '" << windows_color_cursor_filename << "' not found!!\n";