diff options
Diffstat (limited to 'src/osd/modules/debugger/win/debugwininfo.cpp')
-rw-r--r-- | src/osd/modules/debugger/win/debugwininfo.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/osd/modules/debugger/win/debugwininfo.cpp b/src/osd/modules/debugger/win/debugwininfo.cpp index 1e75b464b72..d46b5a1d79c 100644 --- a/src/osd/modules/debugger/win/debugwininfo.cpp +++ b/src/osd/modules/debugger/win/debugwininfo.cpp @@ -23,8 +23,8 @@ bool debugwin_info::s_window_class_registered = false; debugwin_info::debugwin_info(debugger_windows_interface &debugger, bool is_main_console, LPCSTR title, WNDPROC handler) : debugbase_info(debugger), m_is_main_console(is_main_console), - m_next(NULL), - m_wnd(NULL), + m_next(nullptr), + m_wnd(nullptr), m_handler(handler), m_minwidth(200), m_maxwidth(0), @@ -36,7 +36,7 @@ debugwin_info::debugwin_info(debugger_windows_interface &debugger, bool is_main_ m_wnd = win_create_window_ex_utf8(DEBUG_WINDOW_STYLE_EX, "MAMEDebugWindow", title, DEBUG_WINDOW_STYLE, 0, 0, 100, 100, win_window_list.front()->platform_window<HWND>(), create_standard_menubar(), GetModuleHandleUni(), this); - if (m_wnd == NULL) + if (m_wnd == nullptr) return; RECT work_bounds; @@ -70,7 +70,7 @@ void debugwin_info::prev_view(debugview_info *curview) int numviews; for (numviews = 0; numviews < MAX_VIEWS; numviews++) { - if (m_views[numviews] == NULL) + if (m_views[numviews] == nullptr) break; } @@ -100,7 +100,7 @@ void debugwin_info::prev_view(debugview_info *curview) // negative numbers mean the focuswnd break; } - else if (curindex >= 0 && m_views[curindex] != NULL && m_views[curindex]->cursor_supported()) + else if (curindex >= 0 && m_views[curindex] != nullptr && m_views[curindex]->cursor_supported()) { // positive numbers mean a view m_views[curindex]->set_focus(); @@ -116,7 +116,7 @@ void debugwin_info::next_view(debugview_info *curview) int numviews; for (numviews = 0; numviews < MAX_VIEWS; numviews++) { - if (m_views[numviews] == NULL) + if (m_views[numviews] == nullptr) break; } @@ -144,7 +144,7 @@ void debugwin_info::next_view(debugview_info *curview) // negative numbers mean the focuswnd break; } - else if (curindex >= 0 && m_views[curindex] != NULL && m_views[curindex]->cursor_supported()) + else if (curindex >= 0 && m_views[curindex] != nullptr && m_views[curindex]->cursor_supported()) { // positive numbers mean a view m_views[curindex]->set_focus(); @@ -248,7 +248,7 @@ bool debugwin_info::handle_key(WPARAM wparam, LPARAM lparam) void debugwin_info::recompute_children() { - if (m_views[0] != NULL) + if (m_views[0] != nullptr) { // compute a client rect RECT bounds; @@ -352,7 +352,7 @@ void debugwin_info::draw_contents(HDC dc) // draw edges around all views for (int curview = 0; curview < MAX_VIEWS; curview++) { - if (m_views[curview] != NULL) + if (m_views[curview] != nullptr) { RECT bounds; m_views[curview]->get_bounds(bounds); @@ -430,7 +430,7 @@ LRESULT debugwin_info::window_proc(UINT message, WPARAM wparam, LPARAM lparam) case WM_SIZE: case WM_SIZING: recompute_children(); - InvalidateRect(m_wnd, NULL, FALSE); + InvalidateRect(m_wnd, nullptr, FALSE); break; // mouse wheel: forward to the first view @@ -458,7 +458,7 @@ LRESULT debugwin_info::window_proc(UINT message, WPARAM wparam, LPARAM lparam) { for (viewnum = 0; viewnum < MAX_VIEWS; viewnum++) { - if ((m_views[viewnum] != NULL) && m_views[viewnum]->owns_window(child)) + if ((m_views[viewnum] != nullptr) && m_views[viewnum]->owns_window(child)) break; } if (viewnum == MAX_VIEWS) @@ -466,7 +466,7 @@ LRESULT debugwin_info::window_proc(UINT message, WPARAM wparam, LPARAM lparam) } // send the appropriate message to this view's scrollbar - if (m_views[viewnum] != NULL) + if (m_views[viewnum] != nullptr) m_views[viewnum]->send_vscroll(delta); break; @@ -498,7 +498,7 @@ LRESULT debugwin_info::window_proc(UINT message, WPARAM wparam, LPARAM lparam) // destroy: close down the window case WM_NCDESTROY: - m_wnd = NULL; + m_wnd = nullptr; debugger().remove_window(*this); break; @@ -515,8 +515,8 @@ HMENU debugwin_info::create_standard_menubar() { // create the debug menu HMENU const debugmenu = CreatePopupMenu(); - if (debugmenu == NULL) - return NULL; + if (debugmenu == nullptr) + return nullptr; AppendMenu(debugmenu, MF_ENABLED, ID_NEW_MEMORY_WND, TEXT("New Memory Window\tCtrl+M")); AppendMenu(debugmenu, MF_ENABLED, ID_NEW_DISASM_WND, TEXT("New Disassembly Window\tCtrl+D")); AppendMenu(debugmenu, MF_ENABLED, ID_NEW_LOG_WND, TEXT("New Error Log Window\tCtrl+L")); @@ -538,10 +538,10 @@ HMENU debugwin_info::create_standard_menubar() // create the menu bar HMENU const menubar = CreateMenu(); - if (menubar == NULL) + if (menubar == nullptr) { DestroyMenu(debugmenu); - return NULL; + return nullptr; } AppendMenu(menubar, MF_ENABLED | MF_POPUP, (UINT_PTR)debugmenu, TEXT("Debug")); @@ -563,10 +563,10 @@ LRESULT CALLBACK debugwin_info::static_window_proc(HWND wnd, UINT message, WPARA } debugwin_info *const info = (debugwin_info *)(FPTR)GetWindowLongPtr(wnd, GWLP_USERDATA); - if (info == NULL) + if (info == nullptr) return DefWindowProc(wnd, message, wparam, lparam); - assert((info->m_wnd == wnd) || (info->m_wnd == NULL)); + assert((info->m_wnd == wnd) || (info->m_wnd == nullptr)); return info->window_proc(message, wparam, lparam); } @@ -581,10 +581,10 @@ void debugwin_info::register_window_class() wc.lpszClassName = TEXT("MAMEDebugWindow"); wc.hInstance = GetModuleHandleUni(); wc.lpfnWndProc = &debugwin_info::static_window_proc; - wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hCursor = LoadCursor(nullptr, IDC_ARROW); wc.hIcon = LoadIcon(wc.hInstance, MAKEINTRESOURCE(2)); - wc.lpszMenuName = NULL; - wc.hbrBackground = NULL; + wc.lpszMenuName = nullptr; + wc.hbrBackground = nullptr; wc.style = 0; wc.cbClsExtra = 0; wc.cbWndExtra = 0; |