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

Rename variable CHAR_WIDTH in src/msw/msgdlg.cpp

Browse Source 
When compiling wxWidgets with MinGW64, CHAR_WIDTH can be already defined as a
macro, avoid clashing with it by renaming our variable with the same name.

Closes https://github.com/wxWidgets/wxWidgets/pull/383
This commit is contained in:
René Kijewski 2017-01-06 17:05:10 +01:00 committed by Vadim Zeitlin
parent e71be91ebe
commit 82de2bba0f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/msw/msgdlg.cpp
View File

@ -352,9 +352,9 @@ void wxMessageDialog::AdjustButtonLabels()
// resize the message box to be wider if needed
const int wBoxOld = wxGetClientRect(GetHwnd()).right;
const int CHAR_WIDTH = GetCharWidth();
const int MARGIN_OUTER = 2*CHAR_WIDTH; // margin between box and buttons
const int MARGIN_INNER = CHAR_WIDTH; // margin between buttons
const int CHAR_WIDTH_IN_PIXELS = GetCharWidth();
const int MARGIN_OUTER = 2*CHAR_WIDTH_IN_PIXELS; // margin between box and buttons
const int MARGIN_INNER = CHAR_WIDTH_IN_PIXELS; // margin between buttons
RECT rcBox = wxGetWindowRect(GetHwnd());