mirror of
				https://github.com/ocornut/imgui.git
				synced 2025-10-26 12:27:30 +00:00 
			
		
		
		
	Merge branch 'context'
# Conflicts: # examples/allegro5_example/main.cpp # examples/directx10_example/main.cpp # examples/directx11_example/main.cpp # examples/directx9_example/main.cpp # examples/marmalade_example/main.cpp # examples/opengl2_example/main.cpp # examples/opengl3_example/main.cpp # examples/sdl_opengl2_example/main.cpp # examples/sdl_opengl3_example/main.cpp # examples/vulkan_example/main.cpp
This commit is contained in:
		| @@ -120,6 +120,7 @@ int main(int, char**) | ||||
|     UpdateWindow(hwnd); | ||||
|  | ||||
|     // Setup ImGui binding | ||||
|     ImGui::CreateContext(); | ||||
|     ImGuiIO& io = ImGui::GetIO(); (void)io; | ||||
|     ImGui_ImplDX10_Init(hwnd, g_pd3dDevice); | ||||
|     //io.NavFlags |= ImGuiNavFlags_EnableKeyboard;  // Enable Keyboard Controls | ||||
| @@ -211,6 +212,8 @@ int main(int, char**) | ||||
|     } | ||||
|  | ||||
|     ImGui_ImplDX10_Shutdown(); | ||||
|     ImGui::DestroyContext(); | ||||
|  | ||||
|     CleanupDeviceD3D(); | ||||
|     UnregisterClass(_T("ImGui Example"), wc.hInstance); | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 omar
					omar