Changeset 2696 in kBuild

Timestamp:

Sep 9, 2013 3:20:20 PM (12 years ago)

Author:

bird

Message:

kdev.e: Trying to work around timer issue on 18.0.x by not using any timers and skipping the whole menu bit on OS X.

File:

• trunk/VSlickMacros/kdev.e (modified) (5 diffs)

trunk/VSlickMacros/kdev.e

@@ -89 +89 @@
 //#pragma option(strict,on)
 /*#else: Version 4.0 (OS/2) */
+#endif
+
+#ifndef __MACOSX__
+ #define KDEV_WITH_MENU
 #endif
 
@@ -2985 +2989 @@
 *   Menu and Menu commands                                                     *
 *******************************************************************************/
+#ifdef KDEV_WITH_MENU
+#if __VERSION__ < 18.0 /* Something with timers are busted, so excusing my code. */
 static int  iTimer = 0;
+#endif
 static int  mhkDev = 0;
 static int  mhCode = 0;
@@ -2997 +3004 @@
 static k_menu_create()
 {
+# if __VERSION__ < 18.0 /* Something with timers are busted, so excusing my code. */
     if (arg(1) == 'timer')
         _kill_timer(iTimer);
+# endif
     menu_handle = _mdi.p_menu_handle;
     menu_index  = find_index(_cur_mdi_menu,oi2type(OI_MENU));
@@ -3258 +3267 @@
 }
 */
+
+
+#endif /* KDEV_WITH_MENU */
 
 
@@ -3660 +3672 @@
     /* do init */
     k_styles_create();
+#ifdef KDEV_WITH_MENU
     k_menu_create();
+# if __VERSION__ < 18.0 /* Something with timers are busted, so excusing my code. */
     iTimer = _set_timer(1000, k_menu_create, "timer");
+# endif
     /* createMyColorSchemeAndUseIt();*/
-}
-
+#endif
+}
+