Author: manolo
Date: 2012-03-10 00:45:44 -0800 (Sat, 10 Mar 2012)
New Revision: 9271
Log:
Mac OS: renamed compute_macKeyLookUp() to fl_compute_macKeyLookUp().
Modified:
branches/branch-1.3/src/Fl_cocoa.mm
branches/branch-1.3/src/Fl_get_key_mac.cxx
Modified: branches/branch-1.3/src/Fl_cocoa.mm
===================================================================
--- branches/branch-1.3/src/Fl_cocoa.mm 2012-03-09 21:35:45 UTC (rev 9270)
+++ branches/branch-1.3/src/Fl_cocoa.mm 2012-03-10 08:45:44 UTC (rev 9271)
@@ -79,7 +79,7 @@
// 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 @@
/*
* 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 @@
if ( !beenHereDoneThat ) {
beenHereDoneThat = 1;
- macKeyLookUp = compute_macKeyLookUp();
-
BOOL need_new_nsapp = (NSApp == nil);
if (need_new_nsapp) [NSApplication sharedApplication];
NSAutoreleasePool *localPool;
Modified: branches/branch-1.3/src/Fl_get_key_mac.cxx
===================================================================
--- branches/branch-1.3/src/Fl_get_key_mac.cxx 2012-03-09 21:35:45 UTC (rev
9270)
+++ branches/branch-1.3/src/Fl_get_key_mac.cxx 2012-03-10 08:45:44 UTC (rev
9271)
@@ -196,7 +196,7 @@
};
// 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));
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
