gwm17/glfw
1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-30 05:58:52 -05:00
Code Issues Projects Releases Wiki Activity

Removed unused code and duplicate variables.

Browse Source
This commit is contained in:
Camilla Berglund 2013-01-04 06:42:37 +01:00
parent 0d7c2f73fc
commit 2757b0fa6f
1 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/win32_window.c
View File

@ -715,47 +715,29 @@ static int createWindow(_GLFWwindow* window,
const _GLFWwndconfig* wndconfig, const _GLFWwndconfig* wndconfig,
const _GLFWfbconfig* fbconfig) const _GLFWfbconfig* fbconfig)
{ {
DWORD dwStyle, dwExStyle;
int positionX, positionY, fullWidth, fullHeight; int positionX, positionY, fullWidth, fullHeight;
POINT pos; POINT pos;
WCHAR* wideTitle; WCHAR* wideTitle;
// Set common window styles // Set window styles common to all window modes
dwStyle = WS_CLIPSIBLINGS | WS_CLIPCHILDREN; window->win32.dwStyle = WS_CLIPSIBLINGS | WS_CLIPCHILDREN;
dwExStyle = WS_EX_APPWINDOW; window->win32.dwExStyle = WS_EX_APPWINDOW;
// Set window style, depending on fullscreen mode // Add mode-dependent window styles
if (window->monitor) if (window->monitor)
{ window->win32.dwStyle |= WS_POPUP;
dwStyle |= WS_POPUP;
// Here's a trick for helping us getting window focus
// (SetForegroundWindow doesn't work properly under
// Win98/ME/2K/.NET/+)
/*
if (_glfw.Sys.WinVer != _GLFW_WIN_95 &&
_glfw.Sys.WinVer != _GLFW_WIN_NT4 &&
_glfw.Sys.WinVer != _GLFW_WIN_XP)
{
dwStyle |= WS_MINIMIZE;
}
*/
}
else else
{ {
dwStyle |= WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX; window->win32.dwStyle |= WS_OVERLAPPED | WS_CAPTION |
WS_SYSMENU | WS_MINIMIZEBOX;
if (wndconfig->resizable) if (wndconfig->resizable)
{ {
dwStyle |= (WS_MAXIMIZEBOX | WS_SIZEBOX); window->win32.dwStyle |= WS_MAXIMIZEBOX | WS_SIZEBOX;
dwExStyle |= WS_EX_WINDOWEDGE; window->win32.dwExStyle |= WS_EX_WINDOWEDGE;
} }
} }
// Remember window styles (used by getFullWindowSize)
window->win32.dwStyle = dwStyle;
window->win32.dwExStyle = dwExStyle;
// Adjust window size for frame and title bar // Adjust window size for frame and title bar
getFullWindowSize(window, window->width, window->height, &fullWidth, &fullHeight); getFullWindowSize(window, window->width, window->height, &fullWidth, &fullHeight);