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 6ac7782b25f185e87f5e11682b9c5348a7c2f362..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 "bctrace.inc"
 #include "bctumble.inc"
 #include "bcwindow.inc"
 #include "bcwindowbase.inc"
@@ -124,7 +125,7 @@ public:
 
 
 // Windows, subwindows, popupwindows inherit from this
-class BC_WindowBase
+class BC_WindowBase : public trace_info
 {
 public:
        BC_WindowBase(int opts=0);
@@ -477,6 +478,7 @@ public:
        void slide_right(int distance);
        void slide_up(int distance);
        void slide_down(int distance);
+       void flicker(int n=3, int ms=66);
 
        int cycle_textboxes(int amount);
 
@@ -604,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);
 
+       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);