OSX fixes...

src/Fl.cxx:
    - Don't compile in static functions that aren't used.

src/Fl_mac.cxx:
    - Coding style...

src/Fl_Sys_Menu_Bar.cxx:
    - Fix FL_META handling - FL_META incorrectly set the CTRL modifier,
      and it was not possible to get all combos of modifiers.  The new
      coding should work properly for all combos...


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4651 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

1 files changed, 4 insertions, 8 deletions

diff --git a/src/Fl_mac.cxx b/src/Fl_mac.cxx
index f9f809ba1..ddf23e1e0 100644
--- a/src/Fl_mac.cxx
+++ b/src/Fl_mac.cxx
@@ -809,7 +809,7 @@ static pascal OSStatus carbonMousewheelHandler( EventHandlerCallRef nextHandler,
   }
 
   fl_lock_function();
-  
+
   fl_os_event = event;
   Fl_Window *window = (Fl_Window*)userData;
 
@@ -817,17 +817,13 @@ static pascal OSStatus carbonMousewheelHandler( EventHandlerCallRef nextHandler,
   GetEventParameter( event, kEventParamMouseWheelAxis, typeMouseWheelAxis, NULL, sizeof(EventMouseWheelAxis), NULL, &axis );
   long delta;
   GetEventParameter( event, kEventParamMouseWheelDelta, typeLongInteger, NULL, sizeof(long), NULL, &delta );
-  if ( axis == kEventMouseWheelAxisX )
-  {
+  if ( axis == kEventMouseWheelAxisX ) {
     Fl::e_dx = delta;
     if ( Fl::e_dx) Fl::handle( FL_MOUSEWHEEL, window );
-  }
-  else if ( axis == kEventMouseWheelAxisY )
-  {
+  } else if ( axis == kEventMouseWheelAxisY ) {
     Fl::e_dy = -delta;
     if ( Fl::e_dy) Fl::handle( FL_MOUSEWHEEL, window );
-  }
-  else {
+  } else {
     fl_unlock_function();
 
     return eventNotHandledErr;