igor's ru.po, update msg.txt, get_cursor_over_window tweaks

[goodguy/history.git] / cinelerra-5.1 / guicast / bcmenuitem.C

diff --git a/cinelerra-5.1/guicast/bcmenuitem.C b/cinelerra-5.1/guicast/bcmenuitem.C
index c516622a947d7995d273711e2162c3ebb43f42d5..2c4469e4cf6a9e0a90c6fb7c5ef54b0abd390453 100644 (file)
--- a/cinelerra-5.1/guicast/bcmenuitem.C
+++ b/cinelerra-5.1/guicast/bcmenuitem.C
@@ -28,7 +28,7 @@
 #include "bcresources.h"
 #include "bcsignals.h"
 #include "bcwindowbase.h"
-#include "colors.h"
+#include "bccolors.h"
 
 #include <string.h>
 
@@ -202,7 +202,7 @@ int BC_MenuItem::dispatch_button_release(int &redraw)
 
        if( !result && menu_popup->cursor_inside() ) {
                int cursor_x, cursor_y;
-               menu_popup->get_popup()->get_relative_cursor_xy(cursor_x, cursor_y);
+               menu_popup->get_popup()->get_relative_cursor(cursor_x, cursor_y);
                if( cursor_x >= 0 && cursor_x < menu_popup->get_w() &&
                        cursor_y >= y && cursor_y < y + h ) {
                        if(menu_bar)
@@ -232,7 +232,7 @@ int BC_MenuItem::dispatch_motion_event(int &redraw)
 
        if( !result && menu_popup->cursor_inside() ) {
                int cursor_x, cursor_y;
-               menu_popup->get_popup()->get_relative_cursor_xy(cursor_x, cursor_y);
+               menu_popup->get_popup()->get_relative_cursor(cursor_x, cursor_y);
                if( cursor_x >= 0 && cursor_x < menu_popup->get_w() &&
                        cursor_y >= y && cursor_y < y + h) {
 // Highlight the item