From 7609fc777ff11e12add5c204ad5823057b036a58 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Mon, 3 Oct 2011 20:48:23 +0000
Subject: [PATCH] minor fixes

---
 panda/src/x11display/x11GraphicsWindow.cxx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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