projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge hv v6, rework trace methods
[goodguy/history.git]
/
cinelerra-5.1
/
guicast
/
bcwindowbase.h
diff --git
a/cinelerra-5.1/guicast/bcwindowbase.h
b/cinelerra-5.1/guicast/bcwindowbase.h
index 994da7b0dc87d45d1a9641a0a6a2edb7a25736b3..c2ed7abc270bd98f01d17fbf51a62f441e264eca 100644
(file)
--- a/
cinelerra-5.1/guicast/bcwindowbase.h
+++ b/
cinelerra-5.1/guicast/bcwindowbase.h
@@
-65,6
+65,7
@@
#include "bctimer.inc"
#include "bctitle.inc"
#include "bctoggle.inc"
#include "bctimer.inc"
#include "bctitle.inc"
#include "bctoggle.inc"
+#include "bctrace.inc"
#include "bctumble.inc"
#include "bcwindow.inc"
#include "bcwindowbase.inc"
#include "bctumble.inc"
#include "bcwindow.inc"
#include "bcwindowbase.inc"
@@
-124,7
+125,7
@@
public:
// Windows, subwindows, popupwindows inherit from this
// Windows, subwindows, popupwindows inherit from this
-class BC_WindowBase
+class BC_WindowBase
: public trace_info
{
public:
BC_WindowBase(int opts=0);
{
public:
BC_WindowBase(int opts=0);
@@
-605,6
+606,8
@@
private:
int find_next_textbox(BC_WindowBase **first_textbox, BC_WindowBase **next_textbox, int &result);
int find_prev_textbox(BC_WindowBase **last_textbox, BC_WindowBase **prev_textbox, int &result);
int find_next_textbox(BC_WindowBase **first_textbox, BC_WindowBase **next_textbox, int &result);
int find_prev_textbox(BC_WindowBase **last_textbox, BC_WindowBase **prev_textbox, int &result);
+ void xft_draw_string(XftColor *xft_color, XftFont *xft_font, int x, int y,
+ const FcChar32 *fc, int len, BC_Pixmap *pixmap=0);
void translate_coordinates(Window src_w, Window dest_w,
int src_x, int src_y, int *dest_x_return, int *dest_y_return);
void translate_coordinates(Window src_w, Window dest_w,
int src_x, int src_y, int *dest_x_return, int *dest_y_return);