File tree Expand file tree Collapse file tree 5 files changed +8
-6
lines changed Expand file tree Collapse file tree 5 files changed +8
-6
lines changed Original file line number Diff line number Diff line change @@ -49,9 +49,6 @@ macro(tgui_add_example target)
49
49
if (TGUI_BUILD_CXX20_MODULE )
50
50
target_compile_definitions (${target} PRIVATE TGUI_BUILD_CXX20_MODULE )
51
51
endif ()
52
- if (DEFINED TGUI_USE_SDL3 )
53
- target_compile_definitions (${target} PRIVATE TGUI_USE_SDL3 )
54
- endif ()
55
52
endmacro ()
56
53
57
54
# Build the examples
Original file line number Diff line number Diff line change 22
22
//
23
23
// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
24
24
25
+ #include < TGUI/extlibs/IncludeSDL.hpp>
25
26
#if SDL_MAJOR_VERSION >= 3
26
27
#include < SDL3/SDL_main.h>
27
28
#endif
28
29
29
30
#if TGUI_BUILD_CXX20_MODULE
30
- #include < TGUI/extlibs/IncludeSDL.hpp>
31
31
#if SDL_MAJOR_VERSION >= 3
32
32
#include < SDL3_ttf/SDL_ttf.h>
33
33
#else
Original file line number Diff line number Diff line change @@ -177,7 +177,7 @@ namespace tgui
177
177
// Let the gui handle the event
178
178
bool eventHandledByGui = false ;
179
179
if (passEventToGui)
180
- eventHandledByGui = handleEvent (std::forward<EventType>(event));
180
+ eventHandledByGui = this -> handleEvent (std::forward<EventType>(event));
181
181
182
182
// After the gui has handled the events, we call the handlers that return nothing.
183
183
// These handlers can have an optional bool parameter that indicates whether the event was processed by the gui.
Original file line number Diff line number Diff line change @@ -39,7 +39,12 @@ namespace tgui
39
39
40
40
// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
41
41
42
+ #if TGUI_COMPILED_WITH_CPP_VER >= 20
43
+ // Inline is needed here if we want to build a c++20 module
42
44
inline constexpr unsigned int AutoTextSize = 0xFFFFFFFF ;
45
+ #else
46
+ constexpr unsigned int AutoTextSize = 0xFFFFFFFF ;
47
+ #endif
43
48
44
49
// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
45
50
// / @brief Backend-independent wrapper around the backend-specific text class
Original file line number Diff line number Diff line change 32
32
33
33
// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
34
34
35
- TGUI_MODULE_EXPORT namespace tgui
35
+ namespace tgui
36
36
{
37
37
// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
38
38
// / @brief Dynamically loads and uses imm32.dll on Windows to control the IME
You can’t perform that action at this time.
0 commit comments