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

applied patch #1185523: "Replace GetTextExtentPoint with GetTextExtentPoint32"

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth
2005-05-17 16:03:25 +00:00
parent 489c9090ef
commit 767b35a56f
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/msw/dc.cpp
View File

@@ -1635,7 +1635,7 @@ void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
SIZE sizeRect; SIZE sizeRect;
TEXTMETRIC tm; TEXTMETRIC tm;
GetTextExtentPoint(GetHdc(), string, string.length(), &sizeRect); ::GetTextExtentPoint32(GetHdc(), string, string.length(), &sizeRect);
GetTextMetrics(GetHdc(), &tm); GetTextMetrics(GetHdc(), &tm);
if (x) if (x)

4
src/msw/listbox.cpp
View File

@@ -622,7 +622,7 @@ void wxListBox::SetHorizontalExtent(const wxString& s)
GetTextMetrics(dc, &lpTextMetric); GetTextMetrics(dc, &lpTextMetric);
SIZE extentXY; SIZE extentXY;
::GetTextExtentPoint(dc, (LPTSTR) (const wxChar *)s, s.Length(), &extentXY); ::GetTextExtentPoint32(dc, (LPTSTR) (const wxChar *)s, s.Length(), &extentXY);
int extentX = (int)(extentXY.cx + lpTextMetric.tmAveCharWidth); int extentX = (int)(extentXY.cx + lpTextMetric.tmAveCharWidth);
if (oldFont) if (oldFont)
@@ -646,7 +646,7 @@ void wxListBox::SetHorizontalExtent(const wxString& s)
{ {
wxString str = GetString(i); wxString str = GetString(i);
SIZE extentXY; SIZE extentXY;
::GetTextExtentPoint(dc, str.c_str(), str.length(), &extentXY); ::GetTextExtentPoint32(dc, str.c_str(), str.length(), &extentXY);
int extentX = (int)(extentXY.cx + lpTextMetric.tmAveCharWidth); int extentX = (int)(extentXY.cx + lpTextMetric.tmAveCharWidth);
if (extentX > largestExtent) if (extentX > largestExtent)
largestExtent = extentX; largestExtent = extentX;

2
src/msw/metafile.cpp
View File

@@ -232,7 +232,7 @@ void wxMetafileDC::GetTextExtent(const wxString& string, long *x, long *y,
SIZE sizeRect; SIZE sizeRect;
TEXTMETRIC tm; TEXTMETRIC tm;
GetTextExtentPoint(dc, WXSTRINGCAST string, wxStrlen(WXSTRINGCAST string), &sizeRect); ::GetTextExtentPoint32(dc, WXSTRINGCAST string, wxStrlen(WXSTRINGCAST string), &sizeRect);
GetTextMetrics(dc, &tm); GetTextMetrics(dc, &tm);
ReleaseDC(NULL, dc); ReleaseDC(NULL, dc);

2
src/msw/ownerdrw.cpp
View File

@@ -312,7 +312,7 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
xText += 3; // separate text from the highlight rectangle xText += 3; // separate text from the highlight rectangle
SIZE sizeRect; SIZE sizeRect;
GetTextExtentPoint32(hdc,strMenuText.c_str(), strMenuText.Length(),&sizeRect); ::GetTextExtentPoint32(hdc, strMenuText.c_str(), strMenuText.Length(), &sizeRect);
::DrawState(hdc, NULL, NULL, ::DrawState(hdc, NULL, NULL,
(LPARAM)strMenuText.c_str(), strMenuText.length(), (LPARAM)strMenuText.c_str(), strMenuText.length(),
xText, rc.y + (int) ((rc.GetHeight()-sizeRect.cy)/2.0), // centre text vertically xText, rc.y + (int) ((rc.GetHeight()-sizeRect.cy)/2.0), // centre text vertically

4
src/msw/tooltip.cpp
View File

@@ -317,9 +317,9 @@ void wxToolTip::Add(WXHWND hWnd)
} }
SIZE sz; SIZE sz;
if ( !GetTextExtentPoint(hdc, m_text, index, &sz) ) if ( !::GetTextExtentPoint32(hdc, m_text, index, &sz) )
{ {
wxLogLastError(wxT("GetTextExtentPoint")); wxLogLastError(wxT("GetTextExtentPoint32"));
} }
SendTooltipMessage(GetToolTipCtrl(), TTM_SETMAXTIPWIDTH, SendTooltipMessage(GetToolTipCtrl(), TTM_SETMAXTIPWIDTH,

2
src/msw/window.cpp
View File

@@ -1797,7 +1797,7 @@ void wxWindowMSW::GetTextExtent(const wxString& string,
SIZE sizeRect; SIZE sizeRect;
TEXTMETRIC tm; TEXTMETRIC tm;
GetTextExtentPoint(hdc, string, string.length(), &sizeRect); ::GetTextExtentPoint32(hdc, string, string.length(), &sizeRect);
GetTextMetrics(hdc, &tm); GetTextMetrics(hdc, &tm);
if ( x ) if ( x )