X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fgwindowgui.h;h=8a347d6c3cd03dee2335a492166c26793bce6c4b;hb=a2d9ab21fbb8e29310d9cd0be439522d05d0d0ba;hp=35a524e8003ff4c8221e16dd9cca5fdec1954593;hpb=c4bf1f625b640ef45136dcf66b639e2a55bd8334;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/gwindowgui.h b/cinelerra-5.1/cinelerra/gwindowgui.h
index 35a524e8..8a347d6c 100644
--- a/cinelerra-5.1/cinelerra/gwindowgui.h
+++ b/cinelerra-5.1/cinelerra/gwindowgui.h
@@ -71,7 +71,7 @@ public:
 class GWindowToggle : public BC_CheckBox
 {
 public:
-	GWindowToggle(MWindow *mwindow, GWindowGUI *gui, int x, int y,
+	GWindowToggle(GWindowGUI *gui, int x, int y,
 		const char *text, int color, toggleinfo *info);
 	~GWindowToggle();
 
@@ -82,9 +82,8 @@ public:
 	static int* get_main_value(MWindow *mwindow, toggleinfo *info);
 
 	int color;
-	MWindow *mwindow;
-	GWindowGUI *gui;
 	toggleinfo *info;
+	GWindowGUI *gui;
 	GWindowColorButton *color_button;
 };
 
@@ -103,16 +102,17 @@ public:
 	GWindowToggle *auto_toggle;
 };
 
-class GWindowColorThread : public ColorThread
+class GWindowColorThread : public ColorPicker
 {
 public:
-	GWindowColorThread(GWindowColorButton *color_button);
+	GWindowColorThread(GWindowGUI *gui, GWindowColorButton *color_button);
 	~GWindowColorThread();
 	void start(int color);
 	int handle_new_color(int color, int alpha);
 	void update_gui();
 	void handle_done_event(int result);
 
+	GWindowGUI *gui;
 	int color;
 	GWindowColorButton *color_button;
 	GWindowColorUpdate *color_update;