X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fguicast%2Fbctextbox.h;h=a46661cdc5f3d6dec33ccd9baca409341ed2ee8a;hb=4f7f413cbc1c6ea5da27cb75ca27a3ab317243ec;hp=7b07ded12e1ebbabca9eaffcb4fb63e64ffbbc4a;hpb=dafc18d66d48cd981a012d2e73a3b3db5351c538;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/guicast/bctextbox.h b/cinelerra-5.1/guicast/bctextbox.h
index 7b07ded1..a46661cd 100644
--- a/cinelerra-5.1/guicast/bctextbox.h
+++ b/cinelerra-5.1/guicast/bctextbox.h
@@ -231,6 +231,16 @@ class BC_ScrollTextBoxYScroll;
 
 class BC_ScrollTextBox
 {
+	BC_ScrollTextBoxText *text;
+	BC_ScrollTextBoxYScroll *yscroll;
+	BC_WindowBase *parent_window;
+	const char *default_text;
+	const wchar_t *default_wtext;
+	int default_size;
+	int x, y, w, rows;
+
+	friend class BC_ScrollTextBoxText;
+	friend class BC_ScrollTextBoxYScroll;
 public:
 	BC_ScrollTextBox(BC_WindowBase *parent_window,
 		int x, int y, int w, int rows,
@@ -240,36 +250,31 @@ public:
                 const wchar_t *default_wtext, int default_size=BCTEXTLEN);
 	virtual ~BC_ScrollTextBox();
 	void create_objects();
-	virtual int handle_event();
 
-	const char* get_text();
-	const wchar_t* get_wtext();
+	virtual int handle_event() { return 1; }
+	virtual int button_press_event();
+	virtual int button_release_event();
+
 	void set_text(char *text, int isz);
 	int set_text_row(int n);
 	void update(const char *text);
 	void update(const wchar_t *wtext);
-	void set_selection(int char1, int char2, int ibeam);
-	void wset_selection(int char1, int char2, int ibeam);
 	void reposition_window(int x, int y, int w, int rows);
-	int get_x();
-	int get_y();
-	int get_w();
-	int get_h();
+// accessors
+	int get_x() { return x; }
+	int get_y() { return y; }
+	int get_w() { return w; }
 // Visible rows for resizing
-	int get_rows();
-	int get_ibeam_letter();
+	int get_rows() { return rows; }
 
-	friend class BC_ScrollTextBoxText;
-	friend class BC_ScrollTextBoxYScroll;
-
-private:
-	BC_ScrollTextBoxText *text;
-	BC_ScrollTextBoxYScroll *yscroll;
-	BC_WindowBase *parent_window;
-	const char *default_text;
-	const wchar_t *default_wtext;
-	int default_size;
-	int x, y, w, rows;
+// forward functions
+	int get_h();
+	const char *get_text();
+	const wchar_t *get_wtext();
+	int get_buttonpress();
+	void wset_selection(int char1, int char2, int ibeam);
+	void set_selection(int char1, int char2, int ibeam);
+	int get_ibeam_letter();
 };
 
 class BC_ScrollTextBoxText : public BC_TextBox
@@ -281,6 +286,8 @@ public:
 	int handle_event();
 	int motion_event();
 	BC_ScrollTextBox *gui;
+	int button_press_event() { return gui->button_press_event(); }
+	int button_release_event() { return gui->button_release_event(); }
 };
 
 class BC_ScrollTextBoxYScroll : public BC_ScrollBar
@@ -315,6 +322,9 @@ public:
 	int get_y();
 	int get_w();
 	int get_h();
+	int get_show_query();
+	void set_show_query(int v);
+
 	void update(const char *text);
 	void update_list(ArrayList<BC_ListBoxItem*> *data);
 	void reposition_window(int x, int y);
@@ -403,6 +413,7 @@ public:
 	void set_precision(int precision);
 	void set_increment(float value);
 	void set_log_floatincrement(int value);
+	void set_tooltip(const char *text);
 
 	friend class BC_TumbleTextBoxText;
 	friend class BC_TumbleTextBoxTumble;
@@ -423,19 +434,8 @@ private:
 class BC_TumbleTextBoxText : public BC_TextBox
 {
 public:
-	BC_TumbleTextBoxText(BC_TumbleTextBox *popup,
-		int64_t default_value,
-		int64_t min,
-		int64_t max,
-		int x,
-		int y);
-	BC_TumbleTextBoxText(BC_TumbleTextBox *popup,
-		float default_value,
-		float min,
-		float max,
-		int x,
-		int y);
-	BC_TumbleTextBoxText(BC_TumbleTextBox *popup, int x, int y);
+	BC_TumbleTextBoxText(BC_TumbleTextBox *popup, int64_t default_value, int x, int y);
+	BC_TumbleTextBoxText(BC_TumbleTextBox *popup, float default_value, int x, int y);
 	virtual ~BC_TumbleTextBoxText();
 	int handle_event();
 	int button_press_event();