Author: ianmacarthur
Date: 2010-04-08 10:51:28 -0700 (Thu, 08 Apr 2010)
New Revision: 7472
Log:
The non-XFT X11 builds fail because they are not updated to use the Fl_Device
patches.
This is an attempt to remedy that. Can someone familiar with the Fl_Device stuff
please verify these changes?
With these changes in place the code now builds and seems to work.
I have NOT tested print support however - should that matter?
Modified:
branches/branch-1.3/src/fl_font_x.cxx
Modified: branches/branch-1.3/src/fl_font_x.cxx
===================================================================
--- branches/branch-1.3/src/fl_font_x.cxx 2010-04-08 16:58:28 UTC (rev
7471)
+++ branches/branch-1.3/src/fl_font_x.cxx 2010-04-08 17:51:28 UTC (rev
7472)
@@ -261,7 +261,7 @@
void *fl_xftfont = 0;
static GC font_gc;
-void fl_font(Fl_Font fnum, Fl_Fontsize size) {
+void Fl_Device::font(Fl_Font fnum, Fl_Fontsize size) {
if (fnum==-1) {
fl_font_ = 0; fl_size_ = 0;
return;
@@ -310,7 +310,7 @@
} // fl_text_extents
-void fl_draw(const char* c, int n, int x, int y) {
+void Fl_Device::draw(const char* c, int n, int x, int y) {
if (font_gc != fl_gc) {
if (!fl_xfont) fl_font(FL_HELVETICA, 14);
font_gc = fl_gc;
@@ -319,7 +319,7 @@
// XDrawString(fl_display, fl_window, fl_gc, x, y, c, n);
XUtf8DrawString(fl_display, fl_window, fl_xfont, fl_gc, x, y, c, n);
}
-void fl_draw(int angle, const char *str, int n, int x, int y) {
+void Fl_Device::draw(int angle, const char *str, int n, int x, int y) {
fprintf(stderr,"ROTATING TEXT NOT IMPLIMENTED\n");
fl_draw(str, n, (int)x, (int)y);
}
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
