X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcbutton.C;h=6d0c4349da01c57e8e03f8884865e35c7ea0307e;hp=ab5292791bd51f730e4c2f62e599b3054329c8f6;hb=7e5a0760f40ff787cc3d93cb7768a901ebe52809;hpb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb

diff --git a/cinelerra-5.1/guicast/bcbutton.C b/cinelerra-5.1/guicast/bcbutton.C
index ab529279..6d0c4349 100644
--- a/cinelerra-5.1/guicast/bcbutton.C
+++ b/cinelerra-5.1/guicast/bcbutton.C
@@ -23,7 +23,7 @@
 #include "bcpixmap.h"
 #include "bcresources.h"
 #include "bcsignals.h"
-#include "colors.h"
+#include "bccolors.h"
 #include "fonts.h"
 #include "keys.h"
 #include "language.h"
@@ -105,12 +105,14 @@ int BC_Button::update_bitmaps(VFrame **data)
 void BC_Button::enable()
 {
 	enabled = 1;
+	status = BUTTON_UP;
 	draw_face();
 }
 
 void BC_Button::disable()
 {
 	enabled = 0;
+	status = BUTTON_UP;
 	draw_face();
 }
 
@@ -153,12 +155,10 @@ int BC_Button::draw_face(int flush)
 
 int BC_Button::repeat_event(int64_t duration)
 {
-	if( status == BUTTON_UPHI && !tooltip_done &&
-		tooltip_text && tooltip_text[0] != 0 &&
+	if( status == BUTTON_UPHI && tooltip_text && tooltip_text[0] != 0 &&
 		duration == top_level->get_resources()->tooltip_delay )
 	{
 		show_tooltip();
-		tooltip_done = 1;
 		return 1;
 	}
 	return 0;
@@ -168,9 +168,7 @@ int BC_Button::cursor_enter_event()
 {
 	if(is_event_win() && enabled)
 	{
-		tooltip_done = 0;
-		if(top_level->button_down)
-		{
+		if(top_level->button_down) {
 			status = BUTTON_DOWNHI;
 		}
 		else