projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vicon drag tweaks, proxy drag fix, vicon mouseover, binfolder around sort fix, draw_r...
[goodguy/history.git]
/
cinelerra-5.1
/
guicast
/
bcpixmap.C
diff --git
a/cinelerra-5.1/guicast/bcpixmap.C
b/cinelerra-5.1/guicast/bcpixmap.C
index dad466496992b139bb38e39f8fa05e614312787d..1489f5bed9543f72270f4fa0ff21dca1780215a0 100644
(file)
--- a/
cinelerra-5.1/guicast/bcpixmap.C
+++ b/
cinelerra-5.1/guicast/bcpixmap.C
@@
-26,7
+26,7
@@
#include "bcsynchronous.h"
#include "bcwindowbase.h"
#include "vframe.h"
#include "bcsynchronous.h"
#include "bcwindowbase.h"
#include "vframe.h"
-
+#include "workarounds.h"
#include <unistd.h>
#include <unistd.h>
@@
-126,7
+126,7
@@
BC_Pixmap::~BC_Pixmap()
{
#ifdef HAVE_XFT
if(opaque_xft_draw)
{
#ifdef HAVE_XFT
if(opaque_xft_draw)
-
X
ftDrawDestroy((XftDraw*)opaque_xft_draw);
+
x
ftDrawDestroy((XftDraw*)opaque_xft_draw);
#endif
XFreePixmap(top_level->display, opaque_pixmap);
}
#endif
XFreePixmap(top_level->display, opaque_pixmap);
}
@@
-136,7
+136,7
@@
BC_Pixmap::~BC_Pixmap()
XFreeGC(top_level->display, alpha_gc);
#ifdef HAVE_XFT
if(alpha_xft_draw)
XFreeGC(top_level->display, alpha_gc);
#ifdef HAVE_XFT
if(alpha_xft_draw)
-
X
ftDrawDestroy((XftDraw*)alpha_xft_draw);
+
x
ftDrawDestroy((XftDraw*)alpha_xft_draw);
#endif
XFreePixmap(top_level->display, alpha_pixmap);
}
#endif
XFreePixmap(top_level->display, alpha_pixmap);
}
@@
-187,7
+187,7
@@
int BC_Pixmap::initialize(BC_WindowBase *parent_window, int w, int h, int mode)
#ifdef HAVE_XFT
if(BC_WindowBase::get_resources()->use_xft)
{
#ifdef HAVE_XFT
if(BC_WindowBase::get_resources()->use_xft)
{
- opaque_xft_draw =
X
ftDrawCreate(top_level->display,
+ opaque_xft_draw =
x
ftDrawCreate(top_level->display,
opaque_pixmap,
top_level->vis,
top_level->cmap);
opaque_pixmap,
top_level->vis,
top_level->cmap);
@@
-226,7
+226,7
@@
int BC_Pixmap::initialize(BC_WindowBase *parent_window, int w, int h, int mode)
#ifdef HAVE_XFT
if(BC_WindowBase::get_resources()->use_xft)
{
#ifdef HAVE_XFT
if(BC_WindowBase::get_resources()->use_xft)
{
- alpha_xft_draw =
X
ftDrawCreateBitmap(top_level->display,
+ alpha_xft_draw =
x
ftDrawCreateBitmap(top_level->display,
alpha_pixmap);
}
#endif
alpha_pixmap);
}
#endif
@@
-253,7
+253,7
@@
void BC_Pixmap::resize(int w, int h)
#ifdef HAVE_XFT
XftDraw *new_xft_draw = 0;
if(BC_WindowBase::get_resources()->use_xft) {
#ifdef HAVE_XFT
XftDraw *new_xft_draw = 0;
if(BC_WindowBase::get_resources()->use_xft) {
- new_xft_draw =
X
ftDrawCreate(top_level->display,
+ new_xft_draw =
x
ftDrawCreate(top_level->display,
new_pixmap,
top_level->vis,
top_level->cmap);
new_pixmap,
top_level->vis,
top_level->cmap);
@@
-277,7
+277,7
@@
void BC_Pixmap::resize(int w, int h)
this->h = h;
#ifdef HAVE_XFT
if(BC_WindowBase::get_resources()->use_xft)
this->h = h;
#ifdef HAVE_XFT
if(BC_WindowBase::get_resources()->use_xft)
-
X
ftDrawDestroy((XftDraw*)opaque_xft_draw);
+
x
ftDrawDestroy((XftDraw*)opaque_xft_draw);
#endif
XFreePixmap(top_level->display, opaque_pixmap);
#endif
XFreePixmap(top_level->display, opaque_pixmap);