cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

De-TAB-bed src/x11/pango_x.cpp.

Browse Source 
This is necessary in order to be able to check in its modified version in the
next commit.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2010-03-20 13:02:56 +00:00
parent c514752837
commit e3728f8a8d
1 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
src/x11/pango_x.cpp
View File

@ -9,11 +9,11 @@
void void
x11_draw_glyphs( Drawable drawable, x11_draw_glyphs( Drawable drawable,
GC gc, GC gc,
PangoFont *font, PangoFont *font,
int x, int x,
int y, int y,
PangoGlyphString *glyphs, PangoGlyphString *glyphs,
wxColour &colour ); wxColour &colour );
void void
@ -57,11 +57,11 @@ x11_pango_get_item_properties( PangoItem *item,
void void
x11_draw_glyphs( Drawable drawable, x11_draw_glyphs( Drawable drawable,
GC gc, GC gc,
PangoFont *font, PangoFont *font,
int x, int x,
int y, int y,
PangoGlyphString *glyphs, PangoGlyphString *glyphs,
wxColour &colour ) wxColour &colour )
{ {
#ifdef HAVE_PANGO_XFT #ifdef HAVE_PANGO_XFT
@ -137,11 +137,11 @@ x11_draw_layout_line_with_colors( Drawable drawable,
} }
#if 0 #if 0
XDrawRectangle( drawable, gc, TRUE, XDrawRectangle( drawable, gc, TRUE,
x + (x_off + logical_rect.x) / PANGO_SCALE, x + (x_off + logical_rect.x) / PANGO_SCALE,
risen_y + overall_rect.y / PANGO_SCALE, risen_y + overall_rect.y / PANGO_SCALE,
logical_rect.width / PANGO_SCALE, logical_rect.width / PANGO_SCALE,
overall_rect.height / PANGO_SCALE); overall_rect.height / PANGO_SCALE);
#endif #endif
if (!shape_set) if (!shape_set)
@ -155,9 +155,9 @@ x11_draw_layout_line_with_colors( Drawable drawable,
if (uline == PANGO_UNDERLINE_SINGLE) if (uline == PANGO_UNDERLINE_SINGLE)
{ {
XDrawLine( wxGlobalDisplay(), drawable, gc, XDrawLine( wxGlobalDisplay(), drawable, gc,
x + (x_off + ink_rect.x) / PANGO_SCALE - 1, x + (x_off + ink_rect.x) / PANGO_SCALE - 1,
risen_y + 1, risen_y + 1,
x + (x_off + ink_rect.x + ink_rect.width) / PANGO_SCALE, x + (x_off + ink_rect.x + ink_rect.width) / PANGO_SCALE,
risen_y + 1); risen_y + 1);
} }
@ -243,50 +243,50 @@ x11_pango_get_item_properties( PangoItem *item,
PangoAttribute *attr = (PangoAttribute *) tmp_list->data; PangoAttribute *attr = (PangoAttribute *) tmp_list->data;
switch (attr->klass->type) switch (attr->klass->type)
{ {
case PANGO_ATTR_UNDERLINE: case PANGO_ATTR_UNDERLINE:
if (uline) if (uline)
*uline = (PangoUnderline) ((PangoAttrInt *)attr)->value; *uline = (PangoUnderline) ((PangoAttrInt *)attr)->value;
break; break;
case PANGO_ATTR_STRIKETHROUGH: case PANGO_ATTR_STRIKETHROUGH:
if (strikethrough) if (strikethrough)
*strikethrough = ((PangoAttrInt *)attr)->value; *strikethrough = ((PangoAttrInt *)attr)->value;
break; break;
case PANGO_ATTR_FOREGROUND:
if (fg_color)
*fg_color = ((PangoAttrColor *)attr)->color;
if (fg_set)
*fg_set = TRUE;
break;
case PANGO_ATTR_BACKGROUND:
if (bg_color)
*bg_color = ((PangoAttrColor *)attr)->color;
if (bg_set)
*bg_set = TRUE;
break;
case PANGO_ATTR_SHAPE: case PANGO_ATTR_FOREGROUND:
if (shape_set) if (fg_color)
*shape_set = TRUE; *fg_color = ((PangoAttrColor *)attr)->color;
if (logical_rect) if (fg_set)
*logical_rect = ((PangoAttrShape *)attr)->logical_rect; *fg_set = TRUE;
if (ink_rect)
*ink_rect = ((PangoAttrShape *)attr)->ink_rect;
break;
case PANGO_ATTR_RISE: break;
if (rise)
*rise = ((PangoAttrInt *)attr)->value;
break;
default: case PANGO_ATTR_BACKGROUND:
break; if (bg_color)
} *bg_color = ((PangoAttrColor *)attr)->color;
if (bg_set)
*bg_set = TRUE;
break;
case PANGO_ATTR_SHAPE:
if (shape_set)
*shape_set = TRUE;
if (logical_rect)
*logical_rect = ((PangoAttrShape *)attr)->logical_rect;
if (ink_rect)
*ink_rect = ((PangoAttrShape *)attr)->ink_rect;
break;
case PANGO_ATTR_RISE:
if (rise)
*rise = ((PangoAttrInt *)attr)->value;
break;
default:
break;
}
tmp_list = tmp_list->next; tmp_list = tmp_list->next;
} }
} }