diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-12-06 19:56:21 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-12-06 19:56:21 +0000 |
| commit | 7710dc14a88f02bad07111cc2e29414f2513b28d (patch) | |
| tree | 62bad392938dc1b0e9c21d48adfcc044267a19b6 | |
| parent | 2c8bc31971e53eb0172cd29e333fcd867125a029 (diff) | |
Don't pop up the message box for warnings under WIN32.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1818 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | src/Fl_abort.cxx | 15 |
2 files changed, 8 insertions, 10 deletions
@@ -65,6 +65,9 @@ CHANGES IN FLTK 1.1.0b7 right shading for narrow, but horizontal buttons. - Fl_Progress now shades the bounding box instead of drawing a polygon inside it. + - Fl::warning() under WIN32 defaults to no action. This + avoids warning dialogs when an image file cannot be + loaded. CHANGES IN FLTK 1.1.0b6 diff --git a/src/Fl_abort.cxx b/src/Fl_abort.cxx index d18b00d80..8d08005ac 100644 --- a/src/Fl_abort.cxx +++ b/src/Fl_abort.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_abort.cxx,v 1.8.2.3.2.2 2001/11/25 16:38:11 easysw Exp $" +// "$Id: Fl_abort.cxx,v 1.8.2.3.2.3 2001/12/06 19:56:21 easysw Exp $" // // Warning/error message code for the Fast Light Tool Kit (FLTK). // @@ -36,13 +36,8 @@ #ifdef WIN32 # include <windows.h> -static void warning(const char *format, ...) { - va_list args; - char buf[1024]; - va_start(args, format); - vsnprintf(buf, 1024, format, args); - va_end(args); - MessageBox(0,buf,"Warning",MB_ICONEXCLAMATION|MB_OK); +static void warning(const char *, ...) { + // Show nothing for warnings under WIN32... } static void error(const char *format, ...) { @@ -51,7 +46,7 @@ static void error(const char *format, ...) { va_start(args, format); vsnprintf(buf, 1024, format, args); va_end(args); - MessageBox(0,buf,"Error",MB_ICONSTOP|MB_SYSTEMMODAL); + MessageBox(0,buf,"Error",MB_ICONEXCLAMATION|MB_SYSTEMMODAL); } static void fatal(const char *format, ...) { @@ -101,5 +96,5 @@ void (*Fl::error)(const char* format, ...) = ::error; void (*Fl::fatal)(const char* format, ...) = ::fatal; // -// End of "$Id: Fl_abort.cxx,v 1.8.2.3.2.2 2001/11/25 16:38:11 easysw Exp $". +// End of "$Id: Fl_abort.cxx,v 1.8.2.3.2.3 2001/12/06 19:56:21 easysw Exp $". // |