added mousewheel support part 3

diff --git a/source/blender/include/BSE_drawipo.h b/source/blender/include/BSE_drawipo.h
index 5dd8638d72289205f9afa8b216fa37d2e32e982f..65545441ff80b8e80ec34581c693a6310cfe1140 100644 (file)
--- a/source/blender/include/BSE_drawipo.h
+++ b/source/blender/include/BSE_drawipo.h
@@ -61,7 +61,7 @@ void drawipo(void);
 
 void scroll_ipobuts(void);
 int view2dzoom(unsigned short event);
-int view2dmove(void); 
+int view2dmove(unsigned short event); 
 void view2dborder(void);
 
 struct EditIpo *select_proj_ipo(struct rctf *rectf, int event);

diff --git a/source/blender/src/editaction.c b/source/blender/src/editaction.c
index 7a24ea97c61fffae06138abececccc19a0e35ee9..e521d59e6751f1ed5da5ffede3b40e00523248e3 100644 (file)
--- a/source/blender/src/editaction.c
+++ b/source/blender/src/editaction.c
@@ -1490,7 +1490,7 @@ void winqreadactionspace(unsigned short event, short val, char ascii)
                case MIDDLEMOUSE:
                case WHEELUPMOUSE:
                case WHEELDOWNMOUSE:
-                       view2dmove();   /* in drawipo.c */
+                       view2dmove(event);      /* in drawipo.c */
                        break;
                }
        }

diff --git a/source/blender/src/editnla.c b/source/blender/src/editnla.c
index 34b640055c606a9bd573f56cc46de9bc87f5de81..66311538ac4bca1ef21b0a0a17fdf579ff8fe00b 100644 (file)
--- a/source/blender/src/editnla.c
+++ b/source/blender/src/editnla.c
@@ -229,7 +229,7 @@ int calc_memleak (void* ptr){
                case MIDDLEMOUSE:
                case WHEELUPMOUSE:
                case WHEELDOWNMOUSE:
-                       view2dmove();   /* in drawipo.c */
+                       view2dmove(event);      /* in drawipo.c */
                        break;
                }
        }

diff --git a/source/blender/src/editsound.c b/source/blender/src/editsound.c
index e3d3e09bf40b18638254db699d70edd486cf9e7f..a3ae24d4a4081503770a949c945df6f758c4750e 100644 (file)
--- a/source/blender/src/editsound.c
+++ b/source/blender/src/editsound.c
@@ -112,7 +112,7 @@ void winqreadsoundspace(unsigned short event, short val, char ascii)
                switch(event)
                {
                case LEFTMOUSE:
-                       if( view2dmove()==0 )
+                       if( view2dmove(event)==0 )
                        {
                                do
                                {
@@ -137,7 +137,7 @@ void winqreadsoundspace(unsigned short event, short val, char ascii)
                case MIDDLEMOUSE:
                case WHEELUPMOUSE:
                case WHEELDOWNMOUSE:
-                       view2dmove();   /* in drawipo.c */
+                       view2dmove(event);      /* in drawipo.c */
                        break;
                case RIGHTMOUSE:
                        /* mouse_select_seq(); */

diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index 7b19a7d9a159d8b761b7178166633945dec8db0b..4be129d5679fe12b35ee979f4ad7618dfde4c0e7 100644 (file)
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -1139,7 +1139,7 @@ void winqreadipo(unsigned short event, short val, char ascii)
                        if(in_ipo_buttons()) {
                                scroll_ipobuts();
                        }
-                       else view2dmove();      /* in drawipo.c */
+                       else view2dmove(event); /* in drawipo.c */
                        break;
 
                case WHEELUPMOUSE:
@@ -1642,7 +1642,7 @@ void winqreadsequence(unsigned short event, short val, char ascii)
 
                switch(event) {
                case LEFTMOUSE:
-                       if(sseq->mainb || view2dmove()==0) {
+                       if(sseq->mainb || view2dmove(event)==0) {
                                
                                first= 1;               
                                set_special_seq_update(1);
@@ -1673,7 +1673,7 @@ void winqreadsequence(unsigned short event, short val, char ascii)
                case WHEELUPMOUSE:
                case WHEELDOWNMOUSE:
                        if(sseq->mainb) break;
-                       view2dmove();   /* in drawipo.c */
+                       view2dmove(event);      /* in drawipo.c */
                        break;
                case RIGHTMOUSE:
                        if(sseq->mainb) break;
@@ -2179,7 +2179,7 @@ void winqreadoopsspace(unsigned short event, short val, char ascii)
        case MIDDLEMOUSE:
        case WHEELUPMOUSE:
        case WHEELDOWNMOUSE:
-               view2dmove();   /* in drawipo.c */
+               view2dmove(event);      /* in drawipo.c */
                break;
        case RIGHTMOUSE:
                mouse_select_oops();