Merge pull request #291 from twoscomplement/surplus_inlines
Remove inline qualifiers inside .cpp
diff --git a/imgui.cpp b/imgui.cpp
index e8dd2cf..06b92e2 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -1527,7 +1527,7 @@
return id;
}
-inline ImGuiWindow* ImGui::GetCurrentWindow()
+ImGuiWindow* ImGui::GetCurrentWindow()
{
// If this ever crash it probably means that ImGui::NewFrame() has never been called (which is illegal). We should always have a CurrentWindow in the stack (there is an implicit "Debug" window)
ImGuiState& g = *GImGui;
@@ -4408,7 +4408,7 @@
return mx;
}
-inline ImVec2 ImGui::GetContentRegionAvail()
+ImVec2 ImGui::GetContentRegionAvail()
{
ImGuiWindow* window = GetCurrentWindow();
return GetContentRegionMax() - (window->DC.CursorPos - window->Pos);
@@ -4894,7 +4894,7 @@
return pressed;
}
-inline ImVec2 ImGui::CalcItemSize(ImVec2 size, float default_x, float default_y)
+ImVec2 ImGui::CalcItemSize(ImVec2 size, float default_x, float default_y)
{
ImGuiState& g = *GImGui;
ImVec2 content_max;
@@ -5611,7 +5611,7 @@
}
// Parse display precision back from the display format string
-inline int ImGui::ParseFormatPrecision(const char* fmt, int default_precision)
+int ImGui::ParseFormatPrecision(const char* fmt, int default_precision)
{
int precision = default_precision;
while ((fmt = strchr(fmt, '%')) != NULL)
@@ -5631,7 +5631,7 @@
return precision;
}
-inline float ImGui::RoundScalar(float value, int decimal_precision)
+float ImGui::RoundScalar(float value, int decimal_precision)
{
// Round past decimal precision
// So when our value is 1.99999 with a precision of 0.001 we'll end up rounding to 2.0
@@ -8265,7 +8265,7 @@
window->DC.CurrentLineHeight = window->DC.CurrentLineTextBaseOffset = 0.0f;
}
-inline void ImGui::ItemSize(const ImRect& bb, float text_offset_y)
+void ImGui::ItemSize(const ImRect& bb, float text_offset_y)
{
ItemSize(bb.GetSize(), text_offset_y);
}
