-
diff --strip-trailing-cr -Nur wxWidgets-2.8.12/configure wxWidgets-2.8.12.patched/configure
old
|
new
|
|
27805 | 27805 | |
27806 | 27806 | case "${host}" in |
27807 | 27807 | x86_64-*-mingw32* ) |
27808 | | LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lwctl3d32 -ladvapi32 -lwsock32 -lgdi32" |
| 27808 | LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -ladvapi32 -lws2_32 -lgdi32" |
27809 | 27809 | ;; |
27810 | 27810 | * ) |
27811 | | LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32" |
| 27811 | LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -ladvapi32 -lws2_32 -lgdi32" |
27812 | 27812 | ;; |
27813 | 27813 | esac |
27814 | 27814 | if test "$wxUSE_ACCESSIBILITY" = "yes" ; then |
-
diff --strip-trailing-cr -Nur wxWidgets-2.8.12/include/wx/msw/menuitem.h wxWidgets-2.8.12.patched/include/wx/msw/menuitem.h
old
|
new
|
|
54 | 54 | // the id for a popup menu is really its menu handle (as required by |
55 | 55 | // ::AppendMenu() API), so this function will return either the id or the |
56 | 56 | // menu handle depending on what we're |
57 | | int GetRealId() const; |
| 57 | WXWPARAM GetRealId() const; |
58 | 58 | |
59 | 59 | // mark item as belonging to the given radio group |
60 | 60 | void SetAsRadioGroupStart(); |
-
diff --strip-trailing-cr -Nur wxWidgets-2.8.12/src/aui/framemanager.cpp wxWidgets-2.8.12.patched/src/aui/framemanager.cpp
old
|
new
|
|
974 | 974 | if (pinfo.name.empty() || already_exists) |
975 | 975 | { |
976 | 976 | pinfo.name.Printf(wxT("%08lx%08x%08x%08lx"), |
977 | | ((unsigned long)pinfo.window) & 0xffffffff, |
| 977 | ((unsigned long)(intptr_t)pinfo.window) & 0xffffffff, |
978 | 978 | (unsigned int)time(NULL), |
979 | 979 | #ifdef __WXWINCE__ |
980 | 980 | (unsigned int)GetTickCount(), |
-
diff --strip-trailing-cr -Nur wxWidgets-2.8.12/src/common/debugrpt.cpp wxWidgets-2.8.12.patched/src/common/debugrpt.cpp
old
|
new
|
|
54 | 54 | #include "wx/zipstrm.h" |
55 | 55 | #endif // wxUSE_ZIPSTREAM |
56 | 56 | |
| 57 | #include <direct.h> |
| 58 | |
57 | 59 | WX_CHECK_BUILD_OPTIONS("wxQA") |
58 | 60 | |
59 | 61 | // ---------------------------------------------------------------------------- |
-
diff --strip-trailing-cr -Nur wxWidgets-2.8.12/src/common/filefn.cpp wxWidgets-2.8.12.patched/src/common/filefn.cpp
old
|
new
|
|
70 | 70 | #endif |
71 | 71 | #endif // __GNUWIN32__ |
72 | 72 | |
| 73 | #include <direct.h> |
| 74 | |
73 | 75 | // io.h is needed for _get_osfhandle() |
74 | 76 | // Already included by filefn.h for many Windows compilers |
75 | 77 | #if defined __MWERKS__ || defined __CYGWIN__ |
-
diff --strip-trailing-cr -Nur wxWidgets-2.8.12/src/common/utilscmn.cpp wxWidgets-2.8.12.patched/src/common/utilscmn.cpp
old
|
new
|
|
822 | 822 | //hInstApp member is only valid if the function fails, in which case it |
823 | 823 | //receives one of the following error values, which are less than or |
824 | 824 | //equal to 32. |
825 | | const int nResult = (int) sei.hInstApp; |
| 825 | const intptr_t nResult = (intptr_t)sei.hInstApp; |
826 | 826 | |
827 | 827 | // Firefox returns file not found for some reason, so make an exception |
828 | 828 | // for it |
-
diff --strip-trailing-cr -Nur wxWidgets-2.8.12/src/msw/dcprint.cpp wxWidgets-2.8.12.patched/src/msw/dcprint.cpp
old
|
new
|
|
319 | 319 | } |
320 | 320 | |
321 | 321 | |
322 | | HGLOBAL hDevMode = (HGLOBAL)(DWORD) data->GetDevMode(); |
| 322 | HGLOBAL hDevMode = (HGLOBAL) data->GetDevMode(); |
323 | 323 | |
324 | 324 | DEVMODE *lpDevMode = hDevMode ? (DEVMODE *)::GlobalLock(hDevMode) : NULL; |
325 | 325 | |
-
diff --strip-trailing-cr -Nur wxWidgets-2.8.12/src/msw/frame.cpp wxWidgets-2.8.12.patched/src/msw/frame.cpp
old
|
new
|
|
855 | 855 | HDC hdc = ::BeginPaint(GetHwnd(), &ps); |
856 | 856 | |
857 | 857 | // Erase background before painting or we get white background |
858 | | MSWDefWindowProc(WM_ICONERASEBKGND, (WORD)(LONG)ps.hdc, 0L); |
| 858 | MSWDefWindowProc(WM_ICONERASEBKGND, (intptr_t)ps.hdc, 0L); |
859 | 859 | |
860 | 860 | if ( hIcon ) |
861 | 861 | { |
… |
… |
|
1085 | 1085 | const wxIcon& icon = GetIcon(); |
1086 | 1086 | HICON hIcon = icon.Ok() ? GetHiconOf(icon) |
1087 | 1087 | : (HICON)GetDefaultIcon(); |
1088 | | rc = (long)hIcon; |
| 1088 | rc = (intptr_t)hIcon; // WXLRESULT is int64 in win64 |
1089 | 1089 | processed = rc != 0; |
1090 | 1090 | } |
1091 | 1091 | break; |
-
diff --strip-trailing-cr -Nur wxWidgets-2.8.12/src/msw/helpwin.cpp wxWidgets-2.8.12.patched/src/msw/helpwin.cpp
old
|
new
|
|
98 | 98 | |
99 | 99 | wxString str = GetValidFilename(m_helpFile); |
100 | 100 | |
101 | | return (WinHelp(GetSuitableHWND(this), (const wxChar*) str, HELP_PARTIALKEY, (DWORD)(const wxChar*) k) != 0); |
| 101 | return (WinHelp(GetSuitableHWND(this), (const wxChar*) str, HELP_PARTIALKEY, (intptr_t)(const wxChar*) k) != 0); |
102 | 102 | } |
103 | 103 | |
104 | 104 | // Can't close the help window explicitly in WinHelp |
-
diff --strip-trailing-cr -Nur wxWidgets-2.8.12/src/msw/mdi.cpp wxWidgets-2.8.12.patched/src/msw/mdi.cpp
old
|
new
|
|
763 | 763 | wxWindowCreationHook hook(this); |
764 | 764 | |
765 | 765 | m_hWnd = (WXHWND)::SendMessage(GetWinHwnd(parent->GetClientWindow()), |
766 | | WM_MDICREATE, 0, (LONG)(LPSTR)&mcs); |
| 766 | WM_MDICREATE, 0, (intptr_t)&mcs); |
767 | 767 | |
768 | 768 | if ( !m_hWnd ) |
769 | 769 | { |
… |
… |
|
1433 | 1433 | { |
1434 | 1434 | success = true; |
1435 | 1435 | ::InsertMenu(hmenu, i, MF_BYPOSITION | MF_POPUP | MF_STRING, |
1436 | | (UINT)subMenu, _("&Window")); |
| 1436 | (intptr_t)subMenu, _("&Window")); |
1437 | 1437 | break; |
1438 | 1438 | } |
1439 | 1439 | } |
1440 | 1440 | |
1441 | 1441 | if ( !success ) |
1442 | 1442 | { |
1443 | | ::AppendMenu(hmenu, MF_POPUP, (UINT)subMenu, _("&Window")); |
| 1443 | ::AppendMenu(hmenu, MF_POPUP, (intptr_t)subMenu, _("&Window")); |
1444 | 1444 | } |
1445 | 1445 | } |
1446 | 1446 | |
-
diff --strip-trailing-cr -Nur wxWidgets-2.8.12/src/msw/menu.cpp wxWidgets-2.8.12.patched/src/msw/menu.cpp
old
|
new
|
|
370 | 370 | |
371 | 371 | // id is the numeric id for normal menu items and HMENU for submenus as |
372 | 372 | // required by ::AppendMenu() API |
373 | | UINT id; |
| 373 | UINT_PTR id; |
374 | 374 | wxMenu *submenu = pItem->GetSubMenu(); |
375 | 375 | if ( submenu != NULL ) { |
376 | 376 | wxASSERT_MSG( submenu->GetHMenu(), wxT("invalid submenu") ); |
377 | 377 | |
378 | 378 | submenu->SetParent(this); |
379 | 379 | |
380 | | id = (UINT)submenu->GetHMenu(); |
| 380 | id = (intptr_t)submenu->GetHMenu(); |
381 | 381 | |
382 | 382 | flags |= MF_POPUP; |
383 | 383 | } |
384 | 384 | else { |
385 | | id = pItem->GetId(); |
| 385 | id = pItem->GetRealId(); |
386 | 386 | } |
387 | 387 | |
388 | 388 | |
… |
… |
|
963 | 963 | for ( i = 0, it = m_menus.begin(); i < count; i++, it++ ) |
964 | 964 | { |
965 | 965 | if ( !::AppendMenu((HMENU)m_hMenu, MF_POPUP | MF_STRING, |
966 | | (UINT)(*it)->GetHMenu(), |
| 966 | (intptr_t)(*it)->GetHMenu(), |
967 | 967 | m_titles[i]) ) |
968 | 968 | { |
969 | 969 | wxLogLastError(wxT("AppendMenu")); |
… |
… |
|
1035 | 1035 | |
1036 | 1036 | int mswpos = MSWPositionForWxMenu(GetMenu(pos),pos); |
1037 | 1037 | |
1038 | | UINT id; |
| 1038 | UINT_PTR id; |
1039 | 1039 | UINT flagsOld = ::GetMenuState((HMENU)m_hMenu, mswpos, MF_BYPOSITION); |
1040 | 1040 | if ( flagsOld == 0xFFFFFFFF ) |
1041 | 1041 | { |
… |
… |
|
1048 | 1048 | { |
1049 | 1049 | // HIBYTE contains the number of items in the submenu in this case |
1050 | 1050 | flagsOld &= 0xff; |
1051 | | id = (UINT)::GetSubMenu((HMENU)m_hMenu, mswpos); |
| 1051 | id = (intptr_t)::GetSubMenu((HMENU)m_hMenu, mswpos); |
1052 | 1052 | } |
1053 | 1053 | else |
1054 | 1054 | { |
… |
… |
|
1124 | 1124 | |
1125 | 1125 | if ( !::InsertMenu(GetHmenu(), (UINT)mswpos, |
1126 | 1126 | MF_BYPOSITION | MF_POPUP | MF_STRING, |
1127 | | (UINT)GetHmenuOf(menu), title) ) |
| 1127 | (intptr_t)GetHmenuOf(menu), title) ) |
1128 | 1128 | { |
1129 | 1129 | wxLogLastError(wxT("InsertMenu")); |
1130 | 1130 | } |
… |
… |
|
1191 | 1191 | #else |
1192 | 1192 | if ( !::InsertMenu(GetHmenu(), mswpos, |
1193 | 1193 | MF_BYPOSITION | MF_POPUP | MF_STRING, |
1194 | | (UINT)GetHmenuOf(menu), title) ) |
| 1194 | (intptr_t)GetHmenuOf(menu), title) ) |
1195 | 1195 | { |
1196 | 1196 | wxLogLastError(wxT("InsertMenu")); |
1197 | 1197 | } |
… |
… |
|
1250 | 1250 | } |
1251 | 1251 | #else |
1252 | 1252 | if ( !::AppendMenu(GetHmenu(), MF_POPUP | MF_STRING, |
1253 | | (UINT)submenu, title) ) |
| 1253 | (intptr_t)submenu, title) ) |
1254 | 1254 | { |
1255 | 1255 | wxLogLastError(wxT("AppendMenu")); |
1256 | 1256 | } |
-
diff --strip-trailing-cr -Nur wxWidgets-2.8.12/src/msw/menuitem.cpp wxWidgets-2.8.12.patched/src/msw/menuitem.cpp
old
|
new
|
|
186 | 186 | // ---- |
187 | 187 | |
188 | 188 | // return the id for calling Win32 API functions |
189 | | int wxMenuItem::GetRealId() const |
| 189 | WXWPARAM wxMenuItem::GetRealId() const |
190 | 190 | { |
191 | | return m_subMenu ? (int)m_subMenu->GetHMenu() : GetId(); |
| 191 | // we must use ids in unsigned short range with Windows functions, if we |
| 192 | // pass ids > USHRT_MAX to them they get very confused (e.g. start |
| 193 | // generating WM_COMMAND messages with negative high word of wParam), so |
| 194 | // use the cast to ensure the id is in range |
| 195 | return m_subMenu ? (intptr_t)m_subMenu->GetHMenu() |
| 196 | : static_cast<unsigned short>(GetId()); |
192 | 197 | } |
193 | 198 | |
194 | 199 | // get item state |
-
diff --strip-trailing-cr -Nur wxWidgets-2.8.12/src/msw/pen.cpp wxWidgets-2.8.12.patched/src/msw/pen.cpp
old
|
new
|
|
172 | 172 | case wxSTIPPLE: |
173 | 173 | logb.lbStyle = BS_PATTERN ; |
174 | 174 | if (M_PENDATA->m_stipple.Ok()) |
175 | | logb.lbHatch = (LONG)M_PENDATA->m_stipple.GetHBITMAP(); |
| 175 | logb.lbHatch = (intptr_t)M_PENDATA->m_stipple.GetHBITMAP(); |
176 | 176 | else |
177 | | logb.lbHatch = (LONG)0; |
| 177 | logb.lbHatch = (intptr_t)0; |
178 | 178 | break; |
179 | 179 | case wxBDIAGONAL_HATCH: |
180 | 180 | logb.lbStyle = BS_HATCHED; |
-
diff --strip-trailing-cr -Nur wxWidgets-2.8.12/src/msw/printdlg.cpp wxWidgets-2.8.12.patched/src/msw/printdlg.cpp
old
|
new
|
|
175 | 175 | |
176 | 176 | wxWindowsPrintNativeData::~wxWindowsPrintNativeData() |
177 | 177 | { |
178 | | HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode; |
| 178 | HGLOBAL hDevMode = (HGLOBAL) m_devMode; |
179 | 179 | if ( hDevMode ) |
180 | 180 | GlobalFree(hDevMode); |
181 | | HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames; |
| 181 | HGLOBAL hDevNames = (HGLOBAL) m_devNames; |
182 | 182 | if ( hDevNames ) |
183 | 183 | GlobalFree(hDevNames); |
184 | 184 | } |
… |
… |
|
190 | 190 | |
191 | 191 | bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data ) |
192 | 192 | { |
193 | | HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode; |
194 | | HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames; |
| 193 | HGLOBAL hDevMode = (HGLOBAL) m_devMode; |
| 194 | HGLOBAL hDevNames = (HGLOBAL) m_devNames; |
195 | 195 | |
196 | 196 | if (!hDevMode) |
197 | 197 | { |
… |
… |
|
396 | 396 | |
397 | 397 | bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data ) |
398 | 398 | { |
399 | | HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode; |
400 | | HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames; |
| 399 | HGLOBAL hDevMode = (HGLOBAL) m_devMode; |
| 400 | HGLOBAL hDevNames = (HGLOBAL) m_devNames; |
401 | 401 | WinPrinter printer; |
402 | 402 | LPTSTR szPrinterName = (LPTSTR)data.GetPrinterName().wx_str(); |
403 | 403 | |
… |
… |
|
493 | 493 | else |
494 | 494 | { |
495 | 495 | hDevMode = pd.hDevMode; |
496 | | m_devMode = (void*)(long) hDevMode; |
| 496 | m_devMode = (void*)(intptr_t) hDevMode; |
497 | 497 | pd.hDevMode = NULL; |
498 | 498 | |
499 | 499 | // We'll create a new DEVNAMEs structure below. |
… |
… |
|
502 | 502 | pd.hDevNames = NULL; |
503 | 503 | |
504 | 504 | // hDevNames = pd->hDevNames; |
505 | | // m_devNames = (void*)(long) hDevNames; |
| 505 | // m_devNames = (void*)(intptr_t) hDevNames; |
506 | 506 | // pd->hDevnames = NULL; |
507 | 507 | |
508 | 508 | } |
… |
… |
|
688 | 688 | } |
689 | 689 | |
690 | 690 | // TODO: I hope it's OK to pass some empty strings to DEVNAMES. |
691 | | m_devNames = (void*) (long) wxCreateDevNames(wxEmptyString, data.GetPrinterName(), wxEmptyString); |
| 691 | m_devNames = (void*) (intptr_t) wxCreateDevNames(wxEmptyString, data.GetPrinterName(), wxEmptyString); |
692 | 692 | |
693 | 693 | return true; |
694 | 694 | } |
… |
… |
|
820 | 820 | if (pd->hDevNames) |
821 | 821 | GlobalFree(pd->hDevNames); |
822 | 822 | |
823 | | pd->hDevMode = (HGLOBAL)(DWORD) native_data->GetDevMode(); |
| 823 | pd->hDevMode = (HGLOBAL) native_data->GetDevMode(); |
824 | 824 | native_data->SetDevMode( (void*) NULL); |
825 | 825 | |
826 | 826 | // Shouldn't assert; we should be able to test Ok-ness at a higher level |
827 | 827 | //wxASSERT_MSG( (pd->hDevMode), wxT("hDevMode must be non-NULL in ConvertToNative!")); |
828 | 828 | |
829 | | pd->hDevNames = (HGLOBAL)(DWORD) native_data->GetDevNames(); |
| 829 | pd->hDevNames = (HGLOBAL) native_data->GetDevNames(); |
830 | 830 | native_data->SetDevNames( (void*) NULL); |
831 | 831 | |
832 | 832 | |
… |
… |
|
897 | 897 | if (native_data->GetDevMode()) |
898 | 898 | { |
899 | 899 | // Make sure we don't leak memory |
900 | | GlobalFree( (HGLOBAL)(DWORD) native_data->GetDevMode() ); |
| 900 | GlobalFree( (HGLOBAL) native_data->GetDevMode() ); |
901 | 901 | } |
902 | | native_data->SetDevMode( (void*)(long) pd->hDevMode ); |
| 902 | native_data->SetDevMode( (void*)(intptr_t) pd->hDevMode ); |
903 | 903 | pd->hDevMode = NULL; |
904 | 904 | } |
905 | 905 | |
… |
… |
|
909 | 909 | if (native_data->GetDevNames()) |
910 | 910 | { |
911 | 911 | // Make sure we don't leak memory |
912 | | GlobalFree((HGLOBAL)(DWORD) native_data->GetDevNames()); |
| 912 | GlobalFree((HGLOBAL) native_data->GetDevNames()); |
913 | 913 | } |
914 | | native_data->SetDevNames((void*)(long) pd->hDevNames); |
| 914 | native_data->SetDevNames((void*)(intptr_t) pd->hDevNames); |
915 | 915 | pd->hDevNames = NULL; |
916 | 916 | } |
917 | 917 | |
-
diff --strip-trailing-cr -Nur wxWidgets-2.8.12/src/msw/tbar95.cpp wxWidgets-2.8.12.patched/src/msw/tbar95.cpp
old
|
new
|
|
802 | 802 | TBREPLACEBITMAP replaceBitmap; |
803 | 803 | replaceBitmap.hInstOld = NULL; |
804 | 804 | replaceBitmap.hInstNew = NULL; |
805 | | replaceBitmap.nIDOld = (UINT) oldToolBarBitmap; |
806 | | replaceBitmap.nIDNew = (UINT) hBitmap; |
| 805 | replaceBitmap.nIDOld = (intptr_t) oldToolBarBitmap; |
| 806 | replaceBitmap.nIDNew = (intptr_t) hBitmap; |
807 | 807 | replaceBitmap.nButtons = nButtons; |
808 | 808 | if ( !::SendMessage(GetHwnd(), TB_REPLACEBITMAP, |
809 | 809 | 0, (LPARAM) &replaceBitmap) ) |
… |
… |
|
832 | 832 | { |
833 | 833 | TBADDBITMAP addBitmap; |
834 | 834 | addBitmap.hInst = 0; |
835 | | addBitmap.nID = (UINT) hBitmap; |
| 835 | addBitmap.nID = (intptr_t) hBitmap; |
836 | 836 | if ( ::SendMessage(GetHwnd(), TB_ADDBITMAP, |
837 | 837 | (WPARAM) nButtons, (LPARAM)&addBitmap) == -1 ) |
838 | 838 | { |
… |
… |
|
912 | 912 | { |
913 | 913 | const wxString& label = tool->GetLabel(); |
914 | 914 | if ( !label.empty() ) |
915 | | button.iString = (int)label.c_str(); |
| 915 | button.iString = (intptr_t)label.c_str(); |
916 | 916 | } |
917 | 917 | |
918 | 918 | button.idCommand = tool->GetId(); |
-
diff --strip-trailing-cr -Nur wxWidgets-2.8.12/src/msw/textctrl.cpp wxWidgets-2.8.12.patched/src/msw/textctrl.cpp
old
|
new
|
|
960 | 960 | // finally, stream it in the control |
961 | 961 | EDITSTREAM eds; |
962 | 962 | wxZeroMemory(eds); |
963 | | eds.dwCookie = (DWORD)&wpc; |
| 963 | eds.dwCookie = (intptr_t)&wpc; |
964 | 964 | // the cast below is needed for broken (very) old mingw32 headers |
965 | 965 | eds.pfnCallback = (EDITSTREAMCALLBACK)wxRichEditStreamIn; |
966 | 966 | |
… |
… |
|
1013 | 1013 | |
1014 | 1014 | EDITSTREAM eds; |
1015 | 1015 | wxZeroMemory(eds); |
1016 | | eds.dwCookie = (DWORD)&data; |
| 1016 | eds.dwCookie = (intptr_t)&data; |
1017 | 1017 | eds.pfnCallback = wxRichEditStreamOut; |
1018 | 1018 | |
1019 | 1019 | ::SendMessage |
-
diff --strip-trailing-cr -Nur wxWidgets-2.8.12/src/msw/thread.cpp wxWidgets-2.8.12.patched/src/msw/thread.cpp
old
|
new
|
|
522 | 522 | return (THREAD_RETVAL)-1; |
523 | 523 | } |
524 | 524 | |
525 | | rc = (THREAD_RETVAL)thread->Entry(); |
| 525 | rc = (THREAD_RETVAL)(intptr_t)thread->Entry(); |
526 | 526 | } |
527 | 527 | wxCATCH_ALL( wxTheApp->OnUnhandledException(); ) |
528 | 528 | |
… |
… |
|
842 | 842 | break; |
843 | 843 | } |
844 | 844 | |
845 | | if ( (DWORD)rc != STILL_ACTIVE ) |
| 845 | if ( (intptr_t)rc != STILL_ACTIVE ) |
846 | 846 | break; |
847 | 847 | |
848 | 848 | // give the other thread some time to terminate, otherwise we may be |
… |
… |
|
1000 | 1000 | // could we set all bits? |
1001 | 1001 | if ( level != 0 ) |
1002 | 1002 | { |
1003 | | wxLogDebug(_T("bad level %u in wxThread::SetConcurrency()"), level); |
| 1003 | wxLogDebug(_T("bad level %Iu in wxThread::SetConcurrency()"), level); |
1004 | 1004 | |
1005 | 1005 | return false; |
1006 | 1006 | } |
… |
… |
|
1162 | 1162 | } |
1163 | 1163 | |
1164 | 1164 | #ifdef wxUSE_BEGIN_THREAD |
1165 | | _endthreadex((unsigned)status); |
| 1165 | _endthreadex((unsigned)(intptr_t)status); |
1166 | 1166 | #else // !VC++ |
1167 | 1167 | ::ExitThread((DWORD)status); |
1168 | 1168 | #endif // VC++/!VC++ |
-
diff --strip-trailing-cr -Nur wxWidgets-2.8.12/src/msw/tooltip.cpp wxWidgets-2.8.12.patched/src/msw/tooltip.cpp
old
|
new
|
|
106 | 106 | uFlags |= TTF_TRANSPARENT; |
107 | 107 | } |
108 | 108 | |
109 | | uId = (UINT)hwndOwner; |
| 109 | uId = (intptr_t)hwndOwner; |
110 | 110 | } |
111 | 111 | }; |
112 | 112 | |
-
diff --strip-trailing-cr -Nur wxWidgets-2.8.12/src/msw/toplevel.cpp wxWidgets-2.8.12.patched/src/msw/toplevel.cpp
old
|
new
|
|
1122 | 1122 | { |
1123 | 1123 | // restore focus to the child which was last focused unless we already |
1124 | 1124 | // have it |
1125 | | wxLogTrace(_T("focus"), _T("wxTLW %08x activated."), (int) m_hWnd); |
| 1125 | wxLogTrace(_T("focus"), _T("wxTLW %p activated."), (intptr_t) m_hWnd); |
1126 | 1126 | |
1127 | 1127 | wxWindow *winFocus = FindFocus(); |
1128 | 1128 | if ( !winFocus || wxGetTopLevelParent(winFocus) != this ) |
… |
… |
|
1157 | 1157 | } |
1158 | 1158 | |
1159 | 1159 | wxLogTrace(_T("focus"), |
1160 | | _T("wxTLW %08x deactivated, last focused: %08x."), |
1161 | | (int) m_hWnd, |
1162 | | (int) (m_winLastFocused ? GetHwndOf(m_winLastFocused) |
| 1160 | _T("wxTLW %p deactivated, last focused: %p."), |
| 1161 | (intptr_t) m_hWnd, |
| 1162 | (intptr_t) (m_winLastFocused ? GetHwndOf(m_winLastFocused) |
1163 | 1163 | : NULL)); |
1164 | 1164 | |
1165 | 1165 | event.Skip(); |
-
diff --strip-trailing-cr -Nur wxWidgets-2.8.12/src/msw/utils.cpp wxWidgets-2.8.12.patched/src/msw/utils.cpp
old
|
new
|
|
713 | 713 | return -1; |
714 | 714 | } |
715 | 715 | |
716 | | wxON_BLOCK_EXIT1(::CloseHandle, hProcess); |
| 716 | wxON_BLOCK_EXIT1((WINBOOL (*)(void *))::CloseHandle, hProcess); |
717 | 717 | |
718 | 718 | bool ok = true; |
719 | 719 | switch ( sig ) |
-
diff --strip-trailing-cr -Nur wxWidgets-2.8.12/src/msw/window.cpp wxWidgets-2.8.12.patched/src/msw/window.cpp
old
|
new
|
|
2596 | 2596 | // trace all messages - useful for the debugging |
2597 | 2597 | #ifdef __WXDEBUG__ |
2598 | 2598 | wxLogTrace(wxTraceMessages, |
2599 | | wxT("Processing %s(hWnd=%08lx, wParam=%8lx, lParam=%8lx)"), |
2600 | | wxGetMessageName(message), (long)hWnd, (long)wParam, lParam); |
| 2599 | wxT("Processing %s(hWnd=%Ix, wParam=%Ix, lParam=%Ix)"), |
| 2600 | wxGetMessageName(message), (intptr_t)hWnd, (intptr_t)wParam, (intptr_t)lParam); |
2601 | 2601 | #endif // __WXDEBUG__ |
2602 | 2602 | |
2603 | 2603 | wxWindowMSW *wnd = wxFindWinFromHandle((WXHWND) hWnd); |
… |
… |
|
3438 | 3438 | |
3439 | 3439 | wxWindow *wxFindWinFromHandle(WXHWND hWnd) |
3440 | 3440 | { |
3441 | | return (wxWindow*)wxWinHandleHash->Get((long)hWnd); |
| 3441 | return (wxWindow*)wxWinHandleHash->Get((intptr_t)hWnd); |
3442 | 3442 | } |
3443 | 3443 | |
3444 | 3444 | void wxAssociateWinWithHandle(HWND hWnd, wxWindowMSW *win) |
… |
… |
|
3452 | 3452 | #ifdef __WXDEBUG__ |
3453 | 3453 | if ( oldWin && (oldWin != win) ) |
3454 | 3454 | { |
3455 | | wxLogDebug(wxT("HWND %X already associated with another window (%s)"), |
3456 | | (int) hWnd, win->GetClassInfo()->GetClassName()); |
| 3455 | wxLogDebug(wxT("HWND %IX already associated with another window (%s)"), |
| 3456 | (intptr_t) hWnd, win->GetClassInfo()->GetClassName()); |
3457 | 3457 | } |
3458 | 3458 | else |
3459 | 3459 | #endif // __WXDEBUG__ |
3460 | 3460 | if (!oldWin) |
3461 | 3461 | { |
3462 | | wxWinHandleHash->Put((long)hWnd, (wxWindow *)win); |
| 3462 | wxWinHandleHash->Put((intptr_t)hWnd, (wxWindow *)win); |
3463 | 3463 | } |
3464 | 3464 | } |
3465 | 3465 | |
3466 | 3466 | void wxRemoveHandleAssociation(wxWindowMSW *win) |
3467 | 3467 | { |
3468 | | wxWinHandleHash->Delete((long)win->GetHWND()); |
| 3468 | wxWinHandleHash->Delete((intptr_t)win->GetHWND()); |
3469 | 3469 | } |
3470 | 3470 | |
3471 | 3471 | // ---------------------------------------------------------------------------- |