projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
4 bt fixes, xft unrefd font fix, add: find in resources, add: user title, filebox...
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
gwindowgui.h
diff --git
a/cinelerra-5.1/cinelerra/gwindowgui.h
b/cinelerra-5.1/cinelerra/gwindowgui.h
index 35a524e8003ff4c8221e16dd9cca5fdec1954593..8a347d6c3cd03dee2335a492166c26793bce6c4b 100644
(file)
--- 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:
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();
const char *text, int color, toggleinfo *info);
~GWindowToggle();
@@
-82,9
+82,8
@@
public:
static int* get_main_value(MWindow *mwindow, toggleinfo *info);
int color;
static int* get_main_value(MWindow *mwindow, toggleinfo *info);
int color;
- MWindow *mwindow;
- GWindowGUI *gui;
toggleinfo *info;
toggleinfo *info;
+ GWindowGUI *gui;
GWindowColorButton *color_button;
};
GWindowColorButton *color_button;
};
@@
-103,16
+102,17
@@
public:
GWindowToggle *auto_toggle;
};
GWindowToggle *auto_toggle;
};
-class GWindowColorThread : public Color
Thread
+class GWindowColorThread : public Color
Picker
{
public:
{
public:
- GWindowColorThread(GWindowColorButton *color_button);
+ GWindowColorThread(GWindow
GUI *gui, GWindow
ColorButton *color_button);
~GWindowColorThread();
void start(int color);
int handle_new_color(int color, int alpha);
void update_gui();
void handle_done_event(int result);
~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;
int color;
GWindowColorButton *color_button;
GWindowColorUpdate *color_update;