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

minor fixes

Browse Source
This commit is contained in:
David Rose 2011-10-03 20:48:23 +00:00
parent bee4cb326a
commit 7609fc777f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
panda/src/x11display/x11GraphicsWindow.cxx
View File

@ -924,6 +924,7 @@ open_window() {
} }
} }
cerr << "cursor_filename = " << _properties.get_cursor_filename() << "\n";
if (_properties.get_cursor_hidden()) { if (_properties.get_cursor_hidden()) {
XDefineCursor(_display, _xwindow, x11_pipe->get_hidden_cursor()); XDefineCursor(_display, _xwindow, x11_pipe->get_hidden_cursor());
@ -1874,9 +1875,10 @@ check_event(X11_Display *display, XEvent *event, char *arg) {
X11_Cursor x11GraphicsWindow:: X11_Cursor x11GraphicsWindow::
get_cursor(const Filename &filename) { get_cursor(const Filename &filename) {
#ifndef HAVE_XCURSOR #ifndef HAVE_XCURSOR
x11display_cat.info()
<< "XCursor support not enabled in build; cannot change mouse cursor.\n";
return None; return None;
} #else // HAVE_XCURSOR
#else
// First, look for the unresolved filename in our index. // First, look for the unresolved filename in our index.
pmap<Filename, X11_Cursor>::iterator fi = _cursor_filenames.find(filename); pmap<Filename, X11_Cursor>::iterator fi = _cursor_filenames.find(filename);
if (fi != _cursor_filenames.end()) { if (fi != _cursor_filenames.end()) {
@ -1951,8 +1953,10 @@ get_cursor(const Filename &filename) {
_cursor_filenames[resolved] = h; _cursor_filenames[resolved] = h;
return h; return h;
#endif // HAVE_XCURSOR
} }
#ifdef HAVE_XCURSOR
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: x11GraphicsWindow::load_ico // Function: x11GraphicsWindow::load_ico
// Access: Private // Access: Private