Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-07 05:28:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into viewport

Browse Source 
# Conflicts:
#	examples/imgui_impl_win32.cpp
This commit is contained in:
omar
2019-01-18 12:31:33 +01:00
parent acdb4823dd 92d29531fa
commit 82e31d34f0
9 changed files with 48 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/example_win32_directx12/main.cpp
View File

@ -272,13 +272,13 @@ int main(int, char**)
// Create application window
WNDCLASSEX wc = { sizeof(WNDCLASSEX), CS_CLASSDC, WndProc, 0L, 0L, GetModuleHandle(NULL), NULL, NULL, NULL, NULL, _T("ImGui Example"), NULL };
RegisterClassEx(&wc);
HWND hwnd = CreateWindow(_T("ImGui Example"), _T("Dear ImGui DirectX12 Example"), WS_OVERLAPPEDWINDOW, 100, 100, 1280, 800, NULL, NULL, wc.hInstance, NULL);
HWND hwnd = CreateWindow(wc.lpszClassName, _T("Dear ImGui DirectX12 Example"), WS_OVERLAPPEDWINDOW, 100, 100, 1280, 800, NULL, NULL, wc.hInstance, NULL);
// Initialize Direct3D
if (CreateDeviceD3D(hwnd) < 0)
{
CleanupDeviceD3D();
UnregisterClass(_T("ImGui Example"), wc.hInstance);
UnregisterClass(wc.lpszClassName, wc.hInstance);
return 1;
}
@ -442,7 +442,7 @@ int main(int, char**)
CleanupDeviceD3D();
DestroyWindow(hwnd);
UnregisterClass(_T("ImGui Example"), wc.hInstance);
UnregisterClass(wc.lpszClassName, wc.hInstance);
return 0;
}