merged hv7 mod

[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 263fa657c864b978970fc57e1526f30d27e462a3..2c25dc1feb0bdf9fe3a255eee4f9afdbf11ec7a5 100644 (file)
--- a/cinelerra-5.1/guicast/bcwindowbase.h
+++ b/cinelerra-5.1/guicast/bcwindowbase.h
@@ -743,19 +743,17 @@ private:
 
 
 // Font sets
-    XFontSet smallfontset, mediumfontset, largefontset, bigfontset, curr_fontset;
-
+       XFontSet smallfontset, mediumfontset, largefontset, bigfontset, clockfontset;
+       XFontSet curr_fontset;
 // Fonts
        int current_font;
-       XFontStruct *smallfont, *mediumfont, *largefont, *bigfont;
-
+       XFontStruct *smallfont, *mediumfont, *largefont, *bigfont, *clockfont;
 // Must be void so users don't need to include the wrong libpng version.
-       void *smallfont_xft, *mediumfont_xft, *largefont_xft, *bigfont_xft;
-
+       void *smallfont_xft, *mediumfont_xft, *largefont_xft, *bigfont_xft, *clockfont_xft;
+       void *bold_smallfont_xft, *bold_mediumfont_xft, *bold_largefont_xft;
 
        int line_width;
        int line_dashes;
-       void *bold_largefont_xft, *bold_mediumfont_xft, *bold_smallfont_xft;
        int64_t current_color;
 // Coordinate of drag start
        int drag_x, drag_y;