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

A few weeks of Unicode fixes (my old win95 laptop compiles sloowly,

Browse Source 
especially when through the nullmodem cable).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
1999-06-14 14:39:11 +00:00
parent 5f8e1c164d
commit 837e57436a
67 changed files with 778 additions and 763 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/msw/dc.cpp
View File

@@ -680,7 +680,7 @@ void wxDC::DoDrawText(const wxString& text, long x, long y)
else
SetBkMode(GetHdc(), OPAQUE);
(void)TextOut(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), (char *) (const char *)text, strlen((const char *)text));
(void)TextOut(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), WXSTRINGCAST text, wxStrlen(WXSTRINGCAST text));
if (m_textBackgroundColour.Ok())
(void)SetBkColor(GetHdc(), old_background);
@@ -755,7 +755,7 @@ void wxDC::SetFont(const wxFont& the_font)
HFONT f = (HFONT) ::SelectObject(GetHdc(), (HFONT) m_font.GetResourceHandle());
if (f == (HFONT) NULL)
{
wxLogDebug("::SelectObject failed in wxDC::SetFont.");
wxLogDebug(_T("::SelectObject failed in wxDC::SetFont."));
}
if (!m_oldFont)
m_oldFont = (WXHFONT) f;
@@ -962,7 +962,7 @@ void wxDC::GetTextExtent(const wxString& string, long *x, long *y,
SIZE sizeRect;
TEXTMETRIC tm;
GetTextExtentPoint(GetHdc(), (char *)(const char *) string, strlen((char *)(const char *) string), &sizeRect);
GetTextExtentPoint(GetHdc(), WXSTRINGCAST string, wxStrlen(WXSTRINGCAST string), &sizeRect);
GetTextMetrics(GetHdc(), &tm);
if (x) *x = XDEV2LOGREL(sizeRect.cx);