X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fcwindowgui.h;h=8ab72ac2c2a0bde800a7e0f442425ec86f32085d;hb=047485402c380ee034045712121c649ddf89eda4;hp=e090cdea92bc9d6bd3b861eb71c9851d533c403b;hpb=49f85559268fc040fe7ba5611cc0520793cf728b;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/cwindowgui.h b/cinelerra-5.1/cinelerra/cwindowgui.h
index e090cdea..8ab72ac2 100644
--- a/cinelerra-5.1/cinelerra/cwindowgui.h
+++ b/cinelerra-5.1/cinelerra/cwindowgui.h
@@ -60,8 +60,10 @@ public:
 	CWindowGUI(MWindow *mwindow, CWindow *cwindow);
 	~CWindowGUI();
 
-    void create_objects();
+	void create_objects();
 	int resize_event(int w, int h);
+	void zoom_canvas(double value, int update_menu);
+	float get_auto_zoom();
 
 // Events for the fullscreen canvas fall through to here.
 	int button_press_event();
@@ -70,9 +72,6 @@ public:
 	int button_release_event();
 	int cursor_motion_event();
 
-
-	void zoom_canvas(int do_auto, double value, int update_menu);
-
 	int close_event();
 	int keypress_event();
 	int translation_event();
@@ -149,10 +148,10 @@ public:
 // Origin for camera and projector operations during last button press
 	float center_x, center_y, center_z;
 	float control_in_x, control_in_y, control_out_x, control_out_y;
-	int current_tool;
 // Must recalculate the origin when pressing shift.
 // Switch toggle on and off to recalculate origin.
 	int translating_zoom;
+	int highlighted;
 };
 
 
@@ -167,8 +166,7 @@ public:
 	void overwrite_selection();
 	void set_inpoint();
 	void set_outpoint();
-	void clear_inpoint();
-	void clear_outpoint();
+	void unset_inoutpoint();
 	void to_clip();
 	void toggle_label();
 	void prev_label();
@@ -199,6 +197,7 @@ public:
 	CWindowZoom(MWindow *mwindow, CWindowGUI *gui, int x, int y, int w);
 	virtual ~CWindowZoom();
 	int handle_event();
+	void update(double value);
 	MWindow *mwindow;
 	CWindowGUI *gui;
 };