Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions include/TGUI/AbsoluteOrRelativeValue.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -191,10 +191,6 @@ namespace tgui
}
} // namespace percent
} // namespace literals

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_ABSOLUTE_OR_RELATIVE_VALUE_HPP
2 changes: 0 additions & 2 deletions include/TGUI/AllWidgets.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,4 @@
#include <TGUI/Widgets/VerticalLayout.hpp>
#include <TGUI/Widgets/VerticalTabs.hpp>

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_ALL_WIDGETS_HPP
3 changes: 0 additions & 3 deletions include/TGUI/Animation.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,7 @@ namespace tgui
float m_endOpacity;
};

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
} // namespace priv
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_ANIMATION_HPP
2 changes: 0 additions & 2 deletions include/TGUI/Backend/Font/BackendFont.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,4 @@ namespace tgui
};
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_BACKEND_FONT_HPP
2 changes: 0 additions & 2 deletions include/TGUI/Backend/Font/BackendFontFactory.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,4 @@ namespace tgui
};
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_FONT_FACTORY_HPP
4 changes: 0 additions & 4 deletions include/TGUI/Backend/Font/FreeType/BackendFontFreeType.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -276,11 +276,7 @@ namespace tgui
unsigned int m_textureVersion = 0;
};

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

using BackendFontFreetype TGUI_DEPRECATED("Use BackendFontFreeType instead (capital T)") = BackendFontFreeType;
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_BACKEND_FONT_FREETYPE_HPP
3 changes: 0 additions & 3 deletions include/TGUI/Backend/Font/Raylib/BackendFontRaylib.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,6 @@ namespace tgui
std::unordered_map<unsigned int, int> m_correctedTextSizes; // text size (ascent) -> raylib text size (ascent + descent)
};

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_BACKEND_FONT_RAYLIB_HPP
2 changes: 0 additions & 2 deletions include/TGUI/Backend/Font/SDL_ttf/BackendFontSDLttf.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,4 @@ namespace tgui
};
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_BACKEND_FONT_SDL_TTF_HPP
2 changes: 0 additions & 2 deletions include/TGUI/Backend/Font/SFML-Graphics/BackendFontSFML.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,4 @@ namespace tgui
};
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_BACKEND_FONT_SFML_HPP
3 changes: 0 additions & 3 deletions include/TGUI/Backend/Renderer/BackendRenderTarget.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -279,9 +279,6 @@ namespace tgui
Vector2f m_pixelsPerPoint = {1, 1};
};

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_BACKEND_RENDER_TARGET_HPP
2 changes: 0 additions & 2 deletions include/TGUI/Backend/Renderer/BackendRenderer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,4 @@ namespace tgui
};
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_BACKEND_RENDERER_HPP
2 changes: 0 additions & 2 deletions include/TGUI/Backend/Renderer/BackendText.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,4 @@ namespace tgui
};
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_BACKEND_TEXT_HPP
2 changes: 0 additions & 2 deletions include/TGUI/Backend/Renderer/BackendTexture.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,4 @@ namespace tgui
};
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_BACKEND_TEXTURE_HPP
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,6 @@ namespace tgui
unsigned int m_texCoordShaderLocation = 2;
};

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_BACKEND_RENDER_TARGET_GLES2_HPP
2 changes: 0 additions & 2 deletions include/TGUI/Backend/Renderer/GLES2/BackendRendererGLES2.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,4 @@ namespace tgui
};
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_BACKEND_RENDERER_GLES2_HPP
4 changes: 0 additions & 4 deletions include/TGUI/Backend/Renderer/GLES2/BackendTextureGLES2.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,9 @@ namespace tgui
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
TGUI_NODISCARD unsigned int getInternalTexture() const;

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

protected:
unsigned int m_textureId = 0;
};
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_BACKEND_TEXTURE_GLES2_HPP
2 changes: 0 additions & 2 deletions include/TGUI/Backend/Renderer/GLES2/CanvasGLES2.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,4 @@ namespace tgui
};
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_CANVAS_GLES2_HPP
2 changes: 0 additions & 2 deletions include/TGUI/Backend/Renderer/OpenGL.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,4 @@ namespace tgui
} // namespace priv
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_OPENGL_HPP
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,4 @@ namespace tgui
};
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_BACKEND_RENDER_TARGET_OPENGL3_HPP
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,9 @@ namespace tgui
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
TGUI_NODISCARD unsigned int getMaximumTextureSize() override;

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

private:
int m_maxTextureSize = 0;
};
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_BACKEND_RENDERER_OPENGL3_HPP
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,4 @@ namespace tgui
};
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_BACKEND_TEXTURE_OPENGL3_HPP
2 changes: 0 additions & 2 deletions include/TGUI/Backend/Renderer/OpenGL3/CanvasOpenGL3.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,4 @@ namespace tgui
};
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_CANVAS_OPENGL3_HPP
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,6 @@ namespace tgui
Texture2D m_defaultTexture = m_material.maps[MATERIAL_MAP_DIFFUSE].texture;
};

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_BACKEND_RENDER_TARGET_RAYLIB_HPP
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,4 @@ namespace tgui
};
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_BACKEND_RENDERER_RAYLIB_HPP
2 changes: 0 additions & 2 deletions include/TGUI/Backend/Renderer/Raylib/BackendTextureRaylib.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,4 @@ namespace tgui
};
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_BACKEND_TEXTURE_RAYLIB_HPP
2 changes: 0 additions & 2 deletions include/TGUI/Backend/Renderer/Raylib/CanvasRaylib.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,4 @@ namespace tgui
};
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_CANVAS_RAYLIB_HPP
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,6 @@ namespace tgui
SDL_GPUBuffer* m_indexBuffer = nullptr;
};

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_BACKEND_RENDER_TARGET_SDL_GPU_HPP
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,4 @@ namespace tgui
};
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_BACKEND_RENDERER_SDL_GPU_HPP
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,4 @@ namespace tgui
};
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_BACKEND_TEXTURE_SDL_GPU_HPP
2 changes: 0 additions & 2 deletions include/TGUI/Backend/Renderer/SDL_GPU/CanvasSDLGPU.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,4 @@ namespace tgui
};
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_CANVAS_SDL_GPU_HPP
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,6 @@ namespace tgui
Transform m_projectionTransform;
};

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_BACKEND_RENDER_TARGET_SDL_HPP
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,4 @@ namespace tgui
};
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_BACKEND_RENDERER_SDL_HPP
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,4 @@ namespace tgui
};
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_BACKEND_TEXTURE_SDL_HPP
2 changes: 0 additions & 2 deletions include/TGUI/Backend/Renderer/SDL_Renderer/CanvasSDL.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,4 @@ namespace tgui
};
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_CANVAS_SDL_HPP
2 changes: 0 additions & 2 deletions include/TGUI/Backend/SDL-GPU.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,6 @@ namespace tgui
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void presentScreen() override;

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

protected:
SDL_GPUDevice* m_device = nullptr;
};
Expand Down
2 changes: 0 additions & 2 deletions include/TGUI/Base64.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,4 @@ namespace tgui
TGUI_NODISCARD TGUI_API std::vector<std::uint8_t> base64Decode(CharStringView data);
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_BASE64_HPP
2 changes: 0 additions & 2 deletions include/TGUI/Color.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,4 @@ namespace tgui
} // namespace priv
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_COLOR_HPP
2 changes: 0 additions & 2 deletions include/TGUI/Components.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,4 @@ namespace tgui
} // namespace priv
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_COMPONENTS_HPP
6 changes: 0 additions & 6 deletions include/TGUI/Container.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -698,13 +698,7 @@ namespace tgui
{
return nullptr;
}

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
};

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_CONTAINER_HPP
3 changes: 0 additions & 3 deletions include/TGUI/CopiedPtr.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,6 @@ namespace tgui
return CopiedPtr<T>(CopiedPtrEmplaceTag{}, std::forward<Args>(args)...);
}

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_COPIED_PTR_HPP
5 changes: 0 additions & 5 deletions include/TGUI/CopiedSharedPtr.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,10 @@ namespace tgui
return m_WidgetPtr.get();
}

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

private:
std::shared_ptr<WidgetType> m_WidgetPtr;
};

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_COPIED_SHARED_PTR_HPP
2 changes: 0 additions & 2 deletions include/TGUI/Core.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,4 @@
#include <TGUI/ToolTip.hpp>
#include <TGUI/Widget.hpp>

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_CORE_HPP
3 changes: 0 additions & 3 deletions include/TGUI/Cursor.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,6 @@ namespace tgui
static void resetStyle(Type type);
};

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
} // namespace tgui

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_CURSOR_HPP
7 changes: 0 additions & 7 deletions include/TGUI/CustomWidgetForBindings.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@

#ifndef TGUI_REMOVE_DEPRECATED_CODE

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#include <TGUI/Widget.hpp>

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -287,15 +285,10 @@ namespace tgui
std::function<void()> implMouseLeftWidget;
std::function<bool(const String&)> implRendererChanged;
std::function<void(BackendRenderTarget&, RenderStates)> implDrawFunction;

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
};

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
} // namespace tgui

#endif // TGUI_REMOVE_DEPRECATED_CODE

/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

#endif // TGUI_WIDGET_HPP
Loading
Loading