diff options
| author | Manolo Gouy <Manolo> | 2012-03-10 08:45:44 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2012-03-10 08:45:44 +0000 |
| commit | 719f72b5015457f3f03416c9efb6dc83b77abb2c (patch) | |
| tree | d8747797d6b993b464d206eb3d21af16d2a39c9f | |
| parent | 739a6f89aec7f42975b5f28c91281acc58220b31 (diff) | |
Mac OS: renamed compute_macKeyLookUp() to fl_compute_macKeyLookUp().
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9271 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | src/Fl_cocoa.mm | 6 | ||||
| -rw-r--r-- | src/Fl_get_key_mac.cxx | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index 597c1828e..08bb9939a 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -79,7 +79,7 @@ typedef unsigned int NSUInteger; // external functions extern void fl_fix_focus(); extern Fl_Offscreen fl_create_offscreen_with_alpha(int w, int h); -extern unsigned short *compute_macKeyLookUp(); +extern unsigned short *fl_compute_macKeyLookUp(); // forward definition of functions in this file // converting cr lf converter function @@ -135,7 +135,7 @@ void fl_set_status(int x, int y, int w, int h) /* * Mac keyboard lookup table */ -static unsigned short *macKeyLookUp; +static unsigned short* macKeyLookUp = fl_compute_macKeyLookUp(); /* * convert the current mouse chord into the FLTK modifier state @@ -1190,8 +1190,6 @@ void fl_open_display() { if ( !beenHereDoneThat ) { beenHereDoneThat = 1; - macKeyLookUp = compute_macKeyLookUp(); - BOOL need_new_nsapp = (NSApp == nil); if (need_new_nsapp) [NSApplication sharedApplication]; NSAutoreleasePool *localPool; diff --git a/src/Fl_get_key_mac.cxx b/src/Fl_get_key_mac.cxx index ca7247502..5f4e55465 100644 --- a/src/Fl_get_key_mac.cxx +++ b/src/Fl_get_key_mac.cxx @@ -196,7 +196,7 @@ static const struct {unsigned short vk, fltk;} vktab[] = { }; // Computes the macKeyLookUp table that transforms a Mac OS virtual keycode into an FLTK keysym -unsigned short *compute_macKeyLookUp() +unsigned short *fl_compute_macKeyLookUp() { static unsigned short macKeyLookUp[128]; memset(macKeyLookUp, 0, sizeof(macKeyLookUp)); |