Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-22 03:47:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed warnings for GCC -Wpedantic

Browse Source
This commit is contained in:
ocornut 2014-10-26 15:08:28 +00:00
parent 1037bacc4b
commit e6eafd6fa8
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
imconfig.h
View File

@ -39,6 +39,6 @@ namespace ImGui
{ {
void Value(const char* prefix, const MyVec2& v, const char* float_format = NULL); void Value(const char* prefix, const MyVec2& v, const char* float_format = NULL);
void Value(const char* prefix, const MyVec4& v, const char* float_format = NULL); void Value(const char* prefix, const MyVec4& v, const char* float_format = NULL);
}; }
*/ */

10
imgui.cpp
View File

@ -243,7 +243,7 @@ static void FocusWindow(ImGuiWindow* window);
static ImGuiWindow* FindWindow(const char* name); static ImGuiWindow* FindWindow(const char* name);
static ImGuiWindow* FindHoveredWindow(ImVec2 pos, bool excluding_childs); static ImGuiWindow* FindHoveredWindow(ImVec2 pos, bool excluding_childs);
}; // namespace ImGui } // namespace ImGui
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Platform dependant default implementations // Platform dependant default implementations
@ -3842,7 +3842,7 @@ bool RadioButton(const char* label, int* v, int v_button)
return pressed; return pressed;
} }
}; // namespace ImGui } // namespace ImGui
// Wrapper for stb_textedit.h to edit text (our wrapper is for: statically sized buffer, single-line, ASCII, fixed-width font) // Wrapper for stb_textedit.h to edit text (our wrapper is for: statically sized buffer, single-line, ASCII, fixed-width font)
int STB_TEXTEDIT_STRINGLEN(const STB_TEXTEDIT_STRING* obj) { return (int)ImStrlenW(obj->Text); } int STB_TEXTEDIT_STRINGLEN(const STB_TEXTEDIT_STRING* obj) { return (int)ImStrlenW(obj->Text); }
@ -5028,7 +5028,7 @@ void Color(const char* prefix, unsigned int v)
ImGui::ColorButton(col, true); ImGui::ColorButton(col, true);
} }
}; // namespace ImGui } // namespace ImGui
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// ImDrawList // ImDrawList
@ -6464,7 +6464,7 @@ void ShowTestWindow(bool* open)
} }
// End of Sample code // End of Sample code
}; // namespace ImGui } // namespace ImGui
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Font data // Font data
@ -6673,7 +6673,7 @@ void GetDefaultFontData(const void** fnt_data, unsigned int* fnt_size, const voi
if (png_size) *png_size = proggy_clean_13_png_size; if (png_size) *png_size = proggy_clean_13_png_size;
} }
}; } // namespace ImGui
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

4
imgui.h
View File

@ -63,7 +63,7 @@ namespace ImGui
void* MemAlloc(size_t sz); void* MemAlloc(size_t sz);
void MemFree(void* ptr); void MemFree(void* ptr);
void* MemRealloc(void* ptr, size_t sz); void* MemRealloc(void* ptr, size_t sz);
}; }
// std::vector<> like class to avoid dragging dependencies (also: windows implementation of STL with debug enabled is absurdly slow, so let's bypass it so our code runs fast in debug). // std::vector<> like class to avoid dragging dependencies (also: windows implementation of STL with debug enabled is absurdly slow, so let's bypass it so our code runs fast in debug).
// Use '#define ImVector std::vector' if you want to use the STL type or your own type. // Use '#define ImVector std::vector' if you want to use the STL type or your own type.
@ -279,7 +279,7 @@ namespace ImGui
void GetDefaultFontData(const void** fnt_data, unsigned int* fnt_size, const void** png_data, unsigned int* png_size); void GetDefaultFontData(const void** fnt_data, unsigned int* fnt_size, const void** png_data, unsigned int* png_size);
ImVec2 CalcTextSize(const char* text, const char* text_end = NULL, const bool hide_text_after_hash = true); ImVec2 CalcTextSize(const char* text, const char* text_end = NULL, const bool hide_text_after_hash = true);
}; // namespace ImGui } // namespace ImGui
// Flags for ImGui::Begin() // Flags for ImGui::Begin()
enum ImGuiWindowFlags_ enum ImGuiWindowFlags_