From 47b33846475d05e8f8828674ba40d5afc92647b0 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 14 Feb 2021 10:23:18 -0800 Subject: [PATCH] Windows: Fix some const type conversion warnings. --- Windows/Debugger/Debugger_VFPUDlg.cpp | 12 ++++++------ Windows/GEDebugger/CtrlDisplayListView.cpp | 6 +++--- Windows/GEDebugger/CtrlDisplayListView.h | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Windows/Debugger/Debugger_VFPUDlg.cpp b/Windows/Debugger/Debugger_VFPUDlg.cpp index 8851afd62e..5075e61731 100644 --- a/Windows/Debugger/Debugger_VFPUDlg.cpp +++ b/Windows/Debugger/Debugger_VFPUDlg.cpp @@ -32,23 +32,23 @@ CVFPUDlg::CVFPUDlg(HINSTANCE _hInstance, HWND _hParent, DebugInterface *cpu_) : ZeroMemory (&tcItem,sizeof (tcItem)); tcItem.mask = TCIF_TEXT; tcItem.dwState = 0; - tcItem.pszText = L"Float"; + tcItem.pszText = (LPTSTR)L"Float"; tcItem.cchTextMax = (int)wcslen(tcItem.pszText)+1; tcItem.iImage = 0; TabCtrl_InsertItem(tabs, TabCtrl_GetItemCount(tabs),&tcItem); - tcItem.pszText = L"HalfFloat"; + tcItem.pszText = (LPTSTR)L"HalfFloat"; tcItem.cchTextMax = (int)wcslen(tcItem.pszText)+1; TabCtrl_InsertItem(tabs, TabCtrl_GetItemCount(tabs),&tcItem); - tcItem.pszText = L"Hex"; + tcItem.pszText = (LPTSTR)L"Hex"; tcItem.cchTextMax = (int)wcslen(tcItem.pszText)+1; TabCtrl_InsertItem(tabs, TabCtrl_GetItemCount(tabs),&tcItem); - tcItem.pszText = L"Bytes"; + tcItem.pszText = (LPTSTR)L"Bytes"; tcItem.cchTextMax = (int)wcslen(tcItem.pszText)+1; TabCtrl_InsertItem(tabs, TabCtrl_GetItemCount(tabs),&tcItem); - tcItem.pszText = L"Shorts"; + tcItem.pszText = (LPTSTR)L"Shorts"; tcItem.cchTextMax = (int)wcslen(tcItem.pszText)+1; TabCtrl_InsertItem(tabs, TabCtrl_GetItemCount(tabs),&tcItem); - tcItem.pszText = L"Ints"; + tcItem.pszText = (LPTSTR)L"Ints"; tcItem.cchTextMax = (int)wcslen(tcItem.pszText)+1; TabCtrl_InsertItem(tabs, TabCtrl_GetItemCount(tabs),&tcItem); mode=0; diff --git a/Windows/GEDebugger/CtrlDisplayListView.cpp b/Windows/GEDebugger/CtrlDisplayListView.cpp index 16f0769d3c..83b7f7bfb7 100644 --- a/Windows/GEDebugger/CtrlDisplayListView.cpp +++ b/Windows/GEDebugger/CtrlDisplayListView.cpp @@ -1,3 +1,5 @@ +#include +#include #include "Common/System/Display.h" #include "Windows/GEDebugger/CtrlDisplayListView.h" #include "Windows/GEDebugger/GEDebugger.h" @@ -7,9 +9,7 @@ #include "GPU/Debugger/Breakpoints.h" #include "GPU/GPUState.h" -#include - -const PTCHAR CtrlDisplayListView::windowClass = _T("CtrlDisplayListView"); +LPCTSTR CtrlDisplayListView::windowClass = _T("CtrlDisplayListView"); const int POPUP_SUBMENU_ID_DISPLAYLISTVIEW = 8; extern HMENU g_hPopupMenus; diff --git a/Windows/GEDebugger/CtrlDisplayListView.h b/Windows/GEDebugger/CtrlDisplayListView.h index 319d54ec20..fe605f799e 100644 --- a/Windows/GEDebugger/CtrlDisplayListView.h +++ b/Windows/GEDebugger/CtrlDisplayListView.h @@ -1,14 +1,14 @@ #pragma once +#include #include "Common/CommonWindows.h" #include "GPU/Common/GPUDebugInterface.h" -#include class CtrlDisplayListView { HWND wnd; RECT rect; - static const PTCHAR windowClass; + static LPCTSTR windowClass; DisplayList list; HFONT font; @@ -85,4 +85,4 @@ public: void scrollAddressIntoView(); bool curAddressIsVisible(); -}; \ No newline at end of file +};