Merge branch 'master' into docking

# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.h
This commit is contained in:
ocornut
2020-08-18 17:51:43 +02:00
13 changed files with 131 additions and 146 deletions

View File

@ -26,6 +26,7 @@ int main(int, char**)
ImGui_ImplWin32_EnableDpiAwareness();
// Create application window
//ImGui_ImplWin32_EnableDpiAwareness();
WNDCLASSEX wc = { sizeof(WNDCLASSEX), CS_CLASSDC, WndProc, 0L, 0L, GetModuleHandle(NULL), NULL, NULL, NULL, NULL, _T("ImGui Example"), NULL };
::RegisterClassEx(&wc);
HWND hwnd = ::CreateWindow(wc.lpszClassName, _T("Dear ImGui DirectX9 Example"), WS_OVERLAPPEDWINDOW, 100, 100, 1280, 800, NULL, NULL, wc.hInstance, NULL);