diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-08-09 03:17:30 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-08-09 03:17:30 +0000 |
| commit | 050919103f76dbe4aebaa8ac8a1e2633713ee571 (patch) | |
| tree | 1ff838116d1bdfa2607daf40eba4a38eb2404b8c /src/fl_cursor.cxx | |
| parent | a6b935289ed59305318929b857bf74f671125e87 (diff) | |
More shadow variable changes...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2567 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/fl_cursor.cxx')
| -rw-r--r-- | src/fl_cursor.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/fl_cursor.cxx b/src/fl_cursor.cxx index 9f3bbb1ff..fb2e60059 100644 --- a/src/fl_cursor.cxx +++ b/src/fl_cursor.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_cursor.cxx,v 1.6.2.6.2.6 2002/08/05 17:50:25 easysw Exp $" +// "$Id: fl_cursor.cxx,v 1.6.2.6.2.7 2002/08/09 03:17:30 easysw Exp $" // // Mouse cursor support for the Fast Light Tool Kit (FLTK). // @@ -265,7 +265,7 @@ static struct TableEntry { void Fl_Window::cursor(Fl_Cursor c, Fl_Color fg, Fl_Color bg) { if (!shown()) return; - Cursor cursor; + Cursor xc; int deleteit = 0; if (c == FL_CURSOR_DEFAULT) { c = cursor_default; @@ -274,7 +274,7 @@ void Fl_Window::cursor(Fl_Cursor c, Fl_Color fg, Fl_Color bg) { } if (!c) { - cursor = None; + xc = None; } else { if (c >= FL_CURSOR_NS) { TableEntry *q = (c > FL_CURSOR_NESW) ? table+4 : table+(c-FL_CURSOR_NS); @@ -291,9 +291,9 @@ void Fl_Window::cursor(Fl_Cursor c, Fl_Color fg, Fl_Color bg) { XFreePixmap(fl_display, m); XFreePixmap(fl_display, p); } - cursor = q->cursor; + xc = q->cursor; } else { - cursor = XCreateFontCursor(fl_display, (c-1)*2); + xc = XCreateFontCursor(fl_display, (c-1)*2); deleteit = 1; } XColor fgc; @@ -303,14 +303,14 @@ void Fl_Window::cursor(Fl_Cursor c, Fl_Color fg, Fl_Color bg) { XColor bgc; Fl::get_color(bg,r,g,b); bgc.red = r<<8; bgc.green = g<<8; bgc.blue = b<<8; - XRecolorCursor(fl_display, cursor, &fgc, &bgc); + XRecolorCursor(fl_display, xc, &fgc, &bgc); } - XDefineCursor(fl_display, fl_xid(this), cursor); - if (deleteit) XFreeCursor(fl_display, cursor); + XDefineCursor(fl_display, fl_xid(this), xc); + if (deleteit) XFreeCursor(fl_display, xc); } #endif // -// End of "$Id: fl_cursor.cxx,v 1.6.2.6.2.6 2002/08/05 17:50:25 easysw Exp $". +// End of "$Id: fl_cursor.cxx,v 1.6.2.6.2.7 2002/08/09 03:17:30 easysw Exp $". // |