diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2000-11-20 19:02:20 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2000-11-20 19:02:20 +0000 |
| commit | 7d432ff92cccabb48e8c6be3e1e29bd8289aa509 (patch) | |
| tree | 45d0285e9652fb9bd8a8110da6e9ee71d3cbb1b7 /src/Fl_x.cxx | |
| parent | a45a6308d0a0d5db68f9fa5103cb91de4a5ef52c (diff) | |
Get rid of "member X hidden by variable X" warnings...
Fix strcasecmp() detection...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1337 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_x.cxx')
| -rw-r--r-- | src/Fl_x.cxx | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx index 2e330f3a7..b675ea102 100644 --- a/src/Fl_x.cxx +++ b/src/Fl_x.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_x.cxx,v 1.24.2.21 2000/11/20 02:49:40 easysw Exp $" +// "$Id: Fl_x.cxx,v 1.24.2.22 2000/11/20 19:02:20 easysw Exp $" // // X specific code for the Fast Light Tool Kit (FLTK). // @@ -242,19 +242,24 @@ static Atom wm_delete_window; static Atom wm_protocols; static Atom _motif_wm_hints; -extern "C" { -static void fd_callback(int,void *) {do_queued_events();} - -static int io_error_handler(Display*) {Fl::fatal("X I/O error"); return 0;} +static void fd_callback(int,void *) { + do_queued_events(); } -static int xerror_handler(Display* d, XErrorEvent* e) { - char buf1[128], buf2[128]; - sprintf(buf1, "XRequest.%d", e->request_code); - XGetErrorDatabaseText(d,"",buf1,buf1,buf2,128); - XGetErrorText(d, e->error_code, buf1, 128); - Fl::warning("%s: %s 0x%lx", buf2, buf1, e->resourceid); - return 0; +extern "C" { + static int io_error_handler(Display*) { + Fl::fatal("X I/O error"); + return 0; + } + + static int xerror_handler(Display* d, XErrorEvent* e) { + char buf1[128], buf2[128]; + sprintf(buf1, "XRequest.%d", e->request_code); + XGetErrorDatabaseText(d,"",buf1,buf1,buf2,128); + XGetErrorText(d, e->error_code, buf1, 128); + Fl::warning("%s: %s 0x%lx", buf2, buf1, e->resourceid); + return 0; + } } void fl_open_display() { @@ -898,5 +903,5 @@ void Fl_Window::make_current() { #endif // -// End of "$Id: Fl_x.cxx,v 1.24.2.21 2000/11/20 02:49:40 easysw Exp $". +// End of "$Id: Fl_x.cxx,v 1.24.2.22 2000/11/20 19:02:20 easysw Exp $". // |