root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 2.1 nopatch

Browse Source 
Files correlati     : xvaga.dll
Ricompilazione Demo : [ ]
Commento            :

Coreetta selezione interattiva font


git-svn-id: svn://10.65.10.50/trunk@11912 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2004-03-25 16:35:20 +00:00
parent ab33d85945
commit ae174dc58e
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xvaga/xvaga.cpp
View File

@ -1944,9 +1944,9 @@ void TFontId::Copy(const wxFont& rFont)
m_wMask = XVT_FS_NONE;
if (rFont.GetUnderlined())
m_wMask |= XVT_FS_UNDERLINE;
if (rFont.GetWeight() >= 700)
if (rFont.GetWeight() >= wxBOLD)
m_wMask |= XVT_FS_BOLD;
if (rFont.GetStyle() & wxITALIC)
if (rFont.GetStyle() == wxITALIC)
m_wMask |= XVT_FS_ITALIC;
m_win = NULL_WIN;
}
@ -2034,7 +2034,13 @@ void xvt_dwin_draw_image(WINDOW win, XVT_IMAGE image, RCT* dest, RCT* source)
}
}
void xvt_dwin_draw_oval(WINDOW Win, RCT* r) { SORRY_BOX(); }
void xvt_dwin_draw_oval(WINDOW win, RCT* rctp)
{
CAST_DC(win, dc);
const wxRect rct = NormalizeRCT(rctp);
dc.DrawEllipse(rct);
}
void xvt_dwin_draw_pie(WINDOW win, RCT *rctp, int start_x, int start_y, int stop_x, int stop_y) { SORRY_BOX(); }
void xvt_dwin_draw_polygon(WINDOW win, PNT *lpnts, int npnts) { SORRY_BOX(); }
@ -2160,7 +2166,7 @@ int xvt_dwin_get_text_width(WINDOW win, const char *s, int len)
str.Truncate(len);
if (str.StartsWith("ABCDEFGH") || str.StartsWith("MMMMMMMM"))
{
const wxString emme('m', str.Length());
const wxString emme('n', str.Length());
str = emme;
}
dc.GetTextExtent(str, &width, &height);

4
xvaga/xvtextra.cpp
View File

@ -521,7 +521,7 @@ BOOLEAN xvt_print_start_thread(BOOLEAN(*print_fcn)(long), long data)
wxEndBusyCursor();
CreateAbortWindow();
print_fcn(data);
const BOOLEAN aborted = print_fcn(data);
DestroyAbortWindow();
#ifdef WIN32
@ -542,7 +542,7 @@ BOOLEAN xvt_print_start_thread(BOOLEAN(*print_fcn)(long), long data)
delete m_po; m_po = NULL;
return TRUE;
return aborted;
}
BOOLEAN xvt_print_open_page(PRINT_RCD* precp)