AxioDL
/
boo
mirror of https://github.com/AxioDL/boo.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #37 from lioncash/deprecated 

ApplicationWin32/WindowWin32: Get/SetWindowLong -> Get/SetWindowLongPtr
This commit is contained in:
Phillip Stephens 2019-09-06 23:24:07 -07:00 committed by GitHub
parent 85bdc694bf bfd042f156
commit 82f3dd2b58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/boo/graphicsdev/Vulkan.hpp
View File

@ -85,8 +85,8 @@ struct VulkanContext {
#if _WIN32 #if _WIN32
HWND m_hwnd = 0; HWND m_hwnd = 0;
bool m_fs = false; bool m_fs = false;
LONG m_fsStyle; LONG_PTR m_fsStyle;
LONG m_fsExStyle; LONG_PTR m_fsExStyle;
RECT m_fsRect; RECT m_fsRect;
int m_fsCountDown = 0; int m_fsCountDown = 0;
#endif #endif

11
lib/win/ApplicationWin32.cpp
View File

@ -339,9 +339,10 @@ public:
win.m_fsExStyle = GetWindowLong(win.m_hwnd, GWL_EXSTYLE); win.m_fsExStyle = GetWindowLong(win.m_hwnd, GWL_EXSTYLE);
GetWindowRect(win.m_hwnd, &win.m_fsRect); GetWindowRect(win.m_hwnd, &win.m_fsRect);
SetWindowLong(win.m_hwnd, GWL_STYLE, win.m_fsStyle & ~(WS_CAPTION | WS_THICKFRAME)); SetWindowLongPtr(win.m_hwnd, GWL_STYLE, win.m_fsStyle & ~(WS_CAPTION | WS_THICKFRAME));
SetWindowLong(win.m_hwnd, GWL_EXSTYLE, SetWindowLongPtr(win.m_hwnd, GWL_EXSTYLE,
win.m_fsExStyle & ~(WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE | WS_EX_STATICEDGE)); win.m_fsExStyle &
~(WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE | WS_EX_STATICEDGE));
MONITORINFO monitor_info; MONITORINFO monitor_info;
monitor_info.cbSize = sizeof(monitor_info); monitor_info.cbSize = sizeof(monitor_info);
@ -353,8 +354,8 @@ public:
win.m_fs = true; win.m_fs = true;
} else { } else {
SetWindowLong(win.m_hwnd, GWL_STYLE, win.m_fsStyle); SetWindowLongPtr(win.m_hwnd, GWL_STYLE, win.m_fsStyle);
SetWindowLong(win.m_hwnd, GWL_EXSTYLE, win.m_fsExStyle); SetWindowLongPtr(win.m_hwnd, GWL_EXSTYLE, win.m_fsExStyle);
SetWindowPos(win.m_hwnd, nullptr, win.m_fsRect.left, win.m_fsRect.top, win.m_fsRect.right - win.m_fsRect.left, SetWindowPos(win.m_hwnd, nullptr, win.m_fsRect.left, win.m_fsRect.top, win.m_fsRect.right - win.m_fsRect.left,
win.m_fsRect.bottom - win.m_fsRect.top, SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED); win.m_fsRect.bottom - win.m_fsRect.top, SWP_NOZORDER | SWP_NOACTIVATE | SWP_FRAMECHANGED);

4
lib/win/Win32Common.hpp
View File

@ -39,8 +39,8 @@ struct OGLContext {
size_t width, height; size_t width, height;
bool m_fs = false; bool m_fs = false;
LONG m_fsStyle; LONG_PTR m_fsStyle;
LONG m_fsExStyle; LONG_PTR m_fsExStyle;
RECT m_fsRect; RECT m_fsRect;
int m_fsCountDown = 0; int m_fsCountDown = 0;
}; };

32
lib/win/WindowWin32.cpp
View File

@ -1300,35 +1300,43 @@ public:
ETouchType getTouchType() const override { return ETouchType::None; } ETouchType getTouchType() const override { return ETouchType::None; }
void setStyle(EWindowStyle style) override { void setStyle(EWindowStyle style) override {
LONG sty = GetWindowLong(m_hwnd, GWL_STYLE); LONG_PTR sty = GetWindowLongPtr(m_hwnd, GWL_STYLE);
if ((style & EWindowStyle::Titlebar) != EWindowStyle::None) if ((style & EWindowStyle::Titlebar) != EWindowStyle::None) {
sty |= WS_CAPTION; sty |= WS_CAPTION;
else } else {
sty &= ~WS_CAPTION; sty &= ~WS_CAPTION;
}
if ((style & EWindowStyle::Resize) != EWindowStyle::None) if ((style & EWindowStyle::Resize) != EWindowStyle::None) {
sty |= WS_THICKFRAME; sty |= WS_THICKFRAME;
else } else {
sty &= ~WS_THICKFRAME; sty &= ~WS_THICKFRAME;
}
if ((style & EWindowStyle::Close) != EWindowStyle::None) if ((style & EWindowStyle::Close) != EWindowStyle::None) {
sty |= (WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX); sty |= (WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX);
else } else {
sty &= ~(WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX); sty &= ~(WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX);
}
SetWindowLong(m_hwnd, GWL_STYLE, sty); SetWindowLongPtr(m_hwnd, GWL_STYLE, sty);
} }
EWindowStyle getStyle() const override { EWindowStyle getStyle() const override {
LONG sty = GetWindowLong(m_hwnd, GWL_STYLE); const LONG_PTR sty = GetWindowLongPtr(m_hwnd, GWL_STYLE);
EWindowStyle retval = EWindowStyle::None; EWindowStyle retval = EWindowStyle::None;
if ((sty & WS_CAPTION) != 0) if ((sty & WS_CAPTION) != 0) {
retval |= EWindowStyle::Titlebar; retval |= EWindowStyle::Titlebar;
if ((sty & WS_THICKFRAME) != 0) }
if ((sty & WS_THICKFRAME) != 0) {
retval |= EWindowStyle::Resize; retval |= EWindowStyle::Resize;
if ((sty & WS_SYSMENU)) }
if ((sty & WS_SYSMENU)) {
retval |= EWindowStyle::Close; retval |= EWindowStyle::Close;
}
return retval; return retval;
} }