X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcolorpicker.h;fp=cinelerra-5.1%2Fcinelerra%2Fcolorpicker.h;h=2527f320f4e7315a4191e0c2d95c7cefe41ba47e;hb=c4bf1f625b640ef45136dcf66b639e2a55bd8334;hp=683fe13578ac33f435b7687094007b216bcaf460;hpb=a0bbe596809d2ec0128e97277901cf726fb327f1;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/colorpicker.h b/cinelerra-5.1/cinelerra/colorpicker.h
index 683fe135..2527f320 100644
--- a/cinelerra-5.1/cinelerra/colorpicker.h
+++ b/cinelerra-5.1/cinelerra/colorpicker.h
@@ -22,6 +22,7 @@
 #ifndef COLORPICKER_H
 #define COLORPICKER_H
 
+#include "bcdialog.h"
 #include "condition.inc"
 #include "guicast.h"
 #include "mutex.inc"
@@ -40,37 +41,26 @@ class PaletteGreen;
 class PaletteBlue;
 class PaletteAlpha;
 
-class ColorThread : public Thread
+class ColorThread : public BC_DialogThread
 {
 public:
-	ColorThread(int do_alpha = 0, char *title = 0);
+	ColorThread(int do_alpha = 0, const char *title = 0);
 	~ColorThread();
 
-
-	void run();
-	void start_window(int output, int alpha);
+	void start_window(int output, int alpha, int do_okcancel=0);
 	virtual int handle_new_color(int output, int alpha);
 	void update_gui(int output, int alpha);
-	ColorWindow* get_gui();
-
-private:
-	friend class ColorWindow;
+	BC_Window* new_gui();
 
-	ColorWindow *window;
-	Condition *completion;
-// protects window, output, alpha
-	Mutex *mutex;	
-// Starting color
-	int output;
-	int alpha;
-	int do_alpha;
-	char *title;
+	int output, alpha;
+	int do_alpha, do_okcancel;
+	const char *title;
 };
 
 class ColorWindow : public BC_Window
 {
 public:
-	ColorWindow(ColorThread *thread, int x, int y, char *title);
+	ColorWindow(ColorThread *thread, int x, int y, int w, int h, const char *title);
 
 	void create_objects();
 	void change_values();