diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2010-02-25 23:29:42 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2010-02-25 23:29:42 +0000 |
| commit | 60c1ccd33e0e87bacb45d87a9fc3e58b7a9e0723 (patch) | |
| tree | 25338fedbec8221c232340eaa1b29462050fc3b8 /src/fl_shortcut.cxx | |
| parent | 7f395e6e4410e376ff95c914506d1599083afce7 (diff) | |
Working VisualC suport in IDE's (dll's are still missing). Fixed a few warnings.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7147 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/fl_shortcut.cxx')
| -rw-r--r-- | src/fl_shortcut.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fl_shortcut.cxx b/src/fl_shortcut.cxx index 6576f3e23..fa835b15d 100644 --- a/src/fl_shortcut.cxx +++ b/src/fl_shortcut.cxx @@ -62,7 +62,7 @@ int Fl::test_shortcut(unsigned int shortcut) { if (!shortcut) return 0; unsigned int v = shortcut & FL_KEY_MASK; - if (fl_tolower(v)!=v) { + if (((unsigned)fl_tolower(v))!=v) { shortcut |= FL_SHIFT; } @@ -77,7 +77,7 @@ int Fl::test_shortcut(unsigned int shortcut) { unsigned int key = shortcut & FL_KEY_MASK; // if shift is also correct, check for exactly equal keysyms: - if (!(mismatch&(FL_SHIFT)) && key == Fl::event_key()) return 1; + if (!(mismatch&(FL_SHIFT)) && key == (unsigned)Fl::event_key()) return 1; // try matching utf8, ignore shift: unsigned int firstChar = fl_utf8decode(Fl::event_text(), Fl::event_text()+Fl::event_length(), 0); @@ -90,7 +90,7 @@ int Fl::test_shortcut(unsigned int shortcut) { } // This table must be in numeric order by fltk (X) keysym number: -struct Keyname {int key; const char* name;}; +struct Keyname {unsigned int key; const char* name;}; #if defined(WIN32) static Keyname table[] = { {' ', "Space"}, @@ -193,7 +193,7 @@ const char* fl_shortcut_label(unsigned int shortcut, const char **eom) { if (!shortcut) {*p = 0; return buf;} // fix upper case shortcuts unsigned int v = shortcut & FL_KEY_MASK; - if (fl_tolower(v)!=v) { + if (((unsigned)fl_tolower(v))!=v) { shortcut |= FL_SHIFT; } #ifdef __APPLE__ |