AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Remove GDK_GC_FONT

Browse Source
This commit is contained in:
Javier Jardón 2010-06-25 02:08:40 +02:00
parent 655dcff096
commit 06e48c50a1
4 changed files with 15 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/reference/gdk/tmpl/gcs.sgml
View File

@ -79,7 +79,6 @@ A set of bit flags used to indicate which fields
@GDK_GC_FOREGROUND: the @foreground is set.
@GDK_GC_BACKGROUND: the @background is set.
@GDK_GC_FONT: the @font is set.
@GDK_GC_FUNCTION: the @function is set.
@GDK_GC_FILL: the @fill is set.
@GDK_GC_TILE: the @tile is set.

31
gdk/gdkgc.h
View File

@ -139,22 +139,21 @@ typedef enum
{
GDK_GC_FOREGROUND = 1 << 0,
GDK_GC_BACKGROUND = 1 << 1,
GDK_GC_FONT = 1 << 2,
GDK_GC_FUNCTION = 1 << 3,
GDK_GC_FILL = 1 << 4,
GDK_GC_TILE = 1 << 5,
GDK_GC_STIPPLE = 1 << 6,
GDK_GC_CLIP_MASK = 1 << 7,
GDK_GC_SUBWINDOW = 1 << 8,
GDK_GC_TS_X_ORIGIN = 1 << 9,
GDK_GC_TS_Y_ORIGIN = 1 << 10,
GDK_GC_CLIP_X_ORIGIN = 1 << 11,
GDK_GC_CLIP_Y_ORIGIN = 1 << 12,
GDK_GC_EXPOSURES = 1 << 13,
GDK_GC_LINE_WIDTH = 1 << 14,
GDK_GC_LINE_STYLE = 1 << 15,
GDK_GC_CAP_STYLE = 1 << 16,
GDK_GC_JOIN_STYLE = 1 << 17
GDK_GC_FUNCTION = 1 << 2,
GDK_GC_FILL = 1 << 3,
GDK_GC_TILE = 1 << 4,
GDK_GC_STIPPLE = 1 << 5,
GDK_GC_CLIP_MASK = 1 << 6,
GDK_GC_SUBWINDOW = 1 << 7,
GDK_GC_TS_X_ORIGIN = 1 << 8,
GDK_GC_TS_Y_ORIGIN = 1 << 9,
GDK_GC_CLIP_X_ORIGIN = 1 << 10,
GDK_GC_CLIP_Y_ORIGIN = 1 << 11,
GDK_GC_EXPOSURES = 1 << 12,
GDK_GC_LINE_WIDTH = 1 << 13,
GDK_GC_LINE_STYLE = 1 << 14,
GDK_GC_CAP_STYLE = 1 << 15,
GDK_GC_JOIN_STYLE = 1 << 16
} GdkGCValuesMask;
struct _GdkGCValues

4
gdk/win32/gdkdrawable-win32.c
View File

@ -574,10 +574,6 @@ generic_draw (GdkDrawable *drawable,
drawing_mask |= LINE_ATTRIBUTES;
}
/* Ditto, if the drawing function draws text, set up for that. */
if (mask & GDK_GC_FONT)
drawing_mask |= GDK_GC_FONT;
mask_hdc = gdk_win32_hdc_get (mask_pixmap, mask_gc, drawing_mask);
(*function) (GDK_GC_WIN32 (mask_gc), mask_hdc,
region->extents.x1, region->extents.y1, args);

14
gdk/win32/gdkgc-win32.c
View File

@ -744,11 +744,6 @@ get_impl_drawable (GdkDrawable *drawable)
* width and stule is created and selected into the HDC. Note that the
* dash properties are not completely implemented.
*
* If the %GDK_GC_FONT flag is set, the background mix mode is set to
* %TRANSPARENT. and the text alignment is set to
* %TA_BASELINE|%TA_LEFT. Note that no font gets selected into the HDC
* by this function.
*
* Some things are done regardless of @mask: If the function in @gc is
* any other than %GDK_COPY, the raster operation of the HDC is
* set. If @gc has a clip mask, the clip region of the HDC is set.
@ -846,15 +841,6 @@ gdk_win32_hdc_get (GdkDrawable *drawable,
}
}
if (ok && (usage & GDK_GC_FONT))
{
if (SetBkMode (win32_gc->hdc, TRANSPARENT) == 0)
WIN32_GDI_FAILED ("SetBkMode"), ok = FALSE;
if (ok && SetTextAlign (win32_gc->hdc, TA_BASELINE|TA_LEFT|TA_NOUPDATECP) == GDI_ERROR)
WIN32_GDI_FAILED ("SetTextAlign"), ok = FALSE;
}
if (ok && win32_gc->rop2 != R2_COPYPEN)
if (SetROP2 (win32_gc->hdc, win32_gc->rop2) == 0)
WIN32_GDI_FAILED ("SetROP2"), ok = FALSE;