From 855ab7c0405fd6c68104887fd211f798c4fc8f8c Mon Sep 17 00:00:00 2001 From: Ben Vanik Date: Mon, 7 Sep 2015 09:08:19 -0700 Subject: [PATCH] Fixing set_bordered name. --- src/xenia/ui/window.h | 2 +- src/xenia/ui/window_win.cc | 2 +- src/xenia/ui/window_win.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/xenia/ui/window.h b/src/xenia/ui/window.h index 85215a7ab..ac0327b27 100644 --- a/src/xenia/ui/window.h +++ b/src/xenia/ui/window.h @@ -54,7 +54,7 @@ class Window { virtual void ToggleFullscreen(bool fullscreen) {} virtual bool is_bordered() const { return false; } - virtual void SetBordered(bool enabled) {} + virtual void set_bordered(bool enabled) {} bool has_focus() const { return has_focus_; } virtual void set_focus(bool value) { has_focus_ = value; } diff --git a/src/xenia/ui/window_win.cc b/src/xenia/ui/window_win.cc index e2b432aff..29b7b2640 100644 --- a/src/xenia/ui/window_win.cc +++ b/src/xenia/ui/window_win.cc @@ -196,7 +196,7 @@ bool Win32Window::is_bordered() const { return (style & WS_OVERLAPPEDWINDOW) == WS_OVERLAPPEDWINDOW; } -void Win32Window::SetBordered(bool enabled) { +void Win32Window::set_bordered(bool enabled) { if (is_fullscreen()) { // Don't screw with the borders if we're fullscreen. return; diff --git a/src/xenia/ui/window_win.h b/src/xenia/ui/window_win.h index ec2a8a976..791545f37 100644 --- a/src/xenia/ui/window_win.h +++ b/src/xenia/ui/window_win.h @@ -35,7 +35,7 @@ class Win32Window : public Window { void ToggleFullscreen(bool fullscreen) override; bool is_bordered() const override; - void SetBordered(bool enabled) override; + void set_bordered(bool enabled) override; void set_cursor_visible(bool value) override; void set_focus(bool value) override; @@ -70,7 +70,7 @@ class Win32Window : public Window { bool closing_ = false; bool fullscreen_ = false; - WINDOWPLACEMENT windowed_pos_; + WINDOWPLACEMENT windowed_pos_ = {0}; }; class Win32MenuItem : public MenuItem {