amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

(newline style)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1521 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2010-10-12 20:36:31 +00:00
parent adeee89f0d
commit 72db41b66a
1 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/wx-changes/fixes.txt
+80 -80
View File
@@ -5,66 +5,66 @@
purpose: Allow wxTAB_TRAVERSAL to be disabled for splitter windows purpose: Allow wxTAB_TRAVERSAL to be disabled for splitter windows
file: src/common/splitter.cpp file: src/common/splitter.cpp
line: 90 line: 90
old: old:
// allow TABbing from one window to the other // allow TABbing from one window to the other
style |= wxTAB_TRAVERSAL; style |= wxTAB_TRAVERSAL;
new: new:
// allow TABbing from one window to the other // allow TABbing from one window to the other
// @@@ 2007-04-13 If I don't ask for TAB_TREVERSAL, I don't want it, thank you very much! // @@@ 2007-04-13 If I don't ask for TAB_TREVERSAL, I don't want it, thank you very much!
//style |= wxTAB_TRAVERSAL; //style |= wxTAB_TRAVERSAL;
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
purpose: Fix copy/paste of bitmaps into Photopaint/Photoshop
file: src/msw/dib.cpp purpose: Fix copy/paste of bitmaps into Photopaint/Photoshop
line: 522 file: src/msw/dib.cpp
old: line: 522
// memory we need for BITMAPINFO only old:
DWORD dwLen = bi.biSize + GetNumberOfColours(bm.bmBitsPixel) * sizeof(RGBQUAD); // memory we need for BITMAPINFO only
new: DWORD dwLen = bi.biSize + GetNumberOfColours(bm.bmBitsPixel) * sizeof(RGBQUAD);
// memory we need for BITMAPINFO only new:
// memory we need for BITMAPINFO only
DWORD dwLen = bi.biSize + GetNumberOfColours(bm.bmBitsPixel) * sizeof(RGBQUAD); DWORD dwLen = bi.biSize + GetNumberOfColours(bm.bmBitsPixel) * sizeof(RGBQUAD);
// @@@ 2006-09-29 // @@@ 2006-09-29
// HACK: Photoshop and Photopaint thing they are dealing with BI_BITFIELDS // HACK: Photoshop and Photopaint thing they are dealing with BI_BITFIELDS
// so they expect masks, make room for that in the palet section // so they expect masks, make room for that in the palet section
if (bm.bmBitsPixel == 32) { if (bm.bmBitsPixel == 32) {
dwLen += 3 * sizeof(DWORD); dwLen += 3 * sizeof(DWORD);
} }
line: 551 line: 551
old: old:
// return the total size // return the total size
return dwLen + bi.biSizeImage; return dwLen + bi.biSizeImage;
new: new:
// @@@ // @@@
// HACK: make the DIB BI_BITFIELDS compatible for stupid programs that don't understand BI_RGB // HACK: make the DIB BI_BITFIELDS compatible for stupid programs that don't understand BI_RGB
if (!wantSizeOnly && bm.bmBitsPixel == 32) { if (!wantSizeOnly && bm.bmBitsPixel == 32) {
bi.biClrUsed = 3; bi.biClrUsed = 3;
ZeroMemory((char *)pbi + dwLen - 3 * sizeof(DWORD), 3 * sizeof(DWORD)); ZeroMemory((char *)pbi + dwLen - 3 * sizeof(DWORD), 3 * sizeof(DWORD));
} }
// return the total size // return the total size
return dwLen + bi.biSizeImage; return dwLen + bi.biSizeImage;
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
purpose: Draw 'checked' menu items with a border purpose: Draw 'checked' menu items with a border
file: src/msw/ownerdrw.cpp file: src/msw/ownerdrw.cpp
line: 464 line: 464
old: old:
// there should be enough space! // there should be enough space!
wxASSERT((nBmpWidth <= rc.GetWidth()) && (nBmpHeight <= rc.GetHeight())); wxASSERT((nBmpWidth <= rc.GetWidth()) && (nBmpHeight <= rc.GetHeight()));
int heightDiff = m_nHeight - nBmpHeight; int heightDiff = m_nHeight - nBmpHeight;
dc.Blit(rc.x + (margin - nBmpWidth) / 2, dc.Blit(rc.x + (margin - nBmpWidth) / 2,
rc.y + heightDiff / 2, rc.y + heightDiff / 2,
nBmpWidth, nBmpHeight, nBmpWidth, nBmpHeight,
&dcMem, 0, 0, wxCOPY, true /* use mask */); &dcMem, 0, 0, wxCOPY, true /* use mask */);
if ( ( st & wxODSelected ) && !( st & wxODDisabled ) && draw_bitmap_edge ) if ( ( st & wxODSelected ) && !( st & wxODDisabled ) && draw_bitmap_edge )
new: new:
// there should be enough space! // there should be enough space!
wxASSERT((nBmpWidth <= rc.GetWidth()) && (nBmpHeight <= rc.GetHeight())); wxASSERT((nBmpWidth <= rc.GetWidth()) && (nBmpHeight <= rc.GetHeight()));
// @@@ 2006-07-31 // @@@ 2006-07-31
// Draw dither behind bitmap // Draw dither behind bitmap
@@ -93,11 +93,11 @@ new:
// Draw sunken edge on checked item // Draw sunken edge on checked item
DrawEdge(hdc, &rectBmp, BDR_SUNKENOUTER, BF_RECT); DrawEdge(hdc, &rectBmp, BDR_SUNKENOUTER, BF_RECT);
} }
} else { } else {
// Draw rectangle around checked item // Draw rectangle around checked item
// background color is interpolated between selection and menu color // background color is interpolated between selection and menu color
HPEN hpen, hPrevPen; HPEN hpen, hPrevPen;
DWORD menu_bg_color = GetSysColor(COLOR_MENU); DWORD menu_bg_color = GetSysColor(COLOR_MENU);
DWORD selected_color = GetSysColor(COLOR_MENUHILIGHT); DWORD selected_color = GetSysColor(COLOR_MENUHILIGHT);
if ((st & wxODSelected)) { if ((st & wxODSelected)) {
hbr = CreateSolidBrush(menu_bg_color); hbr = CreateSolidBrush(menu_bg_color);
@@ -115,25 +115,25 @@ new:
DeleteObject(hpen); DeleteObject(hpen);
DeleteObject(hbr); DeleteObject(hbr);
} }
} // }}} } // }}}
int heightDiff = m_nHeight - nBmpHeight; int heightDiff = m_nHeight - nBmpHeight;
dc.Blit(rc.x + (margin - nBmpWidth) / 2, dc.Blit(rc.x + (margin - nBmpWidth) / 2,
rc.y + heightDiff / 2, rc.y + heightDiff / 2,
nBmpWidth, nBmpHeight, nBmpWidth, nBmpHeight,
&dcMem, 0, 0, wxCOPY, true /* use mask */); &dcMem, 0, 0, wxCOPY, true /* use mask */);
// @@@ 2006-07-31 // @@@ 2006-07-31
// Edge for checked already drawn // Edge for checked already drawn
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
purpose: Don't mess with the default GUI font for no reason purpose: Don't mess with the default GUI font for no reason
file: src/msw/settings.cpp file: src/msw/settings.cpp
line: 226 line: 226
old: old:
wxNativeFontInfo info; wxNativeFontInfo info;
info.lf = lf; info.lf = lf;
#ifndef __WXWINCE__ #ifndef __WXWINCE__
// We want Windows 2000 or later to have new fonts even MS Shell Dlg // We want Windows 2000 or later to have new fonts even MS Shell Dlg
@@ -142,17 +142,17 @@ old:
if(index == DEFAULT_GUI_FONT && wxGetOsVersion(&verMaj) == wxOS_WINDOWS_NT && verMaj >= 5) if(index == DEFAULT_GUI_FONT && wxGetOsVersion(&verMaj) == wxOS_WINDOWS_NT && verMaj >= 5)
wxStrcpy(info.lf.lfFaceName, wxT("MS Shell Dlg 2")); wxStrcpy(info.lf.lfFaceName, wxT("MS Shell Dlg 2"));
#endif #endif
// Under MicroWindows we pass the HFONT as well // Under MicroWindows we pass the HFONT as well
new: new:
wxNativeFontInfo info; wxNativeFontInfo info;
info.lf = lf; info.lf = lf;
//@@@ 2006-11-21: Don't mess with my Default GUI Font! //@@@ 2006-11-21: Don't mess with my Default GUI Font!
// Under MicroWindows we pass the HFONT as well // Under MicroWindows we pass the HFONT as well
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
purpose: Add support for dropdown arrows in wxToolBar purpose: Add support for dropdown arrows in wxToolBar
patch: apply http://trac.wxwidgets.org/ticket/8556 patch: apply http://trac.wxwidgets.org/ticket/8556
should be in 2.10 and HEAD already should be in 2.10 and HEAD already
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------