Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-12-20 23:06:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some compile warnings with Clang on Windows (#3754)

Browse Source
This commit is contained in:
Sammy Fatnassi 2021-01-26 14:09:18 +01:00 committed by ocornut
parent bb26751b94
commit 376c88a864
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backends/imgui_impl_win32.cpp
View File

@ -272,7 +272,7 @@ static void ImGui_ImplWin32_UpdateGamepads()
static BOOL CALLBACK ImGui_ImplWin32_UpdateMonitors_EnumFunc(HMONITOR monitor, HDC, LPRECT, LPARAM) static BOOL CALLBACK ImGui_ImplWin32_UpdateMonitors_EnumFunc(HMONITOR monitor, HDC, LPRECT, LPARAM)
{ {
MONITORINFO info = { 0 }; MONITORINFO info = {};
info.cbSize = sizeof(MONITORINFO); info.cbSize = sizeof(MONITORINFO);
if (!::GetMonitorInfo(monitor, &info)) if (!::GetMonitorInfo(monitor, &info))
return TRUE; return TRUE;

4
imgui.cpp
View File

@ -7696,6 +7696,7 @@ static void ImGui::ErrorCheckNewFrameSanityChecks()
for (int monitor_n = 0; monitor_n < g.PlatformIO.Monitors.Size; monitor_n++) for (int monitor_n = 0; monitor_n < g.PlatformIO.Monitors.Size; monitor_n++)
{ {
ImGuiPlatformMonitor& mon = g.PlatformIO.Monitors[monitor_n]; ImGuiPlatformMonitor& mon = g.PlatformIO.Monitors[monitor_n];
IM_UNUSED(mon);
IM_ASSERT(mon.MainSize.x > 0.0f && mon.MainSize.y > 0.0f && "Monitor main bounds not setup properly."); IM_ASSERT(mon.MainSize.x > 0.0f && mon.MainSize.y > 0.0f && "Monitor main bounds not setup properly.");
IM_ASSERT(ImRect(mon.MainPos, mon.MainPos + mon.MainSize).Contains(ImRect(mon.WorkPos, mon.WorkPos + mon.WorkSize)) && "Monitor work bounds not setup properly. If you don't have work area information, just copy MainPos/MainSize into them."); IM_ASSERT(ImRect(mon.MainPos, mon.MainPos + mon.MainSize).Contains(ImRect(mon.WorkPos, mon.WorkPos + mon.WorkSize)) && "Monitor work bounds not setup properly. If you don't have work area information, just copy MainPos/MainSize into them.");
IM_ASSERT(mon.DpiScale != 0.0f); IM_ASSERT(mon.DpiScale != 0.0f);
@ -13484,7 +13485,8 @@ bool ImGui::DockNodeBeginAmendTabBar(ImGuiDockNode* node)
Begin(node->HostWindow->Name); Begin(node->HostWindow->Name);
PushOverrideID(node->ID); PushOverrideID(node->ID);
bool ret = BeginTabBarEx(node->TabBar, node->TabBar->BarRect, node->TabBar->Flags, node); bool ret = BeginTabBarEx(node->TabBar, node->TabBar->BarRect, node->TabBar->Flags, node);
IM_ASSERT(ret); IM_UNUSED(ret);
IM_ASSERT(ret);
return true; return true;
} }

1
imgui_widgets.cpp
View File

@ -7305,6 +7305,7 @@ static ImU32 ImGui::TabBarCalcTabID(ImGuiTabBar* tab_bar, const char* label, I
{ {
if (docked_window != NULL) if (docked_window != NULL)
{ {
IM_UNUSED(tab_bar);
IM_ASSERT(tab_bar->Flags & ImGuiTabBarFlags_DockNode); IM_ASSERT(tab_bar->Flags & ImGuiTabBarFlags_DockNode);
ImGuiID id = ImHashStr(label); ImGuiID id = ImHashStr(label);
KeepAliveID(id); KeepAliveID(id);