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

fixed warnings after GetFont prototype change

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-06-24 14:25:47 +00:00
parent c6eb778541
commit 7a5e53abb3
11 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/msw/window.cpp
View File

@@ -4887,22 +4887,21 @@ bool wxWindowMSW::MSWOnScroll(int orientation, WXWORD wParam,
// global functions
// ===========================================================================
void wxGetCharSize(WXHWND wnd, int *x, int *y, const wxFont *the_font)
void wxGetCharSize(WXHWND wnd, int *x, int *y, const wxFont& the_font)
{
TEXTMETRIC tm;
HDC dc = ::GetDC((HWND) wnd);
HFONT fnt =0;
HFONT was = 0;
if ( the_font )
{
// the_font->UseResource();
// the_font->RealizeResource();
fnt = (HFONT)((wxFont *)the_font)->GetResourceHandle(); // const_cast
if ( fnt )
was = (HFONT) SelectObject(dc,fnt);
}
// the_font.UseResource();
// the_font.RealizeResource();
fnt = (HFONT)the_font.GetResourceHandle(); // const_cast
if ( fnt )
was = (HFONT) SelectObject(dc,fnt);
GetTextMetrics(dc, &tm);
if ( the_font && fnt && was )
if ( fnt && was )
{
SelectObject(dc,was);
}
@@ -4913,8 +4912,7 @@ void wxGetCharSize(WXHWND wnd, int *x, int *y, const wxFont *the_font)
if ( y )
*y = tm.tmHeight + tm.tmExternalLeading;
// if ( the_font )
// the_font->ReleaseResource();
// the_font.ReleaseResource();
}
// Returns 0 if was a normal ASCII value, not a special key. This indicates that