AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Corrected font calculation (use screen resolution now); and check for mask in m_image.cpp

Browse Source 
or get assert in DoBlit


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2000-01-24 12:24:57 +00:00
parent 0f42a87192
commit 6b82d89473
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/html/m_image.cpp
View File

@ -306,7 +306,7 @@ wxHtmlImageCell::wxHtmlImageCell(wxFSFile *input, int w, int h, int align, wxStr
void wxHtmlImageCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2) void wxHtmlImageCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2)
{ {
if (m_Image) if (m_Image)
dc.DrawBitmap(*m_Image, x + m_PosX, y + m_PosY, TRUE); dc.DrawBitmap(*m_Image, x + m_PosX, y + m_PosY, (m_Image->GetMask() != (wxMask*) 0));
wxHtmlCell::Draw(dc, x, y, view_y1, view_y2); wxHtmlCell::Draw(dc, x, y, view_y1, view_y2);
} }

21
src/msw/fontutil.cpp
View File

@ -41,6 +41,12 @@
#include "wx/tokenzr.h" #include "wx/tokenzr.h"
// If 1, use the screen resolution to calculate font sizes.
// This is OK for screen fonts but might have implications when the
// same font is used for printing.
// If 0, assume 96 DPI.
#define wxUSE_SCREEN_DPI 1
// ============================================================================ // ============================================================================
// implementation // implementation
// ============================================================================ // ============================================================================
@ -270,9 +276,9 @@ void wxFillLogFont(LOGFONT *logFont, const wxFont *font)
break; break;
} }
#if 0 #if wxUSE_SCREEN_DPI
HDC dc = ::GetDC(NULL); HDC dc = ::GetDC(NULL);
int ppInch = ::GetDeviceCaps(dc, LOGPIXELSY); static const int ppInch = ::GetDeviceCaps(dc, LOGPIXELSY);
::ReleaseDC(NULL, dc); ::ReleaseDC(NULL, dc);
#else #else
// New behaviour: apparently ppInch varies according to Large/Small Fonts // New behaviour: apparently ppInch varies according to Large/Small Fonts
@ -392,14 +398,17 @@ wxFont wxCreateFontFromLogFont(const LOGFONT *logFont)
wxString fontFace = logFont->lfFaceName; wxString fontFace = logFont->lfFaceName;
// font size
HDC dc = ::GetDC(NULL);
// remember that 1pt = 1/72inch // remember that 1pt = 1/72inch
int height = abs(logFont->lfHeight); int height = abs(logFont->lfHeight);
int fontPoints = (int) ((72.0*((double)height))/(double) GetDeviceCaps(dc, LOGPIXELSY) + 0.5);
#if wxUSE_SCREEN_DPI
HDC dc = ::GetDC(NULL);
static const int ppInch = GetDeviceCaps(dc, LOGPIXELSY);
::ReleaseDC(NULL, dc); ::ReleaseDC(NULL, dc);
#else
static const int ppInch = 96;
#endif
int fontPoints = (int) (((72.0*((double)height))/(double) ppInch) + 0.5);
wxFontEncoding fontEncoding; wxFontEncoding fontEncoding;
switch ( logFont->lfCharSet ) switch ( logFont->lfCharSet )