Fixing loose ends:

- nkey menu for buttonswindow (hex values) couldnt be restored yet, is
  for next release
- replaced Nkey in IpoWindow with Panel, this now displays the buttons
  that were formerly in 'anim buttons' as well; to view the boundbox
  values of all visible curves, and adjust it.
- the new panel also has the 'set speed' option, fixed stuff in it and
  added better errorwarning... still not a very well coded tool!

3 files changed, 7 insertions, 9 deletions

diff --git a/source/blender/include/BIF_interface.h b/source/blender/include/BIF_interface.h
index cd1d75dd13a..1d8efa83efe 100644
--- a/source/blender/include/BIF_interface.h
+++ b/source/blender/include/BIF_interface.h
@@ -98,7 +98,8 @@ struct ScrArea;
 #define UI_MAKE_DOWN	256
 #define UI_MAKE_LEFT	512
 #define UI_MAKE_RIGHT	1024
-
+	/* dont draw hilite on mouse over */
+#define UI_NO_HILITE	2048
 
 /* Button types */
 #define CHA	32
diff --git a/source/blender/include/BIF_space.h b/source/blender/include/BIF_space.h
index 431713f6043..924e1a0274b 100644
--- a/source/blender/include/BIF_space.h
+++ b/source/blender/include/BIF_space.h
@@ -55,8 +55,7 @@ struct BWinEvent;
 #define VIEW3D_HANDLER_OBJECT		3
 
 /* ipo handler codes */
-#define IPO_HANDLER_SETTINGS	20
-
+#define IPO_HANDLER_PROPERTIES	20
 
 
 void	scrarea_do_windraw		(struct ScrArea *sa);
diff --git a/source/blender/include/butspace.h b/source/blender/include/butspace.h
index c3e7f4f2afb..6de56673515 100644
--- a/source/blender/include/butspace.h
+++ b/source/blender/include/butspace.h
@@ -94,6 +94,8 @@ extern void logic_buts(void);
 extern void script_panels(void);
 extern void do_scriptbuts(unsigned short event);
 
+/* ipowindow */
+extern void do_ipobuts(unsigned short event);	// drawipo.c (bad! ton)
 
 /* butspace.c */
 void test_meshpoin_but(char *name, struct ID **idpp);
@@ -191,7 +193,7 @@ void test_idbutton_cb(void *namev, void *arg2_unused);
 #define B_ANIMBUTS		1500
 
 #define B_RECALCPATH	1401
-#define B_MUL_IPO		1402
+
 #define B_AUTOTIMEOFS	1403
 #define B_FRAMEMAP		1404
 #define B_NEWEFFECT		1405
@@ -201,7 +203,7 @@ void test_idbutton_cb(void *namev, void *arg2_unused);
 #define B_CALCEFFECT	1409
 #define B_DELEFFECT		1410
 #define B_RECALCAL		1411
-#define B_SETSPEED		1412
+
 #define B_PRINTSPEED	1413
 #define B_PRINTLEN		1414
 #define B_RELKEY		1415
@@ -502,10 +504,6 @@ enum {
 };
 /* *********************** */
 
-#define B_INFOBUTS		3400
-/* defines local in space.c only */
-
-/* *********************** */
 
 
 /* *********************** */