eliminato ;
git-svn-id: svn://10.65.10.50/trunk@1210 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
		
							parent
							
								
									cbd8024512
								
							
						
					
					
						commit
						9491390e2c
					
				| @ -647,8 +647,8 @@ XVT_FNTID xvt_default_font() | ||||
|     desc.add(LogFont.lfOrientation);             // 4
 | ||||
|     desc.add(LogFont.lfWeight);                  // 5
 | ||||
|     desc.add(LogFont.lfItalic);                  // 6
 | ||||
|     desc.add(LogFont.lfUnderline); | ||||
|     desc.add(LogFont.lfStrikeOut); | ||||
|     desc.add(LogFont.lfUnderline);                | ||||
|     desc.add(LogFont.lfStrikeOut);               | ||||
|     desc.add(LogFont.lfCharSet); | ||||
|     desc.add(LogFont.lfOutPrecision); | ||||
|     desc.add(LogFont.lfClipPrecision); | ||||
| @ -666,8 +666,7 @@ XVT_FNTID xvt_default_font() | ||||
|     xvt_font_set_native_desc(FAT_FONT, (char*)(const char*)desc); | ||||
|     CHECK(xvt_font_has_valid_native_desc(FAT_FONT), "Bad font description"); | ||||
|     xvt_font_map_using_default(FAT_FONT); | ||||
|     CHECK(xvt_font_is_mapped(FAT_FONT), "Can't map native font");         | ||||
|      | ||||
|     CHECK(xvt_font_is_mapped(FAT_FONT), "Can't map native font");        | ||||
|     // Get true text size              
 | ||||
|     TEXTMETRIC tm;                     | ||||
|     HWND hdc = (HDC)xvt_vobj_get_attr(TASK_WIN, ATTR_NATIVE_GRAPHIC_CONTEXT); | ||||
| @ -703,9 +702,9 @@ void xvt_set_font(WINDOW win, const char* family, int style, int dim) | ||||
|     if (family && *family)    xvt_font_set_family(font, (char*)family); | ||||
|     if (dim != 0)             xvt_font_set_size(font, dim); | ||||
|     if (style != XVT_FS_NONE) xvt_font_set_style(font, style); | ||||
|      | ||||
|     if(!xvt_font_is_mapped(font));         | ||||
|     xvt_font_map(font, win); | ||||
| 
 | ||||
|     if(!xvt_font_is_mapped(font))         | ||||
|       xvt_font_map(font, win); | ||||
|      | ||||
|     xvt_dwin_set_font(win, font);   | ||||
|     xvt_font_destroy(font); | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user