Skip to content

Commit 007a78a

Browse files
committed
Build fixes
1 parent 5d21527 commit 007a78a

File tree

5 files changed

+8
-6
lines changed

5 files changed

+8
-6
lines changed

examples/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ macro(tgui_add_example target)
4949
if (TGUI_BUILD_CXX20_MODULE)
5050
target_compile_definitions(${target} PRIVATE TGUI_BUILD_CXX20_MODULE)
5151
endif()
52-
if (DEFINED TGUI_USE_SDL3)
53-
target_compile_definitions(${target} PRIVATE TGUI_USE_SDL3)
54-
endif()
5552
endmacro()
5653

5754
# Build the examples

examples/main-SDL_RENDERER.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
//
2323
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
2424

25+
#include <TGUI/extlibs/IncludeSDL.hpp>
2526
#if SDL_MAJOR_VERSION >= 3
2627
#include <SDL3/SDL_main.h>
2728
#endif
2829

2930
#if TGUI_BUILD_CXX20_MODULE
30-
#include <TGUI/extlibs/IncludeSDL.hpp>
3131
#if SDL_MAJOR_VERSION >= 3
3232
#include <SDL3_ttf/SDL_ttf.h>
3333
#else

include/TGUI/Backend/Window/SFML/BackendGuiSFML.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ namespace tgui
177177
// Let the gui handle the event
178178
bool eventHandledByGui = false;
179179
if (passEventToGui)
180-
eventHandledByGui = handleEvent(std::forward<EventType>(event));
180+
eventHandledByGui = this->handleEvent(std::forward<EventType>(event));
181181

182182
// After the gui has handled the events, we call the handlers that return nothing.
183183
// These handlers can have an optional bool parameter that indicates whether the event was processed by the gui.

include/TGUI/Text.hpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,12 @@ namespace tgui
3939

4040
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
4141

42+
#if TGUI_COMPILED_WITH_CPP_VER >= 20
43+
// Inline is needed here if we want to build a c++20 module
4244
inline constexpr unsigned int AutoTextSize = 0xFFFFFFFF;
45+
#else
46+
constexpr unsigned int AutoTextSize = 0xFFFFFFFF;
47+
#endif
4348

4449
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
4550
/// @brief Backend-independent wrapper around the backend-specific text class

include/TGUI/WindowsIMM.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
3434

35-
TGUI_MODULE_EXPORT namespace tgui
35+
namespace tgui
3636
{
3737
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
3838
/// @brief Dynamically loads and uses imm32.dll on Windows to control the IME

0 commit comments

Comments
 (0)