Use inheritance to remove This data member

It's reasonable to say that, for example, sfImage _is_ an sf::Image.
This "is-a" relationship is what inheritance does a very good job
modeling. By using inheritance to implement CSFML types in terms of
their SFML counterpart, we get code that is simpler and easier to
read. We also avoid some of the extra "dancing" required to construct
a CSFML type from an SFML type. This improves the encapsulation of
our CSFML implementation.

.clang-tidy

@@ -15,6 +15,7 @@ Checks: >
   -cppcoreguidelines-macro-usage,
   -cppcoreguidelines-narrowing-conversions,
   -cppcoreguidelines-no-malloc,
+  -cppcoreguidelines-non-private-member-variables-in-classes,
   -cppcoreguidelines-owning-memory,
   -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
   -cppcoreguidelines-pro-bounds-constant-array-index,

src/CSFML/Audio/Music.cpp

@@ -39,22 +39,22 @@ sfMusic* sfMusic_createFromFile(const char* filename)
 {
     assert(filename);
 
-    sf::Music music;
-    if (!music.openFromFile(filename))
+    auto music = std::make_unique<sfMusic>();
+    if (!music->openFromFile(filename))
         return nullptr;
 
-    return new sfMusic{std::move(music), {}, {}};
+    return music.release();
 }
 
 
 ////////////////////////////////////////////////////////////
 sfMusic* sfMusic_createFromMemory(const void* data, size_t sizeInBytes)
 {
-    sf::Music music;
-    if (!music.openFromMemory(data, sizeInBytes))
+    auto music = std::make_unique<sfMusic>();
+    if (!music->openFromMemory(data, sizeInBytes))
         return nullptr;
 
-    return new sfMusic{std::move(music), {}, {}};
+    return music.release();
 }
 
 
@@ -63,8 +63,9 @@ sfMusic* sfMusic_createFromStream(sfInputStream* stream)
 {
     assert(stream);
 
-    auto music = std::make_unique<sfMusic>(sfMusic{{}, {}, {stream}});
-    if (!music->This.openFromStream(music->Stream))
+    auto music    = std::make_unique<sfMusic>();
+    music->Stream = CallbackStream(stream);
+    if (!music->openFromStream(music->Stream))
         return nullptr;
 
     return music.release();
@@ -82,7 +83,7 @@ void sfMusic_destroy(const sfMusic* music)
 void sfMusic_setLooping(sfMusic* music, bool loop)
 {
     assert(music);
-    music->This.setLooping(loop != 0);
+    music->setLooping(loop != 0);
 }
 
 
@@ -90,7 +91,7 @@ void sfMusic_setLooping(sfMusic* music, bool loop)
 bool sfMusic_isLooping(const sfMusic* music)
 {
     assert(music);
-    return music->This.isLooping();
+    return music->isLooping();
 }
 
 
@@ -101,11 +102,11 @@ void sfMusic_setEffectProcessor(sfMusic* music, sfEffectProcessor effectProcesso
 
     if (!effectProcessor)
     {
-        music->This.setEffectProcessor(nullptr);
+        music->setEffectProcessor(nullptr);
     }
     else
     {
-        music->This.setEffectProcessor(
+        music->setEffectProcessor(
             [effectProcessor](const float*  inputFrames,
                               unsigned int& inputFrameCount,
                               float*        outputFrames,
@@ -120,7 +121,7 @@ void sfMusic_setEffectProcessor(sfMusic* music, sfEffectProcessor effectProcesso
 sfTime sfMusic_getDuration(const sfMusic* music)
 {
     assert(music);
-    return {music->This.getDuration().asMicroseconds()};
+    return {music->getDuration().asMicroseconds()};
 }
 
 
@@ -128,7 +129,7 @@ sfTime sfMusic_getDuration(const sfMusic* music)
 sfTimeSpan sfMusic_getLoopPoints(const sfMusic* music)
 {
     assert(music);
-    const auto [offset, length] = music->This.getLoopPoints();
+    const auto [offset, length] = music->getLoopPoints();
     return {{offset.asMicroseconds()}, {length.asMicroseconds()}};
 }
 
@@ -137,7 +138,7 @@ sfTimeSpan sfMusic_getLoopPoints(const sfMusic* music)
 void sfMusic_setLoopPoints(sfMusic* music, sfTimeSpan timePoints)
 {
     assert(music);
-    music->This.setLoopPoints(
+    music->setLoopPoints(
         {sf::microseconds(timePoints.offset.microseconds), sf::microseconds(timePoints.length.microseconds)});
 }
 
@@ -146,7 +147,7 @@ void sfMusic_setLoopPoints(sfMusic* music, sfTimeSpan timePoints)
 void sfMusic_play(sfMusic* music)
 {
     assert(music);
-    music->This.play();
+    music->play();
 }
 
 
@@ -154,7 +155,7 @@ void sfMusic_play(sfMusic* music)
 void sfMusic_pause(sfMusic* music)
 {
     assert(music);
-    music->This.pause();
+    music->pause();
 }
 
 
@@ -162,7 +163,7 @@ void sfMusic_pause(sfMusic* music)
 void sfMusic_stop(sfMusic* music)
 {
     assert(music);
-    music->This.stop();
+    music->stop();
 }
 
 
@@ -170,7 +171,7 @@ void sfMusic_stop(sfMusic* music)
 unsigned int sfMusic_getChannelCount(const sfMusic* music)
 {
     assert(music);
-    return music->This.getChannelCount();
+    return music->getChannelCount();
 }
 
 
@@ -178,7 +179,7 @@ unsigned int sfMusic_getChannelCount(const sfMusic* music)
 unsigned int sfMusic_getSampleRate(const sfMusic* music)
 {
     assert(music);
-    return music->This.getSampleRate();
+    return music->getSampleRate();
 }
 
 
@@ -188,7 +189,7 @@ const sfSoundChannel* sfMusic_getChannelMap(const sfMusic* music, size_t* count)
     assert(music);
     assert(count);
 
-    const auto channels = music->This.getChannelMap();
+    const auto channels = music->getChannelMap();
 
     music->Channels.resize(channels.size());
     std::memcpy(music->Channels.data(), channels.data(), sizeof(sfSoundChannel) * channels.size());
@@ -202,7 +203,7 @@ const sfSoundChannel* sfMusic_getChannelMap(const sfMusic* music, size_t* count)
 sfSoundStatus sfMusic_getStatus(const sfMusic* music)
 {
     assert(music);
-    return static_cast<sfSoundStatus>(music->This.getStatus());
+    return static_cast<sfSoundStatus>(music->getStatus());
 }
 
 
@@ -210,7 +211,7 @@ sfSoundStatus sfMusic_getStatus(const sfMusic* music)
 sfTime sfMusic_getPlayingOffset(const sfMusic* music)
 {
     assert(music);
-    return {music->This.getPlayingOffset().asMicroseconds()};
+    return {music->getPlayingOffset().asMicroseconds()};
 }
 
 
@@ -218,7 +219,7 @@ sfTime sfMusic_getPlayingOffset(const sfMusic* music)
 void sfMusic_setPitch(sfMusic* music, float pitch)
 {
     assert(music);
-    music->This.setPitch(pitch);
+    music->setPitch(pitch);
 }
 
 
@@ -226,7 +227,7 @@ void sfMusic_setPitch(sfMusic* music, float pitch)
 void sfMusic_setPan(sfMusic* music, float pan)
 {
     assert(music);
-    music->This.setPan(pan);
+    music->setPan(pan);
 }
 
 
@@ -234,7 +235,7 @@ void sfMusic_setPan(sfMusic* music, float pan)
 void sfMusic_setVolume(sfMusic* music, float volume)
 {
     assert(music);
-    music->This.setVolume(volume);
+    music->setVolume(volume);
 }
 
 
@@ -242,7 +243,7 @@ void sfMusic_setVolume(sfMusic* music, float volume)
 void sfMusic_setSpatializationEnabled(sfMusic* music, bool enabled)
 {
     assert(music);
-    music->This.setSpatializationEnabled(enabled);
+    music->setSpatializationEnabled(enabled);
 }
 
 
@@ -250,7 +251,7 @@ void sfMusic_setSpatializationEnabled(sfMusic* music, bool enabled)
 void sfMusic_setPosition(sfMusic* music, sfVector3f position)
 {
     assert(music);
-    music->This.setPosition(convertVector3(position));
+    music->setPosition(convertVector3(position));
 }
 
 
@@ -258,7 +259,7 @@ void sfMusic_setPosition(sfMusic* music, sfVector3f position)
 void sfMusic_setDirection(sfMusic* music, sfVector3f position)
 {
     assert(music);
-    music->This.setDirection(convertVector3(position));
+    music->setDirection(convertVector3(position));
 }
 
 
@@ -266,7 +267,7 @@ void sfMusic_setDirection(sfMusic* music, sfVector3f position)
 void sfMusic_setCone(sfMusic* music, sfSoundSourceCone cone)
 {
     assert(music);
-    music->This.setCone(convertCone(cone));
+    music->setCone(convertCone(cone));
 }
 
 
@@ -274,7 +275,7 @@ void sfMusic_setCone(sfMusic* music, sfSoundSourceCone cone)
 void sfMusic_setVelocity(sfMusic* music, sfVector3f velocity)
 {
     assert(music);
-    music->This.setVelocity(convertVector3(velocity));
+    music->setVelocity(convertVector3(velocity));
 }
 
 
@@ -282,7 +283,7 @@ void sfMusic_setVelocity(sfMusic* music, sfVector3f velocity)
 void sfMusic_setDopplerFactor(sfMusic* music, float factor)
 {
     assert(music);
-    music->This.setDopplerFactor(factor);
+    music->setDopplerFactor(factor);
 }
 
 
@@ -290,7 +291,7 @@ void sfMusic_setDopplerFactor(sfMusic* music, float factor)
 CSFML_AUDIO_API void sfMusic_setDirectionalAttenuationFactor(sfMusic* music, float factor)
 {
     assert(music);
-    music->This.setDirectionalAttenuationFactor(factor);
+    music->setDirectionalAttenuationFactor(factor);
 }
 
 
@@ -298,7 +299,7 @@ CSFML_AUDIO_API void sfMusic_setDirectionalAttenuationFactor(sfMusic* music, flo
 void sfMusic_setRelativeToListener(sfMusic* music, bool relative)
 {
     assert(music);
-    music->This.setRelativeToListener(relative);
+    music->setRelativeToListener(relative);
 }
 
 
@@ -306,7 +307,7 @@ void sfMusic_setRelativeToListener(sfMusic* music, bool relative)
 void sfMusic_setMinDistance(sfMusic* music, float distance)
 {
     assert(music);
-    music->This.setMinDistance(distance);
+    music->setMinDistance(distance);
 }
 
 
@@ -314,7 +315,7 @@ void sfMusic_setMinDistance(sfMusic* music, float distance)
 void sfMusic_setMaxDistance(sfMusic* music, float distance)
 {
     assert(music);
-    music->This.setMaxDistance(distance);
+    music->setMaxDistance(distance);
 }
 
 
@@ -322,7 +323,7 @@ void sfMusic_setMaxDistance(sfMusic* music, float distance)
 void sfMusic_setMinGain(sfMusic* music, float gain)
 {
     assert(music);
-    music->This.setMinGain(gain);
+    music->setMinGain(gain);
 }
 
 
@@ -330,7 +331,7 @@ void sfMusic_setMinGain(sfMusic* music, float gain)
 void sfMusic_setMaxGain(sfMusic* music, float gain)
 {
     assert(music);
-    music->This.setMaxGain(gain);
+    music->setMaxGain(gain);
 }
 
 
@@ -338,7 +339,7 @@ void sfMusic_setMaxGain(sfMusic* music, float gain)
 void sfMusic_setAttenuation(sfMusic* music, float attenuation)
 {
     assert(music);
-    music->This.setAttenuation(attenuation);
+    music->setAttenuation(attenuation);
 }
 
 
@@ -346,7 +347,7 @@ void sfMusic_setAttenuation(sfMusic* music, float attenuation)
 void sfMusic_setPlayingOffset(sfMusic* music, sfTime timeOffset)
 {
     assert(music);
-    music->This.setPlayingOffset(sf::microseconds(timeOffset.microseconds));
+    music->setPlayingOffset(sf::microseconds(timeOffset.microseconds));
 }
 
 
@@ -354,7 +355,7 @@ void sfMusic_setPlayingOffset(sfMusic* music, sfTime timeOffset)
 float sfMusic_getPitch(const sfMusic* music)
 {
     assert(music);
-    return music->This.getPitch();
+    return music->getPitch();
 }
 
 
@@ -362,7 +363,7 @@ float sfMusic_getPitch(const sfMusic* music)
 float sfMusic_getPan(const sfMusic* music)
 {
     assert(music);
-    return music->This.getPan();
+    return music->getPan();
 }
 
 
@@ -370,7 +371,7 @@ float sfMusic_getPan(const sfMusic* music)
 float sfMusic_getVolume(const sfMusic* music)
 {
     assert(music);
-    return music->This.getVolume();
+    return music->getVolume();
 }
 
 
@@ -378,7 +379,7 @@ float sfMusic_getVolume(const sfMusic* music)
 bool sfMusic_isSpatializationEnabled(const sfMusic* music)
 {
     assert(music);
-    return music->This.isSpatializationEnabled();
+    return music->isSpatializationEnabled();
 }
 
 
@@ -386,7 +387,7 @@ bool sfMusic_isSpatializationEnabled(const sfMusic* music)
 sfVector3f sfMusic_getPosition(const sfMusic* music)
 {
     assert(music);
-    return convertVector3(music->This.getPosition());
+    return convertVector3(music->getPosition());
 }
 
 
@@ -394,7 +395,7 @@ sfVector3f sfMusic_getPosition(const sfMusic* music)
 sfVector3f sfMusic_getDirection(const sfMusic* music)
 {
     assert(music);
-    return convertVector3(music->This.getDirection());
+    return convertVector3(music->getDirection());
 }
 
 
@@ -402,7 +403,7 @@ sfVector3f sfMusic_getDirection(const sfMusic* music)
 sfSoundSourceCone sfMusic_getCone(const sfMusic* music)
 {
     assert(music);
-    return convertCone(music->This.getCone());
+    return convertCone(music->getCone());
 }
 
 
@@ -410,7 +411,7 @@ sfSoundSourceCone sfMusic_getCone(const sfMusic* music)
 sfVector3f sfMusic_getVelocity(const sfMusic* music)
 {
     assert(music);
-    return convertVector3(music->This.getVelocity());
+    return convertVector3(music->getVelocity());
 }
 
 
@@ -418,7 +419,7 @@ sfVector3f sfMusic_getVelocity(const sfMusic* music)
 float sfMusic_getDopplerFactor(const sfMusic* music)
 {
     assert(music);
-    return music->This.getDopplerFactor();
+    return music->getDopplerFactor();
 }
 
 
@@ -426,7 +427,7 @@ float sfMusic_getDopplerFactor(const sfMusic* music)
 float sfMusic_getDirectionalAttenuationFactor(const sfMusic* music)
 {
     assert(music);
-    return music->This.getDirectionalAttenuationFactor();
+    return music->getDirectionalAttenuationFactor();
 }
 
 
@@ -434,7 +435,7 @@ float sfMusic_getDirectionalAttenuationFactor(const sfMusic* music)
 bool sfMusic_isRelativeToListener(const sfMusic* music)
 {
     assert(music);
-    return music->This.isRelativeToListener();
+    return music->isRelativeToListener();
 }
 
 
@@ -442,7 +443,7 @@ bool sfMusic_isRelativeToListener(const sfMusic* music)
 float sfMusic_getMinDistance(const sfMusic* music)
 {
     assert(music);
-    return music->This.getMinDistance();
+    return music->getMinDistance();
 }
 
 
@@ -450,7 +451,7 @@ float sfMusic_getMinDistance(const sfMusic* music)
 float sfMusic_getMaxDistance(const sfMusic* music)
 {
     assert(music);
-    return music->This.getMaxDistance();
+    return music->getMaxDistance();
 }
 
 
@@ -458,7 +459,7 @@ float sfMusic_getMaxDistance(const sfMusic* music)
 float sfMusic_getMinGain(const sfMusic* music)
 {
     assert(music);
-    return music->This.getMinGain();
+    return music->getMinGain();
 }
 
 
@@ -466,7 +467,7 @@ float sfMusic_getMinGain(const sfMusic* music)
 float sfMusic_getMaxGain(const sfMusic* music)
 {
     assert(music);
-    return music->This.getMinGain();
+    return music->getMinGain();
 }
 
 
@@ -474,5 +475,5 @@ float sfMusic_getMaxGain(const sfMusic* music)
 float sfMusic_getAttenuation(const sfMusic* music)
 {
     assert(music);
-    return music->This.getAttenuation();
+    return music->getAttenuation();
 }

src/CSFML/Audio/MusicStruct.hpp

@@ -38,9 +38,8 @@
 ////////////////////////////////////////////////////////////
 // Internal structure of sfMusic
 ////////////////////////////////////////////////////////////
-struct sfMusic
+struct sfMusic : sf::Music
 {
-    sf::Music                           This;
     mutable std::vector<sfSoundChannel> Channels;
     CallbackStream                      Stream;
 };

src/CSFML/Audio/Sound.cpp

@@ -35,7 +35,9 @@
 sfSound* sfSound_create(const sfSoundBuffer* buffer)
 {
     assert(buffer);
-    return new sfSound{sf::Sound(buffer->This), buffer};
+    auto sound    = new sfSound(*buffer);
+    sound->Buffer = buffer;
+    return sound;
 }
 
 
@@ -58,7 +60,7 @@ void sfSound_destroy(const sfSound* sound)
 void sfSound_play(sfSound* sound)
 {
     assert(sound);
-    sound->This.play();
+    sound->play();
 }
 
 
@@ -66,7 +68,7 @@ void sfSound_play(sfSound* sound)
 void sfSound_pause(sfSound* sound)
 {
     assert(sound);
-    sound->This.pause();
+    sound->pause();
 }
 
 
@@ -74,7 +76,7 @@ void sfSound_pause(sfSound* sound)
 void sfSound_stop(sfSound* sound)
 {
     assert(sound);
-    sound->This.stop();
+    sound->stop();
 }
 
 
@@ -84,7 +86,7 @@ void sfSound_setBuffer(sfSound* sound, const sfSoundBuffer* buffer)
     if (buffer)
     {
         assert(sound);
-        sound->This.setBuffer(buffer->This);
+        sound->setBuffer(*buffer);
         sound->Buffer = buffer;
     }
 }
@@ -102,7 +104,7 @@ const sfSoundBuffer* sfSound_getBuffer(const sfSound* sound)
 void sfSound_setLooping(sfSound* sound, bool loop)
 {
     assert(sound);
-    sound->This.setLooping(loop);
+    sound->setLooping(loop);
 }
 
 
@@ -110,7 +112,7 @@ void sfSound_setLooping(sfSound* sound, bool loop)
 bool sfSound_isLooping(const sfSound* sound)
 {
     assert(sound);
-    return sound->This.isLooping();
+    return sound->isLooping();
 }
 
 
@@ -118,7 +120,7 @@ bool sfSound_isLooping(const sfSound* sound)
 sfSoundStatus sfSound_getStatus(const sfSound* sound)
 {
     assert(sound);
-    return static_cast<sfSoundStatus>(sound->This.getStatus());
+    return static_cast<sfSoundStatus>(sound->getStatus());
 }
 
 
@@ -126,7 +128,7 @@ sfSoundStatus sfSound_getStatus(const sfSound* sound)
 void sfSound_setPitch(sfSound* sound, float pitch)
 {
     assert(sound);
-    sound->This.setPitch(pitch);
+    sound->setPitch(pitch);
 }
 
 
@@ -134,7 +136,7 @@ void sfSound_setPitch(sfSound* sound, float pitch)
 void sfSound_setPan(sfSound* sound, float pan)
 {
     assert(sound);
-    sound->This.setPan(pan);
+    sound->setPan(pan);
 }
 
 
@@ -142,7 +144,7 @@ void sfSound_setPan(sfSound* sound, float pan)
 void sfSound_setVolume(sfSound* sound, float volume)
 {
     assert(sound);
-    sound->This.setVolume(volume);
+    sound->setVolume(volume);
 }
 
 
@@ -150,7 +152,7 @@ void sfSound_setVolume(sfSound* sound, float volume)
 void sfSound_setSpatializationEnabled(sfSound* sound, bool enabled)
 {
     assert(sound);
-    sound->This.setSpatializationEnabled(enabled);
+    sound->setSpatializationEnabled(enabled);
 }
 
 
@@ -158,7 +160,7 @@ void sfSound_setSpatializationEnabled(sfSound* sound, bool enabled)
 void sfSound_setPosition(sfSound* sound, sfVector3f position)
 {
     assert(sound);
-    sound->This.setPosition(convertVector3(position));
+    sound->setPosition(convertVector3(position));
 }
 
 
@@ -166,7 +168,7 @@ void sfSound_setPosition(sfSound* sound, sfVector3f position)
 void sfSound_setDirection(sfSound* sound, sfVector3f direction)
 {
     assert(sound);
-    sound->This.setDirection(convertVector3(direction));
+    sound->setDirection(convertVector3(direction));
 }
 
 
@@ -174,7 +176,7 @@ void sfSound_setDirection(sfSound* sound, sfVector3f direction)
 void sfSound_setCone(sfSound* sound, sfSoundSourceCone cone)
 {
     assert(sound);
-    sound->This.setCone(convertCone(cone));
+    sound->setCone(convertCone(cone));
 }
 
 
@@ -182,7 +184,7 @@ void sfSound_setCone(sfSound* sound, sfSoundSourceCone cone)
 void sfSound_setVelocity(sfSound* sound, sfVector3f velocity)
 {
     assert(sound);
-    sound->This.setVelocity(convertVector3(velocity));
+    sound->setVelocity(convertVector3(velocity));
 }
 
 
@@ -190,7 +192,7 @@ void sfSound_setVelocity(sfSound* sound, sfVector3f velocity)
 void sfSound_setDopplerFactor(sfSound* sound, float factor)
 {
     assert(sound);
-    sound->This.setDopplerFactor(factor);
+    sound->setDopplerFactor(factor);
 }
 
 
@@ -198,7 +200,7 @@ void sfSound_setDopplerFactor(sfSound* sound, float factor)
 void sfSound_setDirectionalAttenuationFactor(sfSound* sound, float factor)
 {
     assert(sound);
-    sound->This.setDirectionalAttenuationFactor(factor);
+    sound->setDirectionalAttenuationFactor(factor);
 }
 
 
@@ -206,7 +208,7 @@ void sfSound_setDirectionalAttenuationFactor(sfSound* sound, float factor)
 void sfSound_setRelativeToListener(sfSound* sound, bool relative)
 {
     assert(sound);
-    sound->This.setRelativeToListener(relative);
+    sound->setRelativeToListener(relative);
 }
 
 
@@ -214,7 +216,7 @@ void sfSound_setRelativeToListener(sfSound* sound, bool relative)
 void sfSound_setMinDistance(sfSound* sound, float distance)
 {
     assert(sound);
-    sound->This.setMinDistance(distance);
+    sound->setMinDistance(distance);
 }
 
 
@@ -222,7 +224,7 @@ void sfSound_setMinDistance(sfSound* sound, float distance)
 void sfSound_setMaxDistance(sfSound* sound, float distance)
 {
     assert(sound);
-    sound->This.setMaxDistance(distance);
+    sound->setMaxDistance(distance);
 }
 
 
@@ -230,7 +232,7 @@ void sfSound_setMaxDistance(sfSound* sound, float distance)
 void sfSound_setMinGain(sfSound* sound, float gain)
 {
     assert(sound);
-    sound->This.setMinGain(gain);
+    sound->setMinGain(gain);
 }
 
 
@@ -238,7 +240,7 @@ void sfSound_setMinGain(sfSound* sound, float gain)
 void sfSound_setMaxGain(sfSound* sound, float gain)
 {
     assert(sound);
-    sound->This.setMaxGain(gain);
+    sound->setMaxGain(gain);
 }
 
 
@@ -246,7 +248,7 @@ void sfSound_setMaxGain(sfSound* sound, float gain)
 void sfSound_setAttenuation(sfSound* sound, float attenuation)
 {
     assert(sound);
-    sound->This.setAttenuation(attenuation);
+    sound->setAttenuation(attenuation);
 }
 
 
@@ -254,7 +256,7 @@ void sfSound_setAttenuation(sfSound* sound, float attenuation)
 void sfSound_setPlayingOffset(sfSound* sound, sfTime timeOffset)
 {
     assert(sound);
-    sound->This.setPlayingOffset(sf::microseconds(timeOffset.microseconds));
+    sound->setPlayingOffset(sf::microseconds(timeOffset.microseconds));
 }
 
 
@@ -265,11 +267,11 @@ void sfSound_setEffectProcessor(sfSound* sound, sfEffectProcessor effectProcesso
 
     if (!effectProcessor)
     {
-        sound->This.setEffectProcessor(nullptr);
+        sound->setEffectProcessor(nullptr);
     }
     else
     {
-        sound->This.setEffectProcessor(
+        sound->setEffectProcessor(
             [effectProcessor](const float*  inputFrames,
                               unsigned int& inputFrameCount,
                               float*        outputFrames,
@@ -284,7 +286,7 @@ void sfSound_setEffectProcessor(sfSound* sound, sfEffectProcessor effectProcesso
 float sfSound_getPitch(const sfSound* sound)
 {
     assert(sound);
-    return sound->This.getPitch();
+    return sound->getPitch();
 }
 
 
@@ -292,7 +294,7 @@ float sfSound_getPitch(const sfSound* sound)
 float sfSound_getPan(const sfSound* sound)
 {
     assert(sound);
-    return sound->This.getPan();
+    return sound->getPan();
 }
 
 
@@ -300,7 +302,7 @@ float sfSound_getPan(const sfSound* sound)
 float sfSound_getVolume(const sfSound* sound)
 {
     assert(sound);
-    return sound->This.getVolume();
+    return sound->getVolume();
 }
 
 
@@ -308,7 +310,7 @@ float sfSound_getVolume(const sfSound* sound)
 bool sfSound_isSpatializationEnabled(const sfSound* sound)
 {
     assert(sound);
-    return sound->This.isSpatializationEnabled();
+    return sound->isSpatializationEnabled();
 }
 
 
@@ -316,7 +318,7 @@ bool sfSound_isSpatializationEnabled(const sfSound* sound)
 sfVector3f sfSound_getPosition(const sfSound* sound)
 {
     assert(sound);
-    return convertVector3(sound->This.getPosition());
+    return convertVector3(sound->getPosition());
 }
 
 
@@ -324,7 +326,7 @@ sfVector3f sfSound_getPosition(const sfSound* sound)
 sfVector3f sfSound_getDirection(const sfSound* sound)
 {
     assert(sound);
-    return convertVector3(sound->This.getDirection());
+    return convertVector3(sound->getDirection());
 }
 
 
@@ -332,7 +334,7 @@ sfVector3f sfSound_getDirection(const sfSound* sound)
 sfSoundSourceCone sfSound_getCone(const sfSound* sound)
 {
     assert(sound);
-    return convertCone(sound->This.getCone());
+    return convertCone(sound->getCone());
 }
 
 
@@ -340,7 +342,7 @@ sfSoundSourceCone sfSound_getCone(const sfSound* sound)
 sfVector3f sfSound_getVelocity(const sfSound* sound)
 {
     assert(sound);
-    return convertVector3(sound->This.getVelocity());
+    return convertVector3(sound->getVelocity());
 }
 
 
@@ -348,7 +350,7 @@ sfVector3f sfSound_getVelocity(const sfSound* sound)
 float sfSound_getDopplerFactor(const sfSound* sound)
 {
     assert(sound);
-    return sound->This.getDopplerFactor();
+    return sound->getDopplerFactor();
 }
 
 
@@ -356,7 +358,7 @@ float sfSound_getDopplerFactor(const sfSound* sound)
 float sfSound_getDirectionalAttenuationFactor(const sfSound* sound)
 {
     assert(sound);
-    return sound->This.getDopplerFactor();
+    return sound->getDopplerFactor();
 }
 
 
@@ -364,7 +366,7 @@ float sfSound_getDirectionalAttenuationFactor(const sfSound* sound)
 bool sfSound_isRelativeToListener(const sfSound* sound)
 {
     assert(sound);
-    return sound->This.isRelativeToListener();
+    return sound->isRelativeToListener();
 }
 
 
@@ -372,7 +374,7 @@ bool sfSound_isRelativeToListener(const sfSound* sound)
 float sfSound_getMinDistance(const sfSound* sound)
 {
     assert(sound);
-    return sound->This.getMinDistance();
+    return sound->getMinDistance();
 }
 
 
@@ -380,7 +382,7 @@ float sfSound_getMinDistance(const sfSound* sound)
 float sfSound_getMaxDistance(const sfSound* sound)
 {
     assert(sound);
-    return sound->This.getMaxDistance();
+    return sound->getMaxDistance();
 }
 
 
@@ -388,7 +390,7 @@ float sfSound_getMaxDistance(const sfSound* sound)
 float sfSound_getMinGain(const sfSound* sound)
 {
     assert(sound);
-    return sound->This.getMinGain();
+    return sound->getMinGain();
 }
 
 
@@ -396,7 +398,7 @@ float sfSound_getMinGain(const sfSound* sound)
 float sfSound_getMaxGain(const sfSound* sound)
 {
     assert(sound);
-    return sound->This.getMaxGain();
+    return sound->getMaxGain();
 }
 
 
@@ -404,7 +406,7 @@ float sfSound_getMaxGain(const sfSound* sound)
 float sfSound_getAttenuation(const sfSound* sound)
 {
     assert(sound);
-    return sound->This.getAttenuation();
+    return sound->getAttenuation();
 }
 
 
@@ -412,5 +414,5 @@ float sfSound_getAttenuation(const sfSound* sound)
 sfTime sfSound_getPlayingOffset(const sfSound* sound)
 {
     assert(sound);
-    return {sound->This.getPlayingOffset().asMicroseconds()};
+    return {sound->getPlayingOffset().asMicroseconds()};
 }

src/CSFML/Audio/SoundBuffer.cpp

@@ -37,22 +37,22 @@ sfSoundBuffer* sfSoundBuffer_createFromFile(const char* filename)
 {
     assert(filename);
 
-    sf::SoundBuffer soundBuffer;
-    if (!soundBuffer.loadFromFile(filename))
+    auto soundBuffer = std::make_unique<sfSoundBuffer>();
+    if (!soundBuffer->loadFromFile(filename))
         return nullptr;
 
-    return new sfSoundBuffer{std::move(soundBuffer), {}};
+    return soundBuffer.release();
 }
 
 
 ////////////////////////////////////////////////////////////
 sfSoundBuffer* sfSoundBuffer_createFromMemory(const void* data, size_t sizeInBytes)
 {
-    sf::SoundBuffer soundBuffer;
-    if (!soundBuffer.loadFromMemory(data, sizeInBytes))
+    auto soundBuffer = std::make_unique<sfSoundBuffer>();
+    if (!soundBuffer->loadFromMemory(data, sizeInBytes))
         return nullptr;
 
-    return new sfSoundBuffer{std::move(soundBuffer), {}};
+    return soundBuffer.release();
 }
 
 
@@ -61,12 +61,12 @@ sfSoundBuffer* sfSoundBuffer_createFromStream(sfInputStream* stream)
 {
     assert(stream);
 
-    CallbackStream  sfmlStream(stream);
-    sf::SoundBuffer soundBuffer;
-    if (!soundBuffer.loadFromStream(sfmlStream))
+    CallbackStream sfmlStream(stream);
+    auto           soundBuffer = std::make_unique<sfSoundBuffer>();
+    if (!soundBuffer->loadFromStream(sfmlStream))
         return nullptr;
 
-    return new sfSoundBuffer{std::move(soundBuffer), {}};
+    return soundBuffer.release();
 }
 
 
@@ -83,11 +83,11 @@ sfSoundBuffer* sfSoundBuffer_createFromSamples(
     for (std::size_t i = 0; i < channelMap.size(); ++i)
         channelMap[i] = static_cast<sf::SoundChannel>(channelMapData[i]);
 
-    sf::SoundBuffer soundBuffer;
-    if (!soundBuffer.loadFromSamples(samples, sampleCount, channelCount, sampleRate, channelMap))
+    auto soundBuffer = std::make_unique<sfSoundBuffer>();
+    if (!soundBuffer->loadFromSamples(samples, sampleCount, channelCount, sampleRate, channelMap))
         return nullptr;
 
-    return new sfSoundBuffer{std::move(soundBuffer), {}};
+    return soundBuffer.release();
 }
 
 
@@ -111,7 +111,7 @@ bool sfSoundBuffer_saveToFile(const sfSoundBuffer* soundBuffer, const char* file
 {
     assert(soundBuffer);
     assert(filename);
-    return soundBuffer->This.saveToFile(filename);
+    return soundBuffer->saveToFile(filename);
 }
 
 
@@ -119,7 +119,7 @@ bool sfSoundBuffer_saveToFile(const sfSoundBuffer* soundBuffer, const char* file
 const int16_t* sfSoundBuffer_getSamples(const sfSoundBuffer* soundBuffer)
 {
     assert(soundBuffer);
-    return soundBuffer->This.getSamples();
+    return soundBuffer->getSamples();
 }
 
 
@@ -127,7 +127,7 @@ const int16_t* sfSoundBuffer_getSamples(const sfSoundBuffer* soundBuffer)
 uint64_t sfSoundBuffer_getSampleCount(const sfSoundBuffer* soundBuffer)
 {
     assert(soundBuffer);
-    return soundBuffer->This.getSampleCount();
+    return soundBuffer->getSampleCount();
 }
 
 
@@ -135,7 +135,7 @@ uint64_t sfSoundBuffer_getSampleCount(const sfSoundBuffer* soundBuffer)
 unsigned int sfSoundBuffer_getSampleRate(const sfSoundBuffer* soundBuffer)
 {
     assert(soundBuffer);
-    return soundBuffer->This.getSampleRate();
+    return soundBuffer->getSampleRate();
 }
 
 
@@ -143,7 +143,7 @@ unsigned int sfSoundBuffer_getSampleRate(const sfSoundBuffer* soundBuffer)
 unsigned int sfSoundBuffer_getChannelCount(const sfSoundBuffer* soundBuffer)
 {
     assert(soundBuffer);
-    return soundBuffer->This.getChannelCount();
+    return soundBuffer->getChannelCount();
 }
 
 
@@ -153,7 +153,7 @@ sfSoundChannel* sfSoundBuffer_getChannelMap(const sfSoundBuffer* soundBuffer, si
     assert(soundBuffer);
     assert(count);
 
-    const auto channels = soundBuffer->This.getChannelMap();
+    const auto channels = soundBuffer->getChannelMap();
 
     soundBuffer->Channels.resize(channels.size());
     std::memcpy(soundBuffer->Channels.data(), channels.data(), sizeof(sfSoundChannel) * channels.size());
@@ -167,5 +167,5 @@ sfSoundChannel* sfSoundBuffer_getChannelMap(const sfSoundBuffer* soundBuffer, si
 sfTime sfSoundBuffer_getDuration(const sfSoundBuffer* soundBuffer)
 {
     assert(soundBuffer);
-    return {soundBuffer->This.getDuration().asMicroseconds()};
+    return {soundBuffer->getDuration().asMicroseconds()};
 }

src/CSFML/Audio/SoundBufferRecorder.cpp

@@ -47,7 +47,7 @@ void sfSoundBufferRecorder_destroy(const sfSoundBufferRecorder* soundBufferRecor
 bool sfSoundBufferRecorder_start(sfSoundBufferRecorder* soundBufferRecorder, unsigned int sampleRate)
 {
     assert(soundBufferRecorder);
-    return soundBufferRecorder->This.start(sampleRate);
+    return soundBufferRecorder->start(sampleRate);
 }
 
 
@@ -55,7 +55,7 @@ bool sfSoundBufferRecorder_start(sfSoundBufferRecorder* soundBufferRecorder, uns
 void sfSoundBufferRecorder_stop(sfSoundBufferRecorder* soundBufferRecorder)
 {
     assert(soundBufferRecorder);
-    soundBufferRecorder->This.stop();
+    soundBufferRecorder->stop();
 }
 
 
@@ -63,7 +63,7 @@ void sfSoundBufferRecorder_stop(sfSoundBufferRecorder* soundBufferRecorder)
 unsigned int sfSoundBufferRecorder_getSampleRate(const sfSoundBufferRecorder* soundBufferRecorder)
 {
     assert(soundBufferRecorder);
-    return soundBufferRecorder->This.getSampleRate();
+    return soundBufferRecorder->getSampleRate();
 }
 
 
@@ -72,7 +72,7 @@ const sfSoundBuffer* sfSoundBufferRecorder_getBuffer(const sfSoundBufferRecorder
 {
     assert(soundBufferRecorder);
 
-    soundBufferRecorder->SoundBuffer.This = soundBufferRecorder->This.getBuffer();
+    soundBufferRecorder->SoundBuffer = sfSoundBuffer{soundBufferRecorder->getBuffer(), {}};
 
     return &soundBufferRecorder->SoundBuffer;
 }
@@ -82,7 +82,7 @@ bool sfSoundBufferRecorder_setDevice(sfSoundBufferRecorder* soundBufferRecorder,
 {
     assert(soundBufferRecorder);
     assert(name);
-    return soundBufferRecorder->This.setDevice(name);
+    return soundBufferRecorder->setDevice(name);
 }
 
 ////////////////////////////////////////////////////////////
@@ -90,7 +90,7 @@ const char* sfSoundBufferRecorder_getDevice(sfSoundBufferRecorder* soundBufferRe
 {
     assert(soundBufferRecorder);
 
-    soundBufferRecorder->DeviceName = soundBufferRecorder->This.getDevice();
+    soundBufferRecorder->DeviceName = soundBufferRecorder->getDevice();
 
     return soundBufferRecorder->DeviceName.c_str();
 }
@@ -100,7 +100,7 @@ const char* sfSoundBufferRecorder_getDevice(sfSoundBufferRecorder* soundBufferRe
 void sfSoundBufferRecorder_setChannelCount(sfSoundBufferRecorder* soundBufferRecorder, unsigned int channelCount)
 {
     assert(soundBufferRecorder);
-    soundBufferRecorder->This.setChannelCount(channelCount);
+    soundBufferRecorder->setChannelCount(channelCount);
 }
 
 
@@ -108,5 +108,5 @@ void sfSoundBufferRecorder_setChannelCount(sfSoundBufferRecorder* soundBufferRec
 unsigned int sfSoundBufferRecorder_getChannelCount(const sfSoundBufferRecorder* soundBufferRecorder)
 {
     assert(soundBufferRecorder);
-    return soundBufferRecorder->This.getChannelCount();
+    return soundBufferRecorder->getChannelCount();
 }

src/CSFML/Audio/SoundBufferRecorderStruct.hpp

@@ -35,9 +35,8 @@
 ////////////////////////////////////////////////////////////
 // Internal structure of sfSoundBufferRecorder
 ////////////////////////////////////////////////////////////
-struct sfSoundBufferRecorder
+struct sfSoundBufferRecorder : sf::SoundBufferRecorder
 {
-    sf::SoundBufferRecorder This;
-    mutable sfSoundBuffer   SoundBuffer;
-    std::string             DeviceName;
+    mutable sfSoundBuffer SoundBuffer;
+    std::string           DeviceName;
 };

src/CSFML/Audio/SoundBufferStruct.hpp

@@ -35,8 +35,7 @@
 ////////////////////////////////////////////////////////////
 // Internal structure of sfSoundBuffer
 ////////////////////////////////////////////////////////////
-struct sfSoundBuffer
+struct sfSoundBuffer : sf::SoundBuffer
 {
-    sf::SoundBuffer                     This;
     mutable std::vector<sfSoundChannel> Channels;
 };

src/CSFML/Audio/SoundRecorder.cpp

@@ -38,7 +38,7 @@ sfSoundRecorder* sfSoundRecorder_create(sfSoundRecorderStartCallback   onStart,
                                         sfSoundRecorderStopCallback    onStop,
                                         void*                          userData)
 {
-    return new sfSoundRecorder{{onStart, onProcess, onStop, userData}, {}, ""};
+    return new sfSoundRecorder(onStart, onProcess, onStop, userData);
 }
 
 
@@ -53,7 +53,7 @@ void sfSoundRecorder_destroy(const sfSoundRecorder* soundRecorder)
 bool sfSoundRecorder_start(sfSoundRecorder* soundRecorder, unsigned int sampleRate)
 {
     assert(soundRecorder);
-    return soundRecorder->This.start(sampleRate);
+    return soundRecorder->start(sampleRate);
 }
 
 
@@ -61,7 +61,7 @@ bool sfSoundRecorder_start(sfSoundRecorder* soundRecorder, unsigned int sampleRa
 void sfSoundRecorder_stop(sfSoundRecorder* soundRecorder)
 {
     assert(soundRecorder);
-    soundRecorder->This.stop();
+    soundRecorder->stop();
 }
 
 
@@ -69,7 +69,7 @@ void sfSoundRecorder_stop(sfSoundRecorder* soundRecorder)
 unsigned int sfSoundRecorder_getSampleRate(const sfSoundRecorder* soundRecorder)
 {
     assert(soundRecorder);
-    return soundRecorder->This.getSampleRate();
+    return soundRecorder->getSampleRate();
 }
 
 
@@ -115,7 +115,7 @@ bool sfSoundRecorder_setDevice(sfSoundRecorder* soundRecorder, const char* name)
 {
     assert(soundRecorder);
     assert(name);
-    return soundRecorder->This.setDevice(name);
+    return soundRecorder->setDevice(name);
 }
 
 
@@ -124,7 +124,7 @@ const char* sfSoundRecorder_getDevice(sfSoundRecorder* soundRecorder)
 {
     assert(soundRecorder);
 
-    soundRecorder->DeviceName = soundRecorder->This.getDevice();
+    soundRecorder->DeviceName = soundRecorder->getDevice();
 
     return soundRecorder->DeviceName.c_str();
 }
@@ -134,7 +134,7 @@ const char* sfSoundRecorder_getDevice(sfSoundRecorder* soundRecorder)
 void sfSoundRecorder_setChannelCount(sfSoundRecorder* soundRecorder, unsigned int channelCount)
 {
     assert(soundRecorder);
-    soundRecorder->This.setChannelCount(channelCount);
+    soundRecorder->setChannelCount(channelCount);
 }
 
 
@@ -142,7 +142,7 @@ void sfSoundRecorder_setChannelCount(sfSoundRecorder* soundRecorder, unsigned in
 unsigned int sfSoundRecorder_getChannelCount(const sfSoundRecorder* soundRecorder)
 {
     assert(soundRecorder);
-    return soundRecorder->This.getChannelCount();
+    return soundRecorder->getChannelCount();
 }
 
 
@@ -152,7 +152,7 @@ sfSoundChannel* sfSoundRecorder_getChannelMap(const sfSoundRecorder* soundRecord
     assert(soundRecorder);
     assert(count);
 
-    const auto channels = soundRecorder->This.getChannelMap();
+    const auto channels = soundRecorder->getChannelMap();
 
     soundRecorder->Channels.resize(channels.size());
     std::memcpy(soundRecorder->Channels.data(), channels.data(), sizeof(sfSoundChannel) * channels.size());

src/CSFML/Audio/SoundRecorderStruct.hpp

@@ -33,16 +33,15 @@
 
 
 ////////////////////////////////////////////////////////////
-// Helper class implementing the callback forwarding from
-// C++ to C in sfSoundRecorder
+// Internal structure of sfSoundRecorder
 ////////////////////////////////////////////////////////////
-class sfSoundRecorderImpl : public sf::SoundRecorder
+struct sfSoundRecorder : sf::SoundRecorder
 {
 public:
-    sfSoundRecorderImpl(sfSoundRecorderStartCallback   onStart,
-                        sfSoundRecorderProcessCallback onProcess,
-                        sfSoundRecorderStopCallback    onStop,
-                        void*                          userData) :
+    sfSoundRecorder(sfSoundRecorderStartCallback   onStart,
+                    sfSoundRecorderProcessCallback onProcess,
+                    sfSoundRecorderStopCallback    onStop,
+                    void*                          userData) :
     myStartCallback(onStart),
     myProcessCallback(onProcess),
     myStopCallback(onStop),
@@ -50,6 +49,9 @@ public:
     {
     }
 
+    mutable std::vector<sfSoundChannel> Channels;
+    std::string                         DeviceName;
+
 private:
     bool onStart() override
     {
@@ -78,14 +80,3 @@ private:
     sfSoundRecorderStopCallback    myStopCallback;
     void*                          myUserData;
 };
-
-
-////////////////////////////////////////////////////////////
-// Internal structure of sfSoundRecorder
-////////////////////////////////////////////////////////////
-struct sfSoundRecorder
-{
-    sfSoundRecorderImpl                 This;
-    mutable std::vector<sfSoundChannel> Channels;
-    std::string                         DeviceName;
-};

src/CSFML/Audio/SoundStream.cpp

@@ -43,7 +43,7 @@ sfSoundStream* sfSoundStream_create(
     size_t                       channelMapSize,
     void*                        userData)
 {
-    return new sfSoundStream{{onGetData, onSeek, channelCount, sampleRate, channelMapData, channelMapSize, userData}, {}};
+    return new sfSoundStream{onGetData, onSeek, channelCount, sampleRate, channelMapData, channelMapSize, userData};
 }
 
 
@@ -58,7 +58,7 @@ void sfSoundStream_destroy(const sfSoundStream* soundStream)
 void sfSoundStream_play(sfSoundStream* soundStream)
 {
     assert(soundStream);
-    soundStream->This.play();
+    soundStream->play();
 }
 
 
@@ -66,7 +66,7 @@ void sfSoundStream_play(sfSoundStream* soundStream)
 void sfSoundStream_pause(sfSoundStream* soundStream)
 {
     assert(soundStream);
-    soundStream->This.pause();
+    soundStream->pause();
 }
 
 
@@ -74,7 +74,7 @@ void sfSoundStream_pause(sfSoundStream* soundStream)
 void sfSoundStream_stop(sfSoundStream* soundStream)
 {
     assert(soundStream);
-    soundStream->This.stop();
+    soundStream->stop();
 }
 
 
@@ -82,7 +82,7 @@ void sfSoundStream_stop(sfSoundStream* soundStream)
 sfSoundStatus sfSoundStream_getStatus(const sfSoundStream* soundStream)
 {
     assert(soundStream);
-    return static_cast<sfSoundStatus>(soundStream->This.getStatus());
+    return static_cast<sfSoundStatus>(soundStream->getStatus());
 }
 
 
@@ -90,7 +90,7 @@ sfSoundStatus sfSoundStream_getStatus(const sfSoundStream* soundStream)
 unsigned int sfSoundStream_getChannelCount(const sfSoundStream* soundStream)
 {
     assert(soundStream);
-    return soundStream->This.getChannelCount();
+    return soundStream->getChannelCount();
 }
 
 
@@ -98,7 +98,7 @@ unsigned int sfSoundStream_getChannelCount(const sfSoundStream* soundStream)
 unsigned int sfSoundStream_getSampleRate(const sfSoundStream* soundStream)
 {
     assert(soundStream);
-    return soundStream->This.getSampleRate();
+    return soundStream->getSampleRate();
 }
 
 
@@ -108,7 +108,7 @@ sfSoundChannel* sfSoundStream_getChannelMap(const sfSoundStream* soundStream, si
     assert(soundStream);
     assert(count);
 
-    const auto channels = soundStream->This.getChannelMap();
+    const auto channels = soundStream->getChannelMap();
 
     soundStream->Channels.resize(channels.size());
     std::memcpy(soundStream->Channels.data(), channels.data(), sizeof(sfSoundChannel) * channels.size());
@@ -122,7 +122,7 @@ sfSoundChannel* sfSoundStream_getChannelMap(const sfSoundStream* soundStream, si
 void sfSoundStream_setPitch(sfSoundStream* soundStream, float pitch)
 {
     assert(soundStream);
-    soundStream->This.setPitch(pitch);
+    soundStream->setPitch(pitch);
 }
 
 
@@ -130,7 +130,7 @@ void sfSoundStream_setPitch(sfSoundStream* soundStream, float pitch)
 void sfSoundStream_setPan(sfSoundStream* soundStream, float pan)
 {
     assert(soundStream);
-    soundStream->This.setPan(pan);
+    soundStream->setPan(pan);
 }
 
 
@@ -138,7 +138,7 @@ void sfSoundStream_setPan(sfSoundStream* soundStream, float pan)
 void sfSoundStream_setVolume(sfSoundStream* soundStream, float volume)
 {
     assert(soundStream);
-    soundStream->This.setVolume(volume);
+    soundStream->setVolume(volume);
 }
 
 
@@ -146,7 +146,7 @@ void sfSoundStream_setVolume(sfSoundStream* soundStream, float volume)
 void sfSoundStream_setSpatializationEnabled(sfSoundStream* soundStream, bool enabled)
 {
     assert(soundStream);
-    soundStream->This.setSpatializationEnabled(enabled);
+    soundStream->setSpatializationEnabled(enabled);
 }
 
 
@@ -154,7 +154,7 @@ void sfSoundStream_setSpatializationEnabled(sfSoundStream* soundStream, bool ena
 void sfSoundStream_setPosition(sfSoundStream* soundStream, sfVector3f position)
 {
     assert(soundStream);
-    soundStream->This.setPosition(convertVector3(position));
+    soundStream->setPosition(convertVector3(position));
 }
 
 
@@ -162,7 +162,7 @@ void sfSoundStream_setPosition(sfSoundStream* soundStream, sfVector3f position)
 void sfSoundStream_setDirection(sfSoundStream* soundStream, sfVector3f position)
 {
     assert(soundStream);
-    soundStream->This.setDirection(convertVector3(position));
+    soundStream->setDirection(convertVector3(position));
 }
 
 
@@ -170,7 +170,7 @@ void sfSoundStream_setDirection(sfSoundStream* soundStream, sfVector3f position)
 void sfSoundStream_setCone(sfSoundStream* soundStream, sfSoundSourceCone cone)
 {
     assert(soundStream);
-    soundStream->This.setCone(convertCone(cone));
+    soundStream->setCone(convertCone(cone));
 }
 
 
@@ -178,7 +178,7 @@ void sfSoundStream_setCone(sfSoundStream* soundStream, sfSoundSourceCone cone)
 void sfSoundStream_setVelocity(sfSoundStream* soundStream, sfVector3f velocity)
 {
     assert(soundStream);
-    soundStream->This.setVelocity(convertVector3(velocity));
+    soundStream->setVelocity(convertVector3(velocity));
 }
 
 
@@ -186,7 +186,7 @@ void sfSoundStream_setVelocity(sfSoundStream* soundStream, sfVector3f velocity)
 void sfSoundStream_setDopplerFactor(sfSoundStream* soundStream, float factor)
 {
     assert(soundStream);
-    soundStream->This.setDopplerFactor(factor);
+    soundStream->setDopplerFactor(factor);
 }
 
 
@@ -194,7 +194,7 @@ void sfSoundStream_setDopplerFactor(sfSoundStream* soundStream, float factor)
 void sfSoundStream_setDirectionalAttenuationFactor(sfSoundStream* soundStream, float factor)
 {
     assert(soundStream);
-    soundStream->This.setDirectionalAttenuationFactor(factor);
+    soundStream->setDirectionalAttenuationFactor(factor);
 }
 
 
@@ -202,7 +202,7 @@ void sfSoundStream_setDirectionalAttenuationFactor(sfSoundStream* soundStream, f
 void sfSoundStream_setRelativeToListener(sfSoundStream* soundStream, bool relative)
 {
     assert(soundStream);
-    soundStream->This.setRelativeToListener(relative);
+    soundStream->setRelativeToListener(relative);
 }
 
 
@@ -210,7 +210,7 @@ void sfSoundStream_setRelativeToListener(sfSoundStream* soundStream, bool relati
 void sfSoundStream_setMinDistance(sfSoundStream* soundStream, float distance)
 {
     assert(soundStream);
-    soundStream->This.setMinDistance(distance);
+    soundStream->setMinDistance(distance);
 }
 
 
@@ -218,7 +218,7 @@ void sfSoundStream_setMinDistance(sfSoundStream* soundStream, float distance)
 void sfSoundStream_setMaxDistance(sfSoundStream* soundStream, float distance)
 {
     assert(soundStream);
-    soundStream->This.setMaxDistance(distance);
+    soundStream->setMaxDistance(distance);
 }
 
 
@@ -226,7 +226,7 @@ void sfSoundStream_setMaxDistance(sfSoundStream* soundStream, float distance)
 void sfSoundStream_setMinGain(sfSoundStream* soundStream, float gain)
 {
     assert(soundStream);
-    soundStream->This.setMinGain(gain);
+    soundStream->setMinGain(gain);
 }
 
 
@@ -234,7 +234,7 @@ void sfSoundStream_setMinGain(sfSoundStream* soundStream, float gain)
 void sfSoundStream_setMaxGain(sfSoundStream* soundStream, float gain)
 {
     assert(soundStream);
-    soundStream->This.setMaxGain(gain);
+    soundStream->setMaxGain(gain);
 }
 
 
@@ -242,7 +242,7 @@ void sfSoundStream_setMaxGain(sfSoundStream* soundStream, float gain)
 void sfSoundStream_setAttenuation(sfSoundStream* soundStream, float attenuation)
 {
     assert(soundStream);
-    soundStream->This.setAttenuation(attenuation);
+    soundStream->setAttenuation(attenuation);
 }
 
 
@@ -250,7 +250,7 @@ void sfSoundStream_setAttenuation(sfSoundStream* soundStream, float attenuation)
 void sfSoundStream_setPlayingOffset(sfSoundStream* soundStream, sfTime timeOffset)
 {
     assert(soundStream);
-    soundStream->This.setPlayingOffset(sf::microseconds(timeOffset.microseconds));
+    soundStream->setPlayingOffset(sf::microseconds(timeOffset.microseconds));
 }
 
 
@@ -258,7 +258,7 @@ void sfSoundStream_setPlayingOffset(sfSoundStream* soundStream, sfTime timeOffse
 void sfSoundStream_setLooping(sfSoundStream* soundStream, bool loop)
 {
     assert(soundStream);
-    soundStream->This.setLooping(loop);
+    soundStream->setLooping(loop);
 }
 
 
@@ -266,7 +266,7 @@ void sfSoundStream_setLooping(sfSoundStream* soundStream, bool loop)
 float sfSoundStream_getPitch(const sfSoundStream* soundStream)
 {
     assert(soundStream);
-    return soundStream->This.getPitch();
+    return soundStream->getPitch();
 }
 
 
@@ -274,7 +274,7 @@ float sfSoundStream_getPitch(const sfSoundStream* soundStream)
 float sfSoundStream_getPan(const sfSoundStream* soundStream)
 {
     assert(soundStream);
-    return soundStream->This.getPan();
+    return soundStream->getPan();
 }
 
 
@@ -282,7 +282,7 @@ float sfSoundStream_getPan(const sfSoundStream* soundStream)
 float sfSoundStream_getVolume(const sfSoundStream* soundStream)
 {
     assert(soundStream);
-    return soundStream->This.getVolume();
+    return soundStream->getVolume();
 }
 
 
@@ -290,7 +290,7 @@ float sfSoundStream_getVolume(const sfSoundStream* soundStream)
 bool sfSoundStream_isSpatializationEnabled(const sfSoundStream* soundStream)
 {
     assert(soundStream);
-    return soundStream->This.isSpatializationEnabled();
+    return soundStream->isSpatializationEnabled();
 }
 
 
@@ -298,7 +298,7 @@ bool sfSoundStream_isSpatializationEnabled(const sfSoundStream* soundStream)
 sfVector3f sfSoundStream_getPosition(const sfSoundStream* soundStream)
 {
     assert(soundStream);
-    return convertVector3(soundStream->This.getPosition());
+    return convertVector3(soundStream->getPosition());
 }
 
 
@@ -306,7 +306,7 @@ sfVector3f sfSoundStream_getPosition(const sfSoundStream* soundStream)
 sfVector3f sfSoundStream_getDirection(const sfSoundStream* soundStream)
 {
     assert(soundStream);
-    return convertVector3(soundStream->This.getDirection());
+    return convertVector3(soundStream->getDirection());
 }
 
 
@@ -314,7 +314,7 @@ sfVector3f sfSoundStream_getDirection(const sfSoundStream* soundStream)
 sfSoundSourceCone sfSoundStream_getCone(const sfSoundStream* soundStream)
 {
     assert(soundStream);
-    return convertCone(soundStream->This.getCone());
+    return convertCone(soundStream->getCone());
 }
 
 
@@ -322,7 +322,7 @@ sfSoundSourceCone sfSoundStream_getCone(const sfSoundStream* soundStream)
 sfVector3f sfSoundStream_getVelocity(const sfSoundStream* soundStream)
 {
     assert(soundStream);
-    return convertVector3(soundStream->This.getVelocity());
+    return convertVector3(soundStream->getVelocity());
 }
 
 
@@ -330,7 +330,7 @@ sfVector3f sfSoundStream_getVelocity(const sfSoundStream* soundStream)
 float sfSoundStream_getDopplerFactor(const sfSoundStream* soundStream)
 {
     assert(soundStream);
-    return soundStream->This.getDopplerFactor();
+    return soundStream->getDopplerFactor();
 }
 
 
@@ -338,7 +338,7 @@ float sfSoundStream_getDopplerFactor(const sfSoundStream* soundStream)
 float sfSoundStream_getDirectionalAttenuationFactor(const sfSoundStream* soundStream)
 {
     assert(soundStream);
-    return soundStream->This.getDirectionalAttenuationFactor();
+    return soundStream->getDirectionalAttenuationFactor();
 }
 
 
@@ -346,7 +346,7 @@ float sfSoundStream_getDirectionalAttenuationFactor(const sfSoundStream* soundSt
 bool sfSoundStream_isRelativeToListener(const sfSoundStream* soundStream)
 {
     assert(soundStream);
-    return soundStream->This.isRelativeToListener();
+    return soundStream->isRelativeToListener();
 }
 
 
@@ -354,7 +354,7 @@ bool sfSoundStream_isRelativeToListener(const sfSoundStream* soundStream)
 float sfSoundStream_getMinDistance(const sfSoundStream* soundStream)
 {
     assert(soundStream);
-    return soundStream->This.getMinDistance();
+    return soundStream->getMinDistance();
 }
 
 
@@ -362,7 +362,7 @@ float sfSoundStream_getMinDistance(const sfSoundStream* soundStream)
 float sfSoundStream_getMaxDistance(const sfSoundStream* soundStream)
 {
     assert(soundStream);
-    return soundStream->This.getMaxDistance();
+    return soundStream->getMaxDistance();
 }
 
 
@@ -370,7 +370,7 @@ float sfSoundStream_getMaxDistance(const sfSoundStream* soundStream)
 float sfSoundStream_getMinGain(const sfSoundStream* soundStream)
 {
     assert(soundStream);
-    return soundStream->This.getMinGain();
+    return soundStream->getMinGain();
 }
 
 
@@ -378,7 +378,7 @@ float sfSoundStream_getMinGain(const sfSoundStream* soundStream)
 float sfSoundStream_getMaxGain(const sfSoundStream* soundStream)
 {
     assert(soundStream);
-    return soundStream->This.getMaxGain();
+    return soundStream->getMaxGain();
 }
 
 
@@ -386,7 +386,7 @@ float sfSoundStream_getMaxGain(const sfSoundStream* soundStream)
 float sfSoundStream_getAttenuation(const sfSoundStream* soundStream)
 {
     assert(soundStream);
-    return soundStream->This.getAttenuation();
+    return soundStream->getAttenuation();
 }
 
 
@@ -394,7 +394,7 @@ float sfSoundStream_getAttenuation(const sfSoundStream* soundStream)
 bool sfSoundStream_isLooping(const sfSoundStream* soundStream)
 {
     assert(soundStream);
-    return soundStream->This.isLooping();
+    return soundStream->isLooping();
 }
 
 
@@ -405,11 +405,11 @@ void sfSoundStream_setEffectProcessor(sfSoundStream* soundStream, sfEffectProces
 
     if (!effectProcessor)
     {
-        soundStream->This.setEffectProcessor(nullptr);
+        soundStream->setEffectProcessor(nullptr);
     }
     else
     {
-        soundStream->This.setEffectProcessor(
+        soundStream->setEffectProcessor(
             [effectProcessor](const float*  inputFrames,
                               unsigned int& inputFrameCount,
                               float*        outputFrames,
@@ -424,5 +424,5 @@ void sfSoundStream_setEffectProcessor(sfSoundStream* soundStream, sfEffectProces
 sfTime sfSoundStream_getPlayingOffset(const sfSoundStream* soundStream)
 {
     assert(soundStream);
-    return {soundStream->This.getPlayingOffset().asMicroseconds()};
+    return {soundStream->getPlayingOffset().asMicroseconds()};
 }

src/CSFML/Audio/SoundStreamStruct.hpp

@@ -33,19 +33,18 @@
 
 
 ////////////////////////////////////////////////////////////
-// Helper class implementing the callback forwarding from
-// C++ to C in sfSoundStream
+// Internal structure of sfSoundStream
 ////////////////////////////////////////////////////////////
-class sfSoundStreamImpl : public sf::SoundStream
+struct sfSoundStream : sf::SoundStream
 {
 public:
-    sfSoundStreamImpl(sfSoundStreamGetDataCallback onGetData,
-                      sfSoundStreamSeekCallback    onSeek,
-                      unsigned int                 channelCount,
-                      unsigned int                 sampleRate,
-                      sfSoundChannel*              channelMapData,
-                      size_t                       channelMapSize,
-                      void*                        userData) :
+    sfSoundStream(sfSoundStreamGetDataCallback onGetData,
+                  sfSoundStreamSeekCallback    onSeek,
+                  unsigned int                 channelCount,
+                  unsigned int                 sampleRate,
+                  sfSoundChannel*              channelMapData,
+                  size_t                       channelMapSize,
+                  void*                        userData) :
     myGetDataCallback(onGetData),
     mySeekCallback(onSeek),
     myUserData(userData)
@@ -56,6 +55,8 @@ public:
         initialize(channelCount, sampleRate, channelMap);
     }
 
+    mutable std::vector<sfSoundChannel> Channels;
+
 private:
     bool onGetData(Chunk& data) override
     {
@@ -81,13 +82,3 @@ private:
     sfSoundStreamSeekCallback    mySeekCallback;
     void*                        myUserData;
 };
-
-
-////////////////////////////////////////////////////////////
-// Internal structure of sfSoundStream
-////////////////////////////////////////////////////////////
-struct sfSoundStream
-{
-    sfSoundStreamImpl                   This;
-    mutable std::vector<sfSoundChannel> Channels;
-};

src/CSFML/Audio/SoundStruct.hpp

@@ -35,8 +35,8 @@
 ////////////////////////////////////////////////////////////
 // Internal structure of sfSound
 ////////////////////////////////////////////////////////////
-struct sfSound
+struct sfSound : sf::Sound
 {
-    sf::Sound            This;
-    const sfSoundBuffer* Buffer;
+    using sf::Sound::Sound;
+    const sfSoundBuffer* Buffer{};
 };

src/CSFML/Graphics/CircleShape.cpp

@@ -64,7 +64,7 @@ void sfCircleShape_destroy(const sfCircleShape* shape)
 void sfCircleShape_setPosition(sfCircleShape* shape, sfVector2f position)
 {
     assert(shape);
-    shape->This.setPosition(convertVector2(position));
+    shape->setPosition(convertVector2(position));
 }
 
 
@@ -72,7 +72,7 @@ void sfCircleShape_setPosition(sfCircleShape* shape, sfVector2f position)
 void sfCircleShape_setRotation(sfCircleShape* shape, float angle)
 {
     assert(shape);
-    shape->This.setRotation(sf::degrees(angle));
+    shape->setRotation(sf::degrees(angle));
 }
 
 
@@ -80,7 +80,7 @@ void sfCircleShape_setRotation(sfCircleShape* shape, float angle)
 void sfCircleShape_setScale(sfCircleShape* shape, sfVector2f scale)
 {
     assert(shape);
-    shape->This.setScale(convertVector2(scale));
+    shape->setScale(convertVector2(scale));
 }
 
 
@@ -88,7 +88,7 @@ void sfCircleShape_setScale(sfCircleShape* shape, sfVector2f scale)
 void sfCircleShape_setOrigin(sfCircleShape* shape, sfVector2f origin)
 {
     assert(shape);
-    shape->This.setOrigin(convertVector2(origin));
+    shape->setOrigin(convertVector2(origin));
 }
 
 
@@ -96,7 +96,7 @@ void sfCircleShape_setOrigin(sfCircleShape* shape, sfVector2f origin)
 sfVector2f sfCircleShape_getPosition(const sfCircleShape* shape)
 {
     assert(shape);
-    return convertVector2(shape->This.getPosition());
+    return convertVector2(shape->getPosition());
 }
 
 
@@ -104,7 +104,7 @@ sfVector2f sfCircleShape_getPosition(const sfCircleShape* shape)
 float sfCircleShape_getRotation(const sfCircleShape* shape)
 {
     assert(shape);
-    return shape->This.getRotation().asDegrees();
+    return shape->getRotation().asDegrees();
 }
 
 
@@ -112,7 +112,7 @@ float sfCircleShape_getRotation(const sfCircleShape* shape)
 sfVector2f sfCircleShape_getScale(const sfCircleShape* shape)
 {
     assert(shape);
-    return convertVector2(shape->This.getScale());
+    return convertVector2(shape->getScale());
 }
 
 
@@ -120,7 +120,7 @@ sfVector2f sfCircleShape_getScale(const sfCircleShape* shape)
 sfVector2f sfCircleShape_getOrigin(const sfCircleShape* shape)
 {
     assert(shape);
-    return convertVector2(shape->This.getOrigin());
+    return convertVector2(shape->getOrigin());
 }
 
 
@@ -128,7 +128,7 @@ sfVector2f sfCircleShape_getOrigin(const sfCircleShape* shape)
 void sfCircleShape_move(sfCircleShape* shape, sfVector2f offset)
 {
     assert(shape);
-    shape->This.move(convertVector2(offset));
+    shape->move(convertVector2(offset));
 }
 
 
@@ -136,7 +136,7 @@ void sfCircleShape_move(sfCircleShape* shape, sfVector2f offset)
 void sfCircleShape_rotate(sfCircleShape* shape, float angle)
 {
     assert(shape);
-    shape->This.rotate(sf::degrees(angle));
+    shape->rotate(sf::degrees(angle));
 }
 
 
@@ -144,7 +144,7 @@ void sfCircleShape_rotate(sfCircleShape* shape, float angle)
 void sfCircleShape_scale(sfCircleShape* shape, sfVector2f factors)
 {
     assert(shape);
-    shape->This.scale(convertVector2(factors));
+    shape->scale(convertVector2(factors));
 }
 
 
@@ -152,7 +152,7 @@ void sfCircleShape_scale(sfCircleShape* shape, sfVector2f factors)
 sfTransform sfCircleShape_getTransform(const sfCircleShape* shape)
 {
     assert(shape);
-    shape->Transform = convertTransform(shape->This.getTransform());
+    shape->Transform = convertTransform(shape->getTransform());
     return shape->Transform;
 }
 
@@ -161,7 +161,7 @@ sfTransform sfCircleShape_getTransform(const sfCircleShape* shape)
 sfTransform sfCircleShape_getInverseTransform(const sfCircleShape* shape)
 {
     assert(shape);
-    shape->InverseTransform = convertTransform(shape->This.getInverseTransform());
+    shape->InverseTransform = convertTransform(shape->getInverseTransform());
     return shape->InverseTransform;
 }
 
@@ -170,7 +170,7 @@ sfTransform sfCircleShape_getInverseTransform(const sfCircleShape* shape)
 void sfCircleShape_setTexture(sfCircleShape* shape, const sfTexture* texture, bool resetRect)
 {
     assert(shape);
-    shape->This.setTexture(texture ? texture->This : nullptr, resetRect);
+    shape->setTexture(texture ? texture->This : nullptr, resetRect);
     shape->Texture = texture;
 }
 
@@ -179,7 +179,7 @@ void sfCircleShape_setTexture(sfCircleShape* shape, const sfTexture* texture, bo
 void sfCircleShape_setTextureRect(sfCircleShape* shape, sfIntRect rect)
 {
     assert(shape);
-    shape->This.setTextureRect(convertRect(rect));
+    shape->setTextureRect(convertRect(rect));
 }
 
 
@@ -187,7 +187,7 @@ void sfCircleShape_setTextureRect(sfCircleShape* shape, sfIntRect rect)
 void sfCircleShape_setFillColor(sfCircleShape* shape, sfColor color)
 {
     assert(shape);
-    shape->This.setFillColor(convertColor(color));
+    shape->setFillColor(convertColor(color));
 }
 
 
@@ -195,7 +195,7 @@ void sfCircleShape_setFillColor(sfCircleShape* shape, sfColor color)
 void sfCircleShape_setOutlineColor(sfCircleShape* shape, sfColor color)
 {
     assert(shape);
-    shape->This.setOutlineColor(convertColor(color));
+    shape->setOutlineColor(convertColor(color));
 }
 
 
@@ -203,7 +203,7 @@ void sfCircleShape_setOutlineColor(sfCircleShape* shape, sfColor color)
 void sfCircleShape_setOutlineThickness(sfCircleShape* shape, float thickness)
 {
     assert(shape);
-    shape->This.setOutlineThickness(thickness);
+    shape->setOutlineThickness(thickness);
 }
 
 
@@ -219,7 +219,7 @@ const sfTexture* sfCircleShape_getTexture(const sfCircleShape* shape)
 sfIntRect sfCircleShape_getTextureRect(const sfCircleShape* shape)
 {
     assert(shape);
-    return convertRect(shape->This.getTextureRect());
+    return convertRect(shape->getTextureRect());
 }
 
 
@@ -227,7 +227,7 @@ sfIntRect sfCircleShape_getTextureRect(const sfCircleShape* shape)
 sfColor sfCircleShape_getFillColor(const sfCircleShape* shape)
 {
     assert(shape);
-    return convertColor(shape->This.getFillColor());
+    return convertColor(shape->getFillColor());
 }
 
 
@@ -235,7 +235,7 @@ sfColor sfCircleShape_getFillColor(const sfCircleShape* shape)
 sfColor sfCircleShape_getOutlineColor(const sfCircleShape* shape)
 {
     assert(shape);
-    return convertColor(shape->This.getOutlineColor());
+    return convertColor(shape->getOutlineColor());
 }
 
 
@@ -243,7 +243,7 @@ sfColor sfCircleShape_getOutlineColor(const sfCircleShape* shape)
 float sfCircleShape_getOutlineThickness(const sfCircleShape* shape)
 {
     assert(shape);
-    return shape->This.getOutlineThickness();
+    return shape->getOutlineThickness();
 }
 
 
@@ -251,7 +251,7 @@ float sfCircleShape_getOutlineThickness(const sfCircleShape* shape)
 size_t sfCircleShape_getPointCount(const sfCircleShape* shape)
 {
     assert(shape);
-    return shape->This.getPointCount();
+    return shape->getPointCount();
 }
 
 
@@ -259,7 +259,7 @@ size_t sfCircleShape_getPointCount(const sfCircleShape* shape)
 sfVector2f sfCircleShape_getPoint(const sfCircleShape* shape, size_t index)
 {
     assert(shape);
-    return convertVector2(shape->This.getPoint(index));
+    return convertVector2(shape->getPoint(index));
 }
 
 
@@ -267,7 +267,7 @@ sfVector2f sfCircleShape_getPoint(const sfCircleShape* shape, size_t index)
 sfVector2f sfCircleShape_getGeometricCenter(const sfCircleShape* shape)
 {
     assert(shape);
-    return convertVector2(shape->This.getGeometricCenter());
+    return convertVector2(shape->getGeometricCenter());
 }
 
 
@@ -275,7 +275,7 @@ sfVector2f sfCircleShape_getGeometricCenter(const sfCircleShape* shape)
 void sfCircleShape_setRadius(sfCircleShape* shape, float radius)
 {
     assert(shape);
-    shape->This.setRadius(radius);
+    shape->setRadius(radius);
 }
 
 
@@ -283,7 +283,7 @@ void sfCircleShape_setRadius(sfCircleShape* shape, float radius)
 float sfCircleShape_getRadius(const sfCircleShape* shape)
 {
     assert(shape);
-    return shape->This.getRadius();
+    return shape->getRadius();
 }
 
 
@@ -291,7 +291,7 @@ float sfCircleShape_getRadius(const sfCircleShape* shape)
 void sfCircleShape_setPointCount(sfCircleShape* shape, size_t count)
 {
     assert(shape);
-    shape->This.setPointCount(count);
+    shape->setPointCount(count);
 }
 
 
@@ -299,7 +299,7 @@ void sfCircleShape_setPointCount(sfCircleShape* shape, size_t count)
 sfFloatRect sfCircleShape_getLocalBounds(const sfCircleShape* shape)
 {
     assert(shape);
-    return convertRect(shape->This.getLocalBounds());
+    return convertRect(shape->getLocalBounds());
 }
 
 
@@ -307,5 +307,5 @@ sfFloatRect sfCircleShape_getLocalBounds(const sfCircleShape* shape)
 sfFloatRect sfCircleShape_getGlobalBounds(const sfCircleShape* shape)
 {
     assert(shape);
-    return convertRect(shape->This.getGlobalBounds());
+    return convertRect(shape->getGlobalBounds());
 }

src/CSFML/Graphics/CircleShapeStruct.hpp

@@ -36,9 +36,8 @@
 ////////////////////////////////////////////////////////////
 // Internal structure of sfCircleShape
 ////////////////////////////////////////////////////////////
-struct sfCircleShape
+struct sfCircleShape : sf::CircleShape
 {
-    sf::CircleShape     This;
     const sfTexture*    Texture{};
     mutable sfTransform Transform{};
     mutable sfTransform InverseTransform{};

src/CSFML/Graphics/ConvertRenderStates.hpp

@@ -52,6 +52,6 @@
     renderStates.blendMode.alphaEquation  = static_cast<sf::BlendMode::Equation>(states->blendMode.alphaEquation);
     renderStates.transform                = convertTransform(states->transform);
     renderStates.texture                  = states->texture ? states->texture->This : nullptr;
-    renderStates.shader                   = states->shader ? &states->shader->This : nullptr;
+    renderStates.shader                   = states->shader;
     return renderStates;
 }

src/CSFML/Graphics/ConvexShape.cpp

@@ -61,7 +61,7 @@ void sfConvexShape_destroy(const sfConvexShape* shape)
 void sfConvexShape_setPosition(sfConvexShape* shape, sfVector2f position)
 {
     assert(shape);
-    shape->This.setPosition(convertVector2(position));
+    shape->setPosition(convertVector2(position));
 }
 
 
@@ -69,7 +69,7 @@ void sfConvexShape_setPosition(sfConvexShape* shape, sfVector2f position)
 void sfConvexShape_setRotation(sfConvexShape* shape, float angle)
 {
     assert(shape);
-    shape->This.setRotation(sf::degrees(angle));
+    shape->setRotation(sf::degrees(angle));
 }
 
 
@@ -77,7 +77,7 @@ void sfConvexShape_setRotation(sfConvexShape* shape, float angle)
 void sfConvexShape_setScale(sfConvexShape* shape, sfVector2f scale)
 {
     assert(shape);
-    shape->This.setScale(convertVector2(scale));
+    shape->setScale(convertVector2(scale));
 }
 
 
@@ -85,7 +85,7 @@ void sfConvexShape_setScale(sfConvexShape* shape, sfVector2f scale)
 void sfConvexShape_setOrigin(sfConvexShape* shape, sfVector2f origin)
 {
     assert(shape);
-    shape->This.setOrigin(convertVector2(origin));
+    shape->setOrigin(convertVector2(origin));
 }
 
 
@@ -93,7 +93,7 @@ void sfConvexShape_setOrigin(sfConvexShape* shape, sfVector2f origin)
 sfVector2f sfConvexShape_getPosition(const sfConvexShape* shape)
 {
     assert(shape);
-    return convertVector2(shape->This.getPosition());
+    return convertVector2(shape->getPosition());
 }
 
 
@@ -101,7 +101,7 @@ sfVector2f sfConvexShape_getPosition(const sfConvexShape* shape)
 float sfConvexShape_getRotation(const sfConvexShape* shape)
 {
     assert(shape);
-    return shape->This.getRotation().asDegrees();
+    return shape->getRotation().asDegrees();
 }
 
 
@@ -109,7 +109,7 @@ float sfConvexShape_getRotation(const sfConvexShape* shape)
 sfVector2f sfConvexShape_getScale(const sfConvexShape* shape)
 {
     assert(shape);
-    return convertVector2(shape->This.getScale());
+    return convertVector2(shape->getScale());
 }
 
 
@@ -117,7 +117,7 @@ sfVector2f sfConvexShape_getScale(const sfConvexShape* shape)
 sfVector2f sfConvexShape_getOrigin(const sfConvexShape* shape)
 {
     assert(shape);
-    return convertVector2(shape->This.getOrigin());
+    return convertVector2(shape->getOrigin());
 }
 
 
@@ -125,7 +125,7 @@ sfVector2f sfConvexShape_getOrigin(const sfConvexShape* shape)
 void sfConvexShape_move(sfConvexShape* shape, sfVector2f offset)
 {
     assert(shape);
-    shape->This.move(convertVector2(offset));
+    shape->move(convertVector2(offset));
 }
 
 
@@ -133,7 +133,7 @@ void sfConvexShape_move(sfConvexShape* shape, sfVector2f offset)
 void sfConvexShape_rotate(sfConvexShape* shape, float angle)
 {
     assert(shape);
-    shape->This.rotate(sf::degrees(angle));
+    shape->rotate(sf::degrees(angle));
 }
 
 
@@ -141,7 +141,7 @@ void sfConvexShape_rotate(sfConvexShape* shape, float angle)
 void sfConvexShape_scale(sfConvexShape* shape, sfVector2f factors)
 {
     assert(shape);
-    shape->This.scale(convertVector2(factors));
+    shape->scale(convertVector2(factors));
 }
 
 
@@ -149,7 +149,7 @@ void sfConvexShape_scale(sfConvexShape* shape, sfVector2f factors)
 sfTransform sfConvexShape_getTransform(const sfConvexShape* shape)
 {
     assert(shape);
-    shape->Transform = convertTransform(shape->This.getTransform());
+    shape->Transform = convertTransform(shape->getTransform());
     return shape->Transform;
 }
 
@@ -158,7 +158,7 @@ sfTransform sfConvexShape_getTransform(const sfConvexShape* shape)
 sfTransform sfConvexShape_getInverseTransform(const sfConvexShape* shape)
 {
     assert(shape);
-    shape->InverseTransform = convertTransform(shape->This.getInverseTransform());
+    shape->InverseTransform = convertTransform(shape->getInverseTransform());
     return shape->InverseTransform;
 }
 
@@ -167,7 +167,7 @@ sfTransform sfConvexShape_getInverseTransform(const sfConvexShape* shape)
 void sfConvexShape_setTexture(sfConvexShape* shape, const sfTexture* texture, bool resetRect)
 {
     assert(shape);
-    shape->This.setTexture(texture ? texture->This : nullptr, resetRect);
+    shape->setTexture(texture ? texture->This : nullptr, resetRect);
     shape->Texture = texture;
 }
 
@@ -176,7 +176,7 @@ void sfConvexShape_setTexture(sfConvexShape* shape, const sfTexture* texture, bo
 void sfConvexShape_setTextureRect(sfConvexShape* shape, sfIntRect rect)
 {
     assert(shape);
-    shape->This.setTextureRect(convertRect(rect));
+    shape->setTextureRect(convertRect(rect));
 }
 
 
@@ -184,7 +184,7 @@ void sfConvexShape_setTextureRect(sfConvexShape* shape, sfIntRect rect)
 void sfConvexShape_setFillColor(sfConvexShape* shape, sfColor color)
 {
     assert(shape);
-    shape->This.setFillColor(convertColor(color));
+    shape->setFillColor(convertColor(color));
 }
 
 
@@ -192,7 +192,7 @@ void sfConvexShape_setFillColor(sfConvexShape* shape, sfColor color)
 void sfConvexShape_setOutlineColor(sfConvexShape* shape, sfColor color)
 {
     assert(shape);
-    shape->This.setOutlineColor(convertColor(color));
+    shape->setOutlineColor(convertColor(color));
 }
 
 
@@ -200,7 +200,7 @@ void sfConvexShape_setOutlineColor(sfConvexShape* shape, sfColor color)
 void sfConvexShape_setOutlineThickness(sfConvexShape* shape, float thickness)
 {
     assert(shape);
-    shape->This.setOutlineThickness(thickness);
+    shape->setOutlineThickness(thickness);
 }
 
 
@@ -216,7 +216,7 @@ const sfTexture* sfConvexShape_getTexture(const sfConvexShape* shape)
 sfIntRect sfConvexShape_getTextureRect(const sfConvexShape* shape)
 {
     assert(shape);
-    return convertRect(shape->This.getTextureRect());
+    return convertRect(shape->getTextureRect());
 }
 
 
@@ -224,7 +224,7 @@ sfIntRect sfConvexShape_getTextureRect(const sfConvexShape* shape)
 sfColor sfConvexShape_getFillColor(const sfConvexShape* shape)
 {
     assert(shape);
-    return convertColor(shape->This.getFillColor());
+    return convertColor(shape->getFillColor());
 }
 
 
@@ -232,7 +232,7 @@ sfColor sfConvexShape_getFillColor(const sfConvexShape* shape)
 sfColor sfConvexShape_getOutlineColor(const sfConvexShape* shape)
 {
     assert(shape);
-    return convertColor(shape->This.getOutlineColor());
+    return convertColor(shape->getOutlineColor());
 }
 
 
@@ -240,7 +240,7 @@ sfColor sfConvexShape_getOutlineColor(const sfConvexShape* shape)
 float sfConvexShape_getOutlineThickness(const sfConvexShape* shape)
 {
     assert(shape);
-    return shape->This.getOutlineThickness();
+    return shape->getOutlineThickness();
 }
 
 
@@ -248,7 +248,7 @@ float sfConvexShape_getOutlineThickness(const sfConvexShape* shape)
 size_t sfConvexShape_getPointCount(const sfConvexShape* shape)
 {
     assert(shape);
-    return shape->This.getPointCount();
+    return shape->getPointCount();
 }
 
 
@@ -256,7 +256,7 @@ size_t sfConvexShape_getPointCount(const sfConvexShape* shape)
 sfVector2f sfConvexShape_getPoint(const sfConvexShape* shape, size_t index)
 {
     assert(shape);
-    return convertVector2(shape->This.getPoint(index));
+    return convertVector2(shape->getPoint(index));
 }
 
 
@@ -264,7 +264,7 @@ sfVector2f sfConvexShape_getPoint(const sfConvexShape* shape, size_t index)
 sfVector2f sfConvexShape_getGeometricCenter(const sfConvexShape* shape)
 {
     assert(shape);
-    return convertVector2(shape->This.getGeometricCenter());
+    return convertVector2(shape->getGeometricCenter());
 }
 
 
@@ -272,7 +272,7 @@ sfVector2f sfConvexShape_getGeometricCenter(const sfConvexShape* shape)
 void sfConvexShape_setPointCount(sfConvexShape* shape, size_t count)
 {
     assert(shape);
-    shape->This.setPointCount(count);
+    shape->setPointCount(count);
 }
 
 
@@ -280,7 +280,7 @@ void sfConvexShape_setPointCount(sfConvexShape* shape, size_t count)
 void sfConvexShape_setPoint(sfConvexShape* shape, size_t index, sfVector2f point)
 {
     assert(shape);
-    shape->This.setPoint(index, convertVector2(point));
+    shape->setPoint(index, convertVector2(point));
 }
 
 
@@ -288,7 +288,7 @@ void sfConvexShape_setPoint(sfConvexShape* shape, size_t index, sfVector2f point
 sfFloatRect sfConvexShape_getLocalBounds(const sfConvexShape* shape)
 {
     assert(shape);
-    return convertRect(shape->This.getLocalBounds());
+    return convertRect(shape->getLocalBounds());
 }
 
 
@@ -296,5 +296,5 @@ sfFloatRect sfConvexShape_getLocalBounds(const sfConvexShape* shape)
 sfFloatRect sfConvexShape_getGlobalBounds(const sfConvexShape* shape)
 {
     assert(shape);
-    return convertRect(shape->This.getGlobalBounds());
+    return convertRect(shape->getGlobalBounds());
 }

src/CSFML/Graphics/ConvexShapeStruct.hpp

@@ -36,9 +36,8 @@
 ////////////////////////////////////////////////////////////
 // Internal structure of sfConvexShape
 ////////////////////////////////////////////////////////////
-struct sfConvexShape
+struct sfConvexShape : sf::ConvexShape
 {
-    sf::ConvexShape     This;
     const sfTexture*    Texture{};
     mutable sfTransform Transform{};
     mutable sfTransform InverseTransform{};

src/CSFML/Graphics/Font.cpp

@@ -36,22 +36,22 @@ sfFont* sfFont_createFromFile(const char* filename)
 {
     assert(filename);
 
-    sf::Font font;
-    if (!font.openFromFile(filename))
+    auto font = std::make_unique<sfFont>();
+    if (!font->openFromFile(filename))
         return nullptr;
 
-    return new sfFont{std::move(font), {}, {}};
+    return font.release();
 }
 
 
 ////////////////////////////////////////////////////////////
 sfFont* sfFont_createFromMemory(const void* data, size_t sizeInBytes)
 {
-    sf::Font font;
-    if (!font.openFromMemory(data, sizeInBytes))
+    auto font = std::make_unique<sfFont>();
+    if (!font->openFromMemory(data, sizeInBytes))
         return nullptr;
 
-    return new sfFont{std::move(font), {}, {}};
+    return font.release();
 }
 
 
@@ -61,7 +61,7 @@ sfFont* sfFont_createFromStream(sfInputStream* stream)
     assert(stream);
 
     auto font = std::make_unique<sfFont>(sfFont{{}, {}, {stream}});
-    if (!font->This.openFromStream(font->Stream))
+    if (!font->openFromStream(font->Stream))
         return nullptr;
 
     return font.release();
@@ -88,7 +88,7 @@ sfGlyph sfFont_getGlyph(const sfFont* font, uint32_t codePoint, unsigned int cha
 {
     assert(font);
 
-    sf::Glyph sfmlGlyph = font->This.getGlyph(codePoint, characterSize, bold, outlineThickness);
+    sf::Glyph sfmlGlyph = font->getGlyph(codePoint, characterSize, bold, outlineThickness);
 
     sfGlyph glyph{};
     glyph.advance     = sfmlGlyph.advance;
@@ -103,7 +103,7 @@ sfGlyph sfFont_getGlyph(const sfFont* font, uint32_t codePoint, unsigned int cha
 bool sfFont_hasGlyph(const sfFont* font, uint32_t codePoint)
 {
     assert(font);
-    return font->This.hasGlyph(codePoint);
+    return font->hasGlyph(codePoint);
 }
 
 
@@ -111,7 +111,7 @@ bool sfFont_hasGlyph(const sfFont* font, uint32_t codePoint)
 float sfFont_getKerning(const sfFont* font, uint32_t first, uint32_t second, unsigned int characterSize)
 {
     assert(font);
-    return font->This.getKerning(first, second, characterSize);
+    return font->getKerning(first, second, characterSize);
 }
 
 
@@ -119,7 +119,7 @@ float sfFont_getKerning(const sfFont* font, uint32_t first, uint32_t second, uns
 float sfFont_getBoldKerning(const sfFont* font, uint32_t first, uint32_t second, unsigned int characterSize)
 {
     assert(font);
-    return font->This.getKerning(first, second, characterSize, true);
+    return font->getKerning(first, second, characterSize, true);
 }
 
 
@@ -127,7 +127,7 @@ float sfFont_getBoldKerning(const sfFont* font, uint32_t first, uint32_t second,
 float sfFont_getLineSpacing(const sfFont* font, unsigned int characterSize)
 {
     assert(font);
-    return font->This.getLineSpacing(characterSize);
+    return font->getLineSpacing(characterSize);
 }
 
 
@@ -135,7 +135,7 @@ float sfFont_getLineSpacing(const sfFont* font, unsigned int characterSize)
 float sfFont_getUnderlinePosition(const sfFont* font, unsigned int characterSize)
 {
     assert(font);
-    return font->This.getUnderlinePosition(characterSize);
+    return font->getUnderlinePosition(characterSize);
 }
 
 
@@ -143,7 +143,7 @@ float sfFont_getUnderlinePosition(const sfFont* font, unsigned int characterSize
 float sfFont_getUnderlineThickness(const sfFont* font, unsigned int characterSize)
 {
     assert(font);
-    return font->This.getUnderlineThickness(characterSize);
+    return font->getUnderlineThickness(characterSize);
 }
 
 
@@ -152,7 +152,7 @@ const sfTexture* sfFont_getTexture(sfFont* font, unsigned int characterSize)
 {
     assert(font);
 
-    *font->Textures[characterSize].This = font->This.getTexture(characterSize);
+    *font->Textures[characterSize].This = font->getTexture(characterSize);
 
     return &font->Textures[characterSize];
 }
@@ -162,7 +162,7 @@ const sfTexture* sfFont_getTexture(sfFont* font, unsigned int characterSize)
 void sfFont_setSmooth(sfFont* font, bool smooth)
 {
     assert(font);
-    font->This.setSmooth(smooth);
+    font->setSmooth(smooth);
 }
 
 
@@ -170,7 +170,7 @@ void sfFont_setSmooth(sfFont* font, bool smooth)
 bool sfFont_isSmooth(const sfFont* font)
 {
     assert(font);
-    return font->This.isSmooth();
+    return font->isSmooth();
 }
 
 
@@ -178,5 +178,5 @@ bool sfFont_isSmooth(const sfFont* font)
 sfFontInfo sfFont_getInfo(const sfFont* font)
 {
     assert(font);
-    return {font->This.getInfo().family.c_str()};
+    return {font->getInfo().family.c_str()};
 }

src/CSFML/Graphics/FontStruct.hpp

@@ -38,9 +38,8 @@
 ////////////////////////////////////////////////////////////
 // Internal structure of sfFont
 ////////////////////////////////////////////////////////////
-struct sfFont
+struct sfFont : sf::Font
 {
-    sf::Font                          This;
     std::map<unsigned int, sfTexture> Textures;
     CallbackStream                    Stream;
 };

src/CSFML/Graphics/Image.cpp

@@ -60,22 +60,22 @@ sfImage* sfImage_createFromFile(const char* filename)
 {
     assert(filename);
 
-    sf::Image image;
-    if (!image.loadFromFile(filename))
+    auto image = std::make_unique<sfImage>();
+    if (!image->loadFromFile(filename))
         return nullptr;
 
-    return new sfImage{std::move(image)};
+    return image.release();
 }
 
 
 ////////////////////////////////////////////////////////////
 sfImage* sfImage_createFromMemory(const void* data, size_t sizeInBytes)
 {
-    sf::Image image;
-    if (!image.loadFromMemory(data, sizeInBytes))
+    auto image = std::make_unique<sfImage>();
+    if (!image->loadFromMemory(data, sizeInBytes))
         return nullptr;
 
-    return new sfImage{std::move(image)};
+    return image.release();
 }
 
 
@@ -85,11 +85,11 @@ sfImage* sfImage_createFromStream(sfInputStream* stream)
     assert(stream);
 
     CallbackStream sfmlStream(stream);
-    sf::Image      image;
-    if (!image.loadFromStream(sfmlStream))
+    auto           image = std::make_unique<sfImage>();
+    if (!image->loadFromStream(sfmlStream))
         return nullptr;
 
-    return new sfImage{std::move(image)};
+    return image.release();
 }
 
 
@@ -113,7 +113,7 @@ bool sfImage_saveToFile(const sfImage* image, const char* filename)
 {
     assert(image);
     assert(filename);
-    return image->This.saveToFile(filename);
+    return image->saveToFile(filename);
 }
 
 
@@ -124,11 +124,9 @@ bool sfImage_saveToMemory(const sfImage* image, sfBuffer* output, const char* fo
     assert(output);
     assert(format);
 
-    auto data = image->This.saveToMemory(format);
-
-    if (data)
+    if (auto data = image->saveToMemory(format))
     {
-        output->buffer = std::move(*data);
+        *output = sfBuffer{std::move(*data)};
         return true;
     }
 
@@ -140,7 +138,7 @@ bool sfImage_saveToMemory(const sfImage* image, sfBuffer* output, const char* fo
 void sfImage_createMaskFromColor(sfImage* image, sfColor colorKey, uint8_t alpha)
 {
     assert(image);
-    image->This.createMaskFromColor(convertColor(colorKey), alpha);
+    image->createMaskFromColor(convertColor(colorKey), alpha);
 }
 
 
@@ -149,7 +147,7 @@ bool sfImage_copyImage(sfImage* image, const sfImage* source, sfVector2u dest, s
 {
     assert(image);
     assert(source);
-    return image->This.copy(source->This, convertVector2(dest), convertRect(sourceRect), applyAlpha);
+    return image->copy(*source, convertVector2(dest), convertRect(sourceRect), applyAlpha);
 }
 
 
@@ -157,7 +155,7 @@ bool sfImage_copyImage(sfImage* image, const sfImage* source, sfVector2u dest, s
 void sfImage_setPixel(sfImage* image, sfVector2u coords, sfColor color)
 {
     assert(image);
-    image->This.setPixel(convertVector2(coords), convertColor(color));
+    image->setPixel(convertVector2(coords), convertColor(color));
 }
 
 
@@ -165,7 +163,7 @@ void sfImage_setPixel(sfImage* image, sfVector2u coords, sfColor color)
 sfColor sfImage_getPixel(const sfImage* image, sfVector2u coords)
 {
     assert(image);
-    return convertColor(image->This.getPixel(convertVector2(coords)));
+    return convertColor(image->getPixel(convertVector2(coords)));
 }
 
 
@@ -173,7 +171,7 @@ sfColor sfImage_getPixel(const sfImage* image, sfVector2u coords)
 const uint8_t* sfImage_getPixelsPtr(const sfImage* image)
 {
     assert(image);
-    return image->This.getPixelsPtr();
+    return image->getPixelsPtr();
 }
 
 
@@ -181,7 +179,7 @@ const uint8_t* sfImage_getPixelsPtr(const sfImage* image)
 sfVector2u sfImage_getSize(const sfImage* image)
 {
     assert(image);
-    return convertVector2(image->This.getSize());
+    return convertVector2(image->getSize());
 }
 
 
@@ -189,7 +187,7 @@ sfVector2u sfImage_getSize(const sfImage* image)
 void sfImage_flipHorizontally(sfImage* image)
 {
     assert(image);
-    image->This.flipHorizontally();
+    image->flipHorizontally();
 }
 
 
@@ -197,5 +195,5 @@ void sfImage_flipHorizontally(sfImage* image)
 void sfImage_flipVertically(sfImage* image)
 {
     assert(image);
-    image->This.flipVertically();
+    image->flipVertically();
 }

src/CSFML/Graphics/ImageStruct.hpp

@@ -33,7 +33,6 @@
 ////////////////////////////////////////////////////////////
 // Internal structure of sfImage
 ////////////////////////////////////////////////////////////
-struct sfImage
+struct sfImage : sf::Image
 {
-    sf::Image This;
 };

src/CSFML/Graphics/RectangleShape.cpp

@@ -61,7 +61,7 @@ void sfRectangleShape_destroy(const sfRectangleShape* shape)
 void sfRectangleShape_setPosition(sfRectangleShape* shape, sfVector2f position)
 {
     assert(shape);
-    shape->This.setPosition(convertVector2(position));
+    shape->setPosition(convertVector2(position));
 }
 
 
@@ -69,7 +69,7 @@ void sfRectangleShape_setPosition(sfRectangleShape* shape, sfVector2f position)
 void sfRectangleShape_setRotation(sfRectangleShape* shape, float angle)
 {
     assert(shape);
-    shape->This.setRotation(sf::degrees(angle));
+    shape->setRotation(sf::degrees(angle));
 }
 
 
@@ -77,7 +77,7 @@ void sfRectangleShape_setRotation(sfRectangleShape* shape, float angle)
 void sfRectangleShape_setScale(sfRectangleShape* shape, sfVector2f scale)
 {
     assert(shape);
-    shape->This.setScale(convertVector2(scale));
+    shape->setScale(convertVector2(scale));
 }
 
 
@@ -85,7 +85,7 @@ void sfRectangleShape_setScale(sfRectangleShape* shape, sfVector2f scale)
 void sfRectangleShape_setOrigin(sfRectangleShape* shape, sfVector2f origin)
 {
     assert(shape);
-    shape->This.setOrigin(convertVector2(origin));
+    shape->setOrigin(convertVector2(origin));
 }
 
 
@@ -93,7 +93,7 @@ void sfRectangleShape_setOrigin(sfRectangleShape* shape, sfVector2f origin)
 sfVector2f sfRectangleShape_getPosition(const sfRectangleShape* shape)
 {
     assert(shape);
-    return convertVector2(shape->This.getPosition());
+    return convertVector2(shape->getPosition());
 }
 
 
@@ -101,7 +101,7 @@ sfVector2f sfRectangleShape_getPosition(const sfRectangleShape* shape)
 float sfRectangleShape_getRotation(const sfRectangleShape* shape)
 {
     assert(shape);
-    return shape->This.getRotation().asDegrees();
+    return shape->getRotation().asDegrees();
 }
 
 
@@ -109,7 +109,7 @@ float sfRectangleShape_getRotation(const sfRectangleShape* shape)
 sfVector2f sfRectangleShape_getScale(const sfRectangleShape* shape)
 {
     assert(shape);
-    return convertVector2(shape->This.getScale());
+    return convertVector2(shape->getScale());
 }
 
 
@@ -117,7 +117,7 @@ sfVector2f sfRectangleShape_getScale(const sfRectangleShape* shape)
 sfVector2f sfRectangleShape_getOrigin(const sfRectangleShape* shape)
 {
     assert(shape);
-    return convertVector2(shape->This.getOrigin());
+    return convertVector2(shape->getOrigin());
 }
 
 
@@ -125,7 +125,7 @@ sfVector2f sfRectangleShape_getOrigin(const sfRectangleShape* shape)
 void sfRectangleShape_move(sfRectangleShape* shape, sfVector2f offset)
 {
     assert(shape);
-    shape->This.move(convertVector2(offset));
+    shape->move(convertVector2(offset));
 }
 
 
@@ -133,7 +133,7 @@ void sfRectangleShape_move(sfRectangleShape* shape, sfVector2f offset)
 void sfRectangleShape_rotate(sfRectangleShape* shape, float angle)
 {
     assert(shape);
-    shape->This.rotate(sf::degrees(angle));
+    shape->rotate(sf::degrees(angle));
 }
 
 
@@ -141,7 +141,7 @@ void sfRectangleShape_rotate(sfRectangleShape* shape, float angle)
 void sfRectangleShape_scale(sfRectangleShape* shape, sfVector2f factors)
 {
     assert(shape);
-    shape->This.scale(convertVector2(factors));
+    shape->scale(convertVector2(factors));
 }
 
 
@@ -149,7 +149,7 @@ void sfRectangleShape_scale(sfRectangleShape* shape, sfVector2f factors)
 sfTransform sfRectangleShape_getTransform(const sfRectangleShape* shape)
 {
     assert(shape);
-    shape->Transform = convertTransform(shape->This.getTransform());
+    shape->Transform = convertTransform(shape->getTransform());
     return shape->Transform;
 }
 
@@ -158,7 +158,7 @@ sfTransform sfRectangleShape_getTransform(const sfRectangleShape* shape)
 sfTransform sfRectangleShape_getInverseTransform(const sfRectangleShape* shape)
 {
     assert(shape);
-    shape->InverseTransform = convertTransform(shape->This.getInverseTransform());
+    shape->InverseTransform = convertTransform(shape->getInverseTransform());
     return shape->InverseTransform;
 }
 
@@ -167,7 +167,7 @@ sfTransform sfRectangleShape_getInverseTransform(const sfRectangleShape* shape)
 void sfRectangleShape_setTexture(sfRectangleShape* shape, const sfTexture* texture, bool resetRect)
 {
     assert(shape);
-    shape->This.setTexture(texture ? texture->This : nullptr, resetRect);
+    shape->setTexture(texture ? texture->This : nullptr, resetRect);
     shape->Texture = texture;
 }
 
@@ -176,7 +176,7 @@ void sfRectangleShape_setTexture(sfRectangleShape* shape, const sfTexture* textu
 void sfRectangleShape_setTextureRect(sfRectangleShape* shape, sfIntRect rect)
 {
     assert(shape);
-    shape->This.setTextureRect(convertRect(rect));
+    shape->setTextureRect(convertRect(rect));
 }
 
 
@@ -184,7 +184,7 @@ void sfRectangleShape_setTextureRect(sfRectangleShape* shape, sfIntRect rect)
 void sfRectangleShape_setFillColor(sfRectangleShape* shape, sfColor color)
 {
     assert(shape);
-    shape->This.setFillColor(convertColor(color));
+    shape->setFillColor(convertColor(color));
 }
 
 
@@ -192,7 +192,7 @@ void sfRectangleShape_setFillColor(sfRectangleShape* shape, sfColor color)
 void sfRectangleShape_setOutlineColor(sfRectangleShape* shape, sfColor color)
 {
     assert(shape);
-    shape->This.setOutlineColor(convertColor(color));
+    shape->setOutlineColor(convertColor(color));
 }
 
 
@@ -200,7 +200,7 @@ void sfRectangleShape_setOutlineColor(sfRectangleShape* shape, sfColor color)
 void sfRectangleShape_setOutlineThickness(sfRectangleShape* shape, float thickness)
 {
     assert(shape);
-    shape->This.setOutlineThickness(thickness);
+    shape->setOutlineThickness(thickness);
 }
 
 
@@ -216,7 +216,7 @@ const sfTexture* sfRectangleShape_getTexture(const sfRectangleShape* shape)
 sfIntRect sfRectangleShape_getTextureRect(const sfRectangleShape* shape)
 {
     assert(shape);
-    return convertRect(shape->This.getTextureRect());
+    return convertRect(shape->getTextureRect());
 }
 
 
@@ -224,7 +224,7 @@ sfIntRect sfRectangleShape_getTextureRect(const sfRectangleShape* shape)
 sfColor sfRectangleShape_getFillColor(const sfRectangleShape* shape)
 {
     assert(shape);
-    return convertColor(shape->This.getFillColor());
+    return convertColor(shape->getFillColor());
 }
 
 
@@ -232,7 +232,7 @@ sfColor sfRectangleShape_getFillColor(const sfRectangleShape* shape)
 sfColor sfRectangleShape_getOutlineColor(const sfRectangleShape* shape)
 {
     assert(shape);
-    return convertColor(shape->This.getOutlineColor());
+    return convertColor(shape->getOutlineColor());
 }
 
 
@@ -240,7 +240,7 @@ sfColor sfRectangleShape_getOutlineColor(const sfRectangleShape* shape)
 float sfRectangleShape_getOutlineThickness(const sfRectangleShape* shape)
 {
     assert(shape);
-    return shape->This.getOutlineThickness();
+    return shape->getOutlineThickness();
 }
 
 
@@ -248,7 +248,7 @@ float sfRectangleShape_getOutlineThickness(const sfRectangleShape* shape)
 size_t sfRectangleShape_getPointCount(const sfRectangleShape* shape)
 {
     assert(shape);
-    return shape->This.getPointCount();
+    return shape->getPointCount();
 }
 
 
@@ -256,7 +256,7 @@ size_t sfRectangleShape_getPointCount(const sfRectangleShape* shape)
 sfVector2f sfRectangleShape_getPoint(const sfRectangleShape* shape, size_t index)
 {
     assert(shape);
-    return convertVector2(shape->This.getPoint(index));
+    return convertVector2(shape->getPoint(index));
 }
 
 
@@ -264,7 +264,7 @@ sfVector2f sfRectangleShape_getPoint(const sfRectangleShape* shape, size_t index
 sfVector2f sfRectangleShape_getGeometricCenter(const sfRectangleShape* shape)
 {
     assert(shape);
-    return convertVector2(shape->This.getGeometricCenter());
+    return convertVector2(shape->getGeometricCenter());
 }
 
 
@@ -272,7 +272,7 @@ sfVector2f sfRectangleShape_getGeometricCenter(const sfRectangleShape* shape)
 void sfRectangleShape_setSize(sfRectangleShape* shape, sfVector2f size)
 {
     assert(shape);
-    shape->This.setSize(convertVector2(size));
+    shape->setSize(convertVector2(size));
 }
 
 
@@ -280,7 +280,7 @@ void sfRectangleShape_setSize(sfRectangleShape* shape, sfVector2f size)
 sfVector2f sfRectangleShape_getSize(const sfRectangleShape* shape)
 {
     assert(shape);
-    return convertVector2(shape->This.getSize());
+    return convertVector2(shape->getSize());
 }
 
 
@@ -288,7 +288,7 @@ sfVector2f sfRectangleShape_getSize(const sfRectangleShape* shape)
 sfFloatRect sfRectangleShape_getLocalBounds(const sfRectangleShape* shape)
 {
     assert(shape);
-    return convertRect(shape->This.getLocalBounds());
+    return convertRect(shape->getLocalBounds());
 }
 
 
@@ -296,5 +296,5 @@ sfFloatRect sfRectangleShape_getLocalBounds(const sfRectangleShape* shape)
 sfFloatRect sfRectangleShape_getGlobalBounds(const sfRectangleShape* shape)
 {
     assert(shape);
-    return convertRect(shape->This.getGlobalBounds());
+    return convertRect(shape->getGlobalBounds());
 }

src/CSFML/Graphics/RectangleShapeStruct.hpp

@@ -36,9 +36,8 @@
 ////////////////////////////////////////////////////////////
 // Internal structure of sfRectangleShape
 ////////////////////////////////////////////////////////////
-struct sfRectangleShape
+struct sfRectangleShape : sf::RectangleShape
 {
-    sf::RectangleShape  This;
     const sfTexture*    Texture{};
     mutable sfTransform Transform{};
     mutable sfTransform InverseTransform{};

src/CSFML/Graphics/RenderTexture.cpp

@@ -50,15 +50,15 @@ sfRenderTexture* sfRenderTexture_create(sfVector2u size, const sfContextSettings
     const sf::ContextSettings params = settings ? convertContextSettings(*settings) : sf::ContextSettings();
 
     // Create the render texture
-    sf::RenderTexture renderTexture;
-    if (!renderTexture.resize(convertVector2(size), params))
+    auto renderTexture = std::make_unique<sfRenderTexture>();
+    if (!renderTexture->resize(convertVector2(size), params))
         return nullptr;
 
-    auto       texture     = std::make_unique<sfTexture>(const_cast<sf::Texture*>(&renderTexture.getTexture()));
-    const auto defaultView = sfView{renderTexture.getDefaultView()};
-    const auto currentView = sfView{renderTexture.getView()};
+    renderTexture->Target      = std::make_unique<sfTexture>(const_cast<sf::Texture*>(&renderTexture->getTexture()));
+    renderTexture->DefaultView = sfView{renderTexture->getDefaultView()};
+    renderTexture->CurrentView = sfView{renderTexture->getView()};
 
-    return new sfRenderTexture{std::move(renderTexture), std::move(texture), defaultView, currentView};
+    return renderTexture.release();
 }
 
 
@@ -73,7 +73,7 @@ void sfRenderTexture_destroy(const sfRenderTexture* renderTexture)
 sfVector2u sfRenderTexture_getSize(const sfRenderTexture* renderTexture)
 {
     assert(renderTexture);
-    return convertVector2(renderTexture->This.getSize());
+    return convertVector2(renderTexture->getSize());
 }
 
 
@@ -81,7 +81,7 @@ sfVector2u sfRenderTexture_getSize(const sfRenderTexture* renderTexture)
 bool sfRenderTexture_isSrgb(const sfRenderTexture* renderTexture)
 {
     assert(renderTexture);
-    return renderTexture->This.isSrgb();
+    return renderTexture->isSrgb();
 }
 
 
@@ -89,7 +89,7 @@ bool sfRenderTexture_isSrgb(const sfRenderTexture* renderTexture)
 bool sfRenderTexture_setActive(sfRenderTexture* renderTexture, bool active)
 {
     assert(renderTexture);
-    return renderTexture->This.setActive(active);
+    return renderTexture->setActive(active);
 }
 
 
@@ -97,7 +97,7 @@ bool sfRenderTexture_setActive(sfRenderTexture* renderTexture, bool active)
 void sfRenderTexture_display(sfRenderTexture* renderTexture)
 {
     assert(renderTexture);
-    renderTexture->This.display();
+    renderTexture->display();
 }
 
 
@@ -105,7 +105,7 @@ void sfRenderTexture_display(sfRenderTexture* renderTexture)
 void sfRenderTexture_clear(sfRenderTexture* renderTexture, sfColor color)
 {
     assert(renderTexture);
-    renderTexture->This.clear(convertColor(color));
+    renderTexture->clear(convertColor(color));
 }
 
 
@@ -113,7 +113,7 @@ void sfRenderTexture_clear(sfRenderTexture* renderTexture, sfColor color)
 void sfRenderTexture_clearStencil(sfRenderTexture* renderTexture, sfStencilValue stencilValue)
 {
     assert(renderTexture);
-    renderTexture->This.clearStencil(convertStencilValue(stencilValue));
+    renderTexture->clearStencil(convertStencilValue(stencilValue));
 }
 
 
@@ -121,7 +121,7 @@ void sfRenderTexture_clearStencil(sfRenderTexture* renderTexture, sfStencilValue
 void sfRenderTexture_clearColorAndStencil(sfRenderTexture* renderTexture, sfColor color, sfStencilValue stencilValue)
 {
     assert(renderTexture);
-    renderTexture->This.clear(convertColor(color), convertStencilValue(stencilValue));
+    renderTexture->clear(convertColor(color), convertStencilValue(stencilValue));
 }
 
 
@@ -130,8 +130,8 @@ void sfRenderTexture_setView(sfRenderTexture* renderTexture, const sfView* view)
 {
     assert(renderTexture);
     assert(view);
-    renderTexture->This.setView(view->This);
-    renderTexture->CurrentView.This = view->This;
+    renderTexture->setView(*view);
+    renderTexture->CurrentView = *view;
 }
 
 
@@ -156,7 +156,7 @@ sfIntRect sfRenderTexture_getViewport(const sfRenderTexture* renderTexture, cons
 {
     assert(renderTexture);
     assert(view);
-    return convertRect(renderTexture->This.getViewport(view->This));
+    return convertRect(renderTexture->getViewport(*view));
 }
 
 
@@ -165,7 +165,7 @@ sfIntRect sfRenderTexture_getScissor(const sfRenderTexture* renderTexture, const
 {
     assert(renderTexture);
     assert(view);
-    return convertRect(renderTexture->This.getScissor(view->This));
+    return convertRect(renderTexture->getScissor(*view));
 }
 
 
@@ -175,9 +175,9 @@ sfVector2f sfRenderTexture_mapPixelToCoords(const sfRenderTexture* renderTexture
     assert(renderTexture);
 
     if (targetView)
-        return convertVector2(renderTexture->This.mapPixelToCoords(convertVector2(point), targetView->This));
+        return convertVector2(renderTexture->mapPixelToCoords(convertVector2(point), *targetView));
 
-    return convertVector2(renderTexture->This.mapPixelToCoords(convertVector2(point)));
+    return convertVector2(renderTexture->mapPixelToCoords(convertVector2(point)));
 }
 
 
@@ -187,9 +187,9 @@ sfVector2i sfRenderTexture_mapCoordsToPixel(const sfRenderTexture* renderTexture
     assert(renderTexture);
 
     if (targetView)
-        return convertVector2(renderTexture->This.mapCoordsToPixel(convertVector2(point), targetView->This));
+        return convertVector2(renderTexture->mapCoordsToPixel(convertVector2(point), *targetView));
 
-    return convertVector2(renderTexture->This.mapCoordsToPixel(convertVector2(point)));
+    return convertVector2(renderTexture->mapCoordsToPixel(convertVector2(point)));
 }
 
 
@@ -198,49 +198,49 @@ void sfRenderTexture_drawSprite(sfRenderTexture* renderTexture, const sfSprite*
 {
     assert(renderTexture);
     assert(object);
-    renderTexture->This.draw(object->This, convertRenderStates(states));
+    renderTexture->draw(*object, convertRenderStates(states));
 }
 void sfRenderTexture_drawText(sfRenderTexture* renderTexture, const sfText* object, const sfRenderStates* states)
 {
     assert(renderTexture);
     assert(object);
-    renderTexture->This.draw(object->This, convertRenderStates(states));
+    renderTexture->draw(*object, convertRenderStates(states));
 }
 void sfRenderTexture_drawShape(sfRenderTexture* renderTexture, const sfShape* object, const sfRenderStates* states)
 {
     assert(renderTexture);
     assert(object);
-    renderTexture->This.draw(*object, convertRenderStates(states));
+    renderTexture->draw(*object, convertRenderStates(states));
 }
 void sfRenderTexture_drawCircleShape(sfRenderTexture* renderTexture, const sfCircleShape* object, const sfRenderStates* states)
 {
     assert(renderTexture);
     assert(object);
-    renderTexture->This.draw(object->This, convertRenderStates(states));
+    renderTexture->draw(*object, convertRenderStates(states));
 }
 void sfRenderTexture_drawConvexShape(sfRenderTexture* renderTexture, const sfConvexShape* object, const sfRenderStates* states)
 {
     assert(renderTexture);
     assert(object);
-    renderTexture->This.draw(object->This, convertRenderStates(states));
+    renderTexture->draw(*object, convertRenderStates(states));
 }
 void sfRenderTexture_drawRectangleShape(sfRenderTexture* renderTexture, const sfRectangleShape* object, const sfRenderStates* states)
 {
     assert(renderTexture);
     assert(object);
-    renderTexture->This.draw(object->This, convertRenderStates(states));
+    renderTexture->draw(*object, convertRenderStates(states));
 }
 void sfRenderTexture_drawVertexArray(sfRenderTexture* renderTexture, const sfVertexArray* object, const sfRenderStates* states)
 {
     assert(renderTexture);
     assert(object);
-    renderTexture->This.draw(object->This, convertRenderStates(states));
+    renderTexture->draw(*object, convertRenderStates(states));
 }
 void sfRenderTexture_drawVertexBuffer(sfRenderTexture* renderTexture, const sfVertexBuffer* object, const sfRenderStates* states)
 {
     assert(renderTexture);
     assert(object);
-    renderTexture->This.draw(object->This, convertRenderStates(states));
+    renderTexture->draw(*object, convertRenderStates(states));
 }
 
 
@@ -253,7 +253,7 @@ void sfRenderTexture_drawVertexBufferRange(sfRenderTexture*      renderTexture,
 {
     assert(renderTexture);
     assert(object);
-    renderTexture->This.draw(object->This, firstVertex, vertexCount, convertRenderStates(states));
+    renderTexture->draw(*object, firstVertex, vertexCount, convertRenderStates(states));
 }
 
 
@@ -265,10 +265,10 @@ void sfRenderTexture_drawPrimitives(sfRenderTexture*      renderTexture,
                                     const sfRenderStates* states)
 {
     assert(renderTexture);
-    renderTexture->This.draw(reinterpret_cast<const sf::Vertex*>(vertices),
-                             vertexCount,
-                             static_cast<sf::PrimitiveType>(type),
-                             convertRenderStates(states));
+    renderTexture->draw(reinterpret_cast<const sf::Vertex*>(vertices),
+                        vertexCount,
+                        static_cast<sf::PrimitiveType>(type),
+                        convertRenderStates(states));
 }
 
 
@@ -276,7 +276,7 @@ void sfRenderTexture_drawPrimitives(sfRenderTexture*      renderTexture,
 void sfRenderTexture_pushGLStates(sfRenderTexture* renderTexture)
 {
     assert(renderTexture);
-    renderTexture->This.pushGLStates();
+    renderTexture->pushGLStates();
 }
 
 
@@ -284,7 +284,7 @@ void sfRenderTexture_pushGLStates(sfRenderTexture* renderTexture)
 void sfRenderTexture_popGLStates(sfRenderTexture* renderTexture)
 {
     assert(renderTexture);
-    renderTexture->This.popGLStates();
+    renderTexture->popGLStates();
 }
 
 
@@ -292,7 +292,7 @@ void sfRenderTexture_popGLStates(sfRenderTexture* renderTexture)
 void sfRenderTexture_resetGLStates(sfRenderTexture* renderTexture)
 {
     assert(renderTexture);
-    renderTexture->This.resetGLStates();
+    renderTexture->resetGLStates();
 }
 
 
@@ -308,7 +308,7 @@ const sfTexture* sfRenderTexture_getTexture(const sfRenderTexture* renderTexture
 void sfRenderTexture_setSmooth(sfRenderTexture* renderTexture, bool smooth)
 {
     assert(renderTexture);
-    renderTexture->This.setSmooth(smooth);
+    renderTexture->setSmooth(smooth);
 }
 
 
@@ -323,14 +323,14 @@ unsigned int sfRenderTexture_getMaximumAntiAliasingLevel()
 bool sfRenderTexture_isSmooth(const sfRenderTexture* renderTexture)
 {
     assert(renderTexture);
-    return renderTexture->This.isSmooth();
+    return renderTexture->isSmooth();
 }
 
 ////////////////////////////////////////////////////////////
 void sfRenderTexture_setRepeated(sfRenderTexture* renderTexture, bool repeated)
 {
     assert(renderTexture);
-    renderTexture->This.setRepeated(repeated);
+    renderTexture->setRepeated(repeated);
 }
 
 
@@ -338,7 +338,7 @@ void sfRenderTexture_setRepeated(sfRenderTexture* renderTexture, bool repeated)
 bool sfRenderTexture_isRepeated(const sfRenderTexture* renderTexture)
 {
     assert(renderTexture);
-    return renderTexture->This.isRepeated();
+    return renderTexture->isRepeated();
 }
 
 
@@ -346,5 +346,5 @@ bool sfRenderTexture_isRepeated(const sfRenderTexture* renderTexture)
 bool sfRenderTexture_generateMipmap(sfRenderTexture* renderTexture)
 {
     assert(renderTexture);
-    return renderTexture->This.generateMipmap();
+    return renderTexture->generateMipmap();
 }

src/CSFML/Graphics/RenderTextureStruct.hpp

@@ -38,9 +38,8 @@
 ////////////////////////////////////////////////////////////
 // Internal structure of sfRenderTexture
 ////////////////////////////////////////////////////////////
-struct sfRenderTexture
+struct sfRenderTexture : sf::RenderTexture
 {
-    sf::RenderTexture                This;
     std::unique_ptr<const sfTexture> Target;
     sfView                           DefaultView;
     sfView                           CurrentView;

src/CSFML/Graphics/RenderWindow.cpp

@@ -61,9 +61,9 @@ sfRenderWindow* sfRenderWindow_create(sfVideoMode              mode,
 
     // Create the window
     auto* renderWindow = new sfRenderWindow;
-    renderWindow->This.create(convertVideoMode(mode), title, style, static_cast<sf::State>(state), params);
-    renderWindow->DefaultView.This = renderWindow->This.getDefaultView();
-    renderWindow->CurrentView.This = renderWindow->This.getView();
+    renderWindow->create(convertVideoMode(mode), title, style, static_cast<sf::State>(state), params);
+    renderWindow->DefaultView = sfView{renderWindow->getDefaultView()};
+    renderWindow->CurrentView = sfView{renderWindow->getView()};
 
     return renderWindow;
 }
@@ -81,13 +81,13 @@ sfRenderWindow* sfRenderWindow_createUnicode(
 
     // Create the window
     auto* renderWindow = new sfRenderWindow;
-    renderWindow->This.create(convertVideoMode(mode),
-                              reinterpret_cast<const char32_t*>(title),
-                              style,
-                              static_cast<sf::State>(state),
-                              params);
-    renderWindow->DefaultView.This = renderWindow->This.getDefaultView();
-    renderWindow->CurrentView.This = renderWindow->This.getView();
+    renderWindow->create(convertVideoMode(mode),
+                         reinterpret_cast<const char32_t*>(title),
+                         style,
+                         static_cast<sf::State>(state),
+                         params);
+    renderWindow->DefaultView = sfView{renderWindow->getDefaultView()};
+    renderWindow->CurrentView = sfView{renderWindow->getView()};
 
     return renderWindow;
 }
@@ -101,9 +101,9 @@ sfRenderWindow* sfRenderWindow_createFromHandle(sfWindowHandle handle, const sfC
 
     // Create the window
     auto* renderWindow = new sfRenderWindow;
-    renderWindow->This.create(handle, params);
-    renderWindow->DefaultView.This = renderWindow->This.getDefaultView();
-    renderWindow->CurrentView.This = renderWindow->This.getView();
+    renderWindow->create(handle, params);
+    renderWindow->DefaultView = sfView{renderWindow->getDefaultView()};
+    renderWindow->CurrentView = sfView{renderWindow->getView()};
 
     return renderWindow;
 }
@@ -120,7 +120,7 @@ void sfRenderWindow_destroy(const sfRenderWindow* renderWindow)
 void sfRenderWindow_close(sfRenderWindow* renderWindow)
 {
     assert(renderWindow);
-    renderWindow->This.close();
+    renderWindow->close();
 }
 
 
@@ -128,7 +128,7 @@ void sfRenderWindow_close(sfRenderWindow* renderWindow)
 bool sfRenderWindow_isOpen(const sfRenderWindow* renderWindow)
 {
     assert(renderWindow);
-    return renderWindow->This.isOpen();
+    return renderWindow->isOpen();
 }
 
 
@@ -136,7 +136,7 @@ bool sfRenderWindow_isOpen(const sfRenderWindow* renderWindow)
 sfContextSettings sfRenderWindow_getSettings(const sfRenderWindow* renderWindow)
 {
     assert(renderWindow);
-    return convertContextSettings(renderWindow->This.getSettings());
+    return convertContextSettings(renderWindow->getSettings());
 }
 
 
@@ -145,7 +145,7 @@ bool sfRenderWindow_pollEvent(sfRenderWindow* renderWindow, sfEvent* event)
 {
     assert(renderWindow);
     assert(event);
-    return convertEvent(renderWindow->This.pollEvent(), event);
+    return convertEvent(renderWindow->pollEvent(), event);
 }
 
 
@@ -154,7 +154,7 @@ bool sfRenderWindow_waitEvent(sfRenderWindow* renderWindow, sfTime timeout, sfEv
 {
     assert(renderWindow);
     assert(event);
-    return convertEvent(renderWindow->This.waitEvent(sf::microseconds(timeout.microseconds)), event);
+    return convertEvent(renderWindow->waitEvent(sf::microseconds(timeout.microseconds)), event);
 }
 
 
@@ -162,7 +162,7 @@ bool sfRenderWindow_waitEvent(sfRenderWindow* renderWindow, sfTime timeout, sfEv
 sfVector2i sfRenderWindow_getPosition(const sfRenderWindow* renderWindow)
 {
     assert(renderWindow);
-    return convertVector2(renderWindow->This.getPosition());
+    return convertVector2(renderWindow->getPosition());
 }
 
 
@@ -170,7 +170,7 @@ sfVector2i sfRenderWindow_getPosition(const sfRenderWindow* renderWindow)
 void sfRenderWindow_setPosition(sfRenderWindow* renderWindow, sfVector2i position)
 {
     assert(renderWindow);
-    renderWindow->This.setPosition(convertVector2(position));
+    renderWindow->setPosition(convertVector2(position));
 }
 
 
@@ -178,7 +178,7 @@ void sfRenderWindow_setPosition(sfRenderWindow* renderWindow, sfVector2i positio
 sfVector2u sfRenderWindow_getSize(const sfRenderWindow* renderWindow)
 {
     assert(renderWindow);
-    return convertVector2(renderWindow->This.getSize());
+    return convertVector2(renderWindow->getSize());
 }
 
 
@@ -186,7 +186,7 @@ sfVector2u sfRenderWindow_getSize(const sfRenderWindow* renderWindow)
 bool sfRenderWindow_isSrgb(const sfRenderWindow* renderWindow)
 {
     assert(renderWindow);
-    return renderWindow->This.isSrgb();
+    return renderWindow->isSrgb();
 }
 
 
@@ -194,7 +194,7 @@ bool sfRenderWindow_isSrgb(const sfRenderWindow* renderWindow)
 void sfRenderWindow_setSize(sfRenderWindow* renderWindow, sfVector2u size)
 {
     assert(renderWindow);
-    renderWindow->This.setSize(convertVector2(size));
+    renderWindow->setSize(convertVector2(size));
 }
 
 
@@ -202,7 +202,7 @@ void sfRenderWindow_setSize(sfRenderWindow* renderWindow, sfVector2u size)
 void sfRenderWindow_setTitle(sfRenderWindow* renderWindow, const char* title)
 {
     assert(renderWindow);
-    renderWindow->This.setTitle(title);
+    renderWindow->setTitle(title);
 }
 
 
@@ -210,7 +210,7 @@ void sfRenderWindow_setTitle(sfRenderWindow* renderWindow, const char* title)
 void sfRenderWindow_setUnicodeTitle(sfRenderWindow* renderWindow, const sfChar32* title)
 {
     assert(renderWindow);
-    renderWindow->This.setTitle(reinterpret_cast<const char32_t*>(title));
+    renderWindow->setTitle(reinterpret_cast<const char32_t*>(title));
 }
 
 
@@ -218,7 +218,7 @@ void sfRenderWindow_setUnicodeTitle(sfRenderWindow* renderWindow, const sfChar32
 void sfRenderWindow_setIcon(sfRenderWindow* renderWindow, sfVector2u size, const uint8_t* pixels)
 {
     assert(renderWindow);
-    renderWindow->This.setIcon(convertVector2(size), pixels);
+    renderWindow->setIcon(convertVector2(size), pixels);
 }
 
 
@@ -226,7 +226,7 @@ void sfRenderWindow_setIcon(sfRenderWindow* renderWindow, sfVector2u size, const
 void sfRenderWindow_setVisible(sfRenderWindow* renderWindow, bool visible)
 {
     assert(renderWindow);
-    renderWindow->This.setVisible(visible);
+    renderWindow->setVisible(visible);
 }
 
 
@@ -234,7 +234,7 @@ void sfRenderWindow_setVisible(sfRenderWindow* renderWindow, bool visible)
 void sfRenderWindow_setVerticalSyncEnabled(sfRenderWindow* renderWindow, bool enabled)
 {
     assert(renderWindow);
-    renderWindow->This.setVerticalSyncEnabled(enabled);
+    renderWindow->setVerticalSyncEnabled(enabled);
 }
 
 
@@ -242,7 +242,7 @@ void sfRenderWindow_setVerticalSyncEnabled(sfRenderWindow* renderWindow, bool en
 void sfRenderWindow_setMouseCursorVisible(sfRenderWindow* renderWindow, bool visible)
 {
     assert(renderWindow);
-    renderWindow->This.setMouseCursorVisible(visible);
+    renderWindow->setMouseCursorVisible(visible);
 }
 
 
@@ -250,7 +250,7 @@ void sfRenderWindow_setMouseCursorVisible(sfRenderWindow* renderWindow, bool vis
 void sfRenderWindow_setMouseCursorGrabbed(sfRenderWindow* renderWindow, bool grabbed)
 {
     assert(renderWindow);
-    renderWindow->This.setMouseCursorGrabbed(grabbed);
+    renderWindow->setMouseCursorGrabbed(grabbed);
 }
 
 
@@ -259,7 +259,7 @@ void sfRenderWindow_setMouseCursor(sfRenderWindow* renderWindow, const sfCursor*
 {
     assert(renderWindow);
     assert(cursor);
-    renderWindow->This.setMouseCursor(cursor->This);
+    renderWindow->setMouseCursor(*cursor);
 }
 
 
@@ -267,7 +267,7 @@ void sfRenderWindow_setMouseCursor(sfRenderWindow* renderWindow, const sfCursor*
 void sfRenderWindow_setKeyRepeatEnabled(sfRenderWindow* renderWindow, bool enabled)
 {
     assert(renderWindow);
-    renderWindow->This.setKeyRepeatEnabled(enabled);
+    renderWindow->setKeyRepeatEnabled(enabled);
 }
 
 
@@ -275,7 +275,7 @@ void sfRenderWindow_setKeyRepeatEnabled(sfRenderWindow* renderWindow, bool enabl
 bool sfRenderWindow_setActive(sfRenderWindow* renderWindow, bool active)
 {
     assert(renderWindow);
-    return renderWindow->This.setActive(active);
+    return renderWindow->setActive(active);
 }
 
 
@@ -283,7 +283,7 @@ bool sfRenderWindow_setActive(sfRenderWindow* renderWindow, bool active)
 void sfRenderWindow_requestFocus(sfRenderWindow* renderWindow)
 {
     assert(renderWindow);
-    renderWindow->This.requestFocus();
+    renderWindow->requestFocus();
 }
 
 
@@ -291,7 +291,7 @@ void sfRenderWindow_requestFocus(sfRenderWindow* renderWindow)
 bool sfRenderWindow_hasFocus(const sfRenderWindow* renderWindow)
 {
     assert(renderWindow);
-    return renderWindow->This.hasFocus();
+    return renderWindow->hasFocus();
 }
 
 
@@ -299,7 +299,7 @@ bool sfRenderWindow_hasFocus(const sfRenderWindow* renderWindow)
 void sfRenderWindow_display(sfRenderWindow* renderWindow)
 {
     assert(renderWindow);
-    renderWindow->This.display();
+    renderWindow->display();
 }
 
 
@@ -307,7 +307,7 @@ void sfRenderWindow_display(sfRenderWindow* renderWindow)
 void sfRenderWindow_setFramerateLimit(sfRenderWindow* renderWindow, unsigned int limit)
 {
     assert(renderWindow);
-    renderWindow->This.setFramerateLimit(limit);
+    renderWindow->setFramerateLimit(limit);
 }
 
 
@@ -315,7 +315,7 @@ void sfRenderWindow_setFramerateLimit(sfRenderWindow* renderWindow, unsigned int
 void sfRenderWindow_setJoystickThreshold(sfRenderWindow* renderWindow, float threshold)
 {
     assert(renderWindow);
-    renderWindow->This.setJoystickThreshold(threshold);
+    renderWindow->setJoystickThreshold(threshold);
 }
 
 
@@ -323,7 +323,7 @@ void sfRenderWindow_setJoystickThreshold(sfRenderWindow* renderWindow, float thr
 sfWindowHandle sfRenderWindow_getNativeHandle(const sfRenderWindow* renderWindow)
 {
     assert(renderWindow);
-    return static_cast<sfWindowHandle>(renderWindow->This.getNativeHandle());
+    return static_cast<sfWindowHandle>(renderWindow->getNativeHandle());
 }
 
 
@@ -331,7 +331,7 @@ sfWindowHandle sfRenderWindow_getNativeHandle(const sfRenderWindow* renderWindow
 void sfRenderWindow_clear(sfRenderWindow* renderWindow, sfColor color)
 {
     assert(renderWindow);
-    renderWindow->This.clear(convertColor(color));
+    renderWindow->clear(convertColor(color));
 }
 
 
@@ -339,7 +339,7 @@ void sfRenderWindow_clear(sfRenderWindow* renderWindow, sfColor color)
 void sfRenderWindow_clearStencil(sfRenderWindow* renderWindow, sfStencilValue stencilValue)
 {
     assert(renderWindow);
-    renderWindow->This.clearStencil(convertStencilValue(stencilValue));
+    renderWindow->clearStencil(convertStencilValue(stencilValue));
 }
 
 
@@ -347,7 +347,7 @@ void sfRenderWindow_clearStencil(sfRenderWindow* renderWindow, sfStencilValue st
 void sfRenderWindow_clearColorAndStencil(sfRenderWindow* renderWindow, sfColor color, sfStencilValue stencilValue)
 {
     assert(renderWindow);
-    renderWindow->This.clear(convertColor(color), convertStencilValue(stencilValue));
+    renderWindow->clear(convertColor(color), convertStencilValue(stencilValue));
 }
 
 
@@ -356,8 +356,8 @@ void sfRenderWindow_setView(sfRenderWindow* renderWindow, const sfView* view)
 {
     assert(renderWindow);
     assert(view);
-    renderWindow->This.setView(view->This);
-    renderWindow->CurrentView.This = view->This;
+    renderWindow->setView(*view);
+    renderWindow->CurrentView = *view;
 }
 
 
@@ -382,7 +382,7 @@ sfIntRect sfRenderWindow_getViewport(const sfRenderWindow* renderWindow, const s
 {
     assert(renderWindow);
     assert(view);
-    return convertRect(renderWindow->This.getViewport(view->This));
+    return convertRect(renderWindow->getViewport(*view));
 }
 
 
@@ -391,7 +391,7 @@ sfIntRect sfRenderWindow_getScissor(const sfRenderWindow* renderWindow, const sf
 {
     assert(renderWindow);
     assert(view);
-    return convertRect(renderWindow->This.getScissor(view->This));
+    return convertRect(renderWindow->getScissor(*view));
 }
 
 
@@ -401,9 +401,9 @@ sfVector2f sfRenderWindow_mapPixelToCoords(const sfRenderWindow* renderWindow, s
     assert(renderWindow);
 
     if (targetView)
-        return convertVector2(renderWindow->This.mapPixelToCoords(convertVector2(point), targetView->This));
+        return convertVector2(renderWindow->mapPixelToCoords(convertVector2(point), *targetView));
 
-    return convertVector2(renderWindow->This.mapPixelToCoords(convertVector2(point)));
+    return convertVector2(renderWindow->mapPixelToCoords(convertVector2(point)));
 }
 
 
@@ -413,9 +413,9 @@ sfVector2i sfRenderWindow_mapCoordsToPixel(const sfRenderWindow* renderWindow, s
     assert(renderWindow);
 
     if (targetView)
-        return convertVector2(renderWindow->This.mapCoordsToPixel(convertVector2(point), targetView->This));
+        return convertVector2(renderWindow->mapCoordsToPixel(convertVector2(point), *targetView));
 
-    return convertVector2(renderWindow->This.mapCoordsToPixel(convertVector2(point)));
+    return convertVector2(renderWindow->mapCoordsToPixel(convertVector2(point)));
 }
 
 
@@ -424,49 +424,49 @@ void sfRenderWindow_drawSprite(sfRenderWindow* renderWindow, const sfSprite* obj
 {
     assert(renderWindow);
     assert(object);
-    renderWindow->This.draw(object->This, convertRenderStates(states));
+    renderWindow->draw(*object, convertRenderStates(states));
 }
 void sfRenderWindow_drawText(sfRenderWindow* renderWindow, const sfText* object, const sfRenderStates* states)
 {
     assert(renderWindow);
     assert(object);
-    renderWindow->This.draw(object->This, convertRenderStates(states));
+    renderWindow->draw(*object, convertRenderStates(states));
 }
 void sfRenderWindow_drawShape(sfRenderWindow* renderWindow, const sfShape* object, const sfRenderStates* states)
 {
     assert(renderWindow);
     assert(object);
-    renderWindow->This.draw(*object, convertRenderStates(states));
+    renderWindow->draw(*object, convertRenderStates(states));
 }
 void sfRenderWindow_drawCircleShape(sfRenderWindow* renderWindow, const sfCircleShape* object, const sfRenderStates* states)
 {
     assert(renderWindow);
     assert(object);
-    renderWindow->This.draw(object->This, convertRenderStates(states));
+    renderWindow->draw(*object, convertRenderStates(states));
 }
 void sfRenderWindow_drawConvexShape(sfRenderWindow* renderWindow, const sfConvexShape* object, const sfRenderStates* states)
 {
     assert(renderWindow);
     assert(object);
-    renderWindow->This.draw(object->This, convertRenderStates(states));
+    renderWindow->draw(*object, convertRenderStates(states));
 }
 void sfRenderWindow_drawRectangleShape(sfRenderWindow* renderWindow, const sfRectangleShape* object, const sfRenderStates* states)
 {
     assert(renderWindow);
     assert(object);
-    renderWindow->This.draw(object->This, convertRenderStates(states));
+    renderWindow->draw(*object, convertRenderStates(states));
 }
 void sfRenderWindow_drawVertexArray(sfRenderWindow* renderWindow, const sfVertexArray* object, const sfRenderStates* states)
 {
     assert(renderWindow);
     assert(object);
-    renderWindow->This.draw(object->This, convertRenderStates(states));
+    renderWindow->draw(*object, convertRenderStates(states));
 }
 void sfRenderWindow_drawVertexBuffer(sfRenderWindow* renderWindow, const sfVertexBuffer* object, const sfRenderStates* states)
 {
     assert(renderWindow);
     assert(object);
-    renderWindow->This.draw(object->This, convertRenderStates(states));
+    renderWindow->draw(*object, convertRenderStates(states));
 }
 
 
@@ -479,7 +479,7 @@ void sfRenderWindow_drawVertexBufferRange(sfRenderWindow*       renderWindow,
 {
     assert(renderWindow);
     assert(object);
-    renderWindow->This.draw(object->This, firstVertex, vertexCount, convertRenderStates(states));
+    renderWindow->draw(*object, firstVertex, vertexCount, convertRenderStates(states));
 }
 
 
@@ -491,10 +491,10 @@ void sfRenderWindow_drawPrimitives(sfRenderWindow*       renderWindow,
                                    const sfRenderStates* states)
 {
     assert(renderWindow);
-    renderWindow->This.draw(reinterpret_cast<const sf::Vertex*>(vertices),
-                            vertexCount,
-                            static_cast<sf::PrimitiveType>(type),
-                            convertRenderStates(states));
+    renderWindow->draw(reinterpret_cast<const sf::Vertex*>(vertices),
+                       vertexCount,
+                       static_cast<sf::PrimitiveType>(type),
+                       convertRenderStates(states));
 }
 
 
@@ -502,7 +502,7 @@ void sfRenderWindow_drawPrimitives(sfRenderWindow*       renderWindow,
 void sfRenderWindow_pushGLStates(sfRenderWindow* renderWindow)
 {
     assert(renderWindow);
-    renderWindow->This.pushGLStates();
+    renderWindow->pushGLStates();
 }
 
 
@@ -510,7 +510,7 @@ void sfRenderWindow_pushGLStates(sfRenderWindow* renderWindow)
 void sfRenderWindow_popGLStates(sfRenderWindow* renderWindow)
 {
     assert(renderWindow);
-    renderWindow->This.popGLStates();
+    renderWindow->popGLStates();
 }
 
 
@@ -518,7 +518,7 @@ void sfRenderWindow_popGLStates(sfRenderWindow* renderWindow)
 void sfRenderWindow_resetGLStates(sfRenderWindow* renderWindow)
 {
     assert(renderWindow);
-    renderWindow->This.resetGLStates();
+    renderWindow->resetGLStates();
 }
 
 
@@ -526,7 +526,7 @@ void sfRenderWindow_resetGLStates(sfRenderWindow* renderWindow)
 sfVector2i sfMouse_getPositionRenderWindow(const sfRenderWindow* relativeTo)
 {
     if (relativeTo)
-        return convertVector2(sf::Mouse::getPosition(relativeTo->This));
+        return convertVector2(sf::Mouse::getPosition(*relativeTo));
 
     return convertVector2(sf::Mouse::getPosition());
 }
@@ -536,7 +536,7 @@ sfVector2i sfMouse_getPositionRenderWindow(const sfRenderWindow* relativeTo)
 void sfMouse_setPositionRenderWindow(sfVector2i position, const sfRenderWindow* relativeTo)
 {
     if (relativeTo)
-        sf::Mouse::setPosition(convertVector2(position), relativeTo->This);
+        sf::Mouse::setPosition(convertVector2(position), *relativeTo);
     else
         sf::Mouse::setPosition(convertVector2(position));
 }
@@ -546,7 +546,7 @@ void sfMouse_setPositionRenderWindow(sfVector2i position, const sfRenderWindow*
 sfVector2i sfTouch_getPositionRenderWindow(unsigned int finger, const sfRenderWindow* relativeTo)
 {
     if (relativeTo)
-        return convertVector2(sf::Touch::getPosition(finger, relativeTo->This));
+        return convertVector2(sf::Touch::getPosition(finger, *relativeTo));
 
     return convertVector2(sf::Touch::getPosition(finger));
 }
@@ -561,5 +561,5 @@ bool sfRenderWindow_createVulkanSurface(sfRenderWindow*              renderWindo
     assert(renderWindow);
     assert(instance);
     assert(surface);
-    return renderWindow->This.createVulkanSurface(*instance, *surface, allocator);
+    return renderWindow->createVulkanSurface(*instance, *surface, allocator);
 }

src/CSFML/Graphics/RenderWindowStruct.hpp

@@ -35,9 +35,8 @@
 ////////////////////////////////////////////////////////////
 // Internal structure of sfRenderWindow
 ////////////////////////////////////////////////////////////
-struct sfRenderWindow
+struct sfRenderWindow : sf::RenderWindow
 {
-    sf::RenderWindow This;
-    sfView           DefaultView;
-    sfView           CurrentView;
+    sfView DefaultView;
+    sfView CurrentView;
 };

src/CSFML/Graphics/Shader.cpp

@@ -37,8 +37,8 @@ sfShader* sfShader_createFromFile(const char* vertexShaderFilename,
                                   const char* geometryShaderFilename,
                                   const char* fragmentShaderFilename)
 {
-    bool       success = false;
-    sf::Shader shader;
+    bool success = false;
+    auto shader  = std::make_unique<sfShader>();
     if (vertexShaderFilename || geometryShaderFilename || fragmentShaderFilename)
     {
         if (!geometryShaderFilename)
@@ -46,17 +46,17 @@ sfShader* sfShader_createFromFile(const char* vertexShaderFilename,
             if (!vertexShaderFilename)
             {
                 // fragment shader only
-                success = shader.loadFromFile(fragmentShaderFilename, sf::Shader::Type::Fragment);
+                success = shader->loadFromFile(fragmentShaderFilename, sf::Shader::Type::Fragment);
             }
             else if (!fragmentShaderFilename)
             {
                 // vertex shader only
-                success = shader.loadFromFile(vertexShaderFilename, sf::Shader::Type::Vertex);
+                success = shader->loadFromFile(vertexShaderFilename, sf::Shader::Type::Vertex);
             }
             else
             {
                 // vertex + fragment shaders
-                success = shader.loadFromFile(vertexShaderFilename, fragmentShaderFilename);
+                success = shader->loadFromFile(vertexShaderFilename, fragmentShaderFilename);
             }
         }
         else
@@ -64,12 +64,12 @@ sfShader* sfShader_createFromFile(const char* vertexShaderFilename,
             if (!vertexShaderFilename && !fragmentShaderFilename)
             {
                 // geometry shader only
-                success = shader.loadFromFile(geometryShaderFilename, sf::Shader::Type::Geometry);
+                success = shader->loadFromFile(geometryShaderFilename, sf::Shader::Type::Geometry);
             }
             else
             {
                 // vertex + geometry + fragment shaders
-                success = shader.loadFromFile(vertexShaderFilename, geometryShaderFilename, fragmentShaderFilename);
+                success = shader->loadFromFile(vertexShaderFilename, geometryShaderFilename, fragmentShaderFilename);
             }
         }
     }
@@ -77,15 +77,15 @@ sfShader* sfShader_createFromFile(const char* vertexShaderFilename,
     if (!success)
         return nullptr;
 
-    return new sfShader{std::move(shader)};
+    return shader.release();
 }
 
 
 ////////////////////////////////////////////////////////////
 sfShader* sfShader_createFromMemory(const char* vertexShader, const char* geometryShader, const char* fragmentShader)
 {
-    bool       success = false;
-    sf::Shader shader;
+    bool success = false;
+    auto shader  = std::make_unique<sfShader>();
     if (vertexShader || geometryShader || fragmentShader)
     {
         if (!geometryShader)
@@ -93,17 +93,17 @@ sfShader* sfShader_createFromMemory(const char* vertexShader, const char* geomet
             if (!vertexShader)
             {
                 // fragment shader only
-                success = shader.loadFromMemory(fragmentShader, sf::Shader::Type::Fragment);
+                success = shader->loadFromMemory(fragmentShader, sf::Shader::Type::Fragment);
             }
             else if (!fragmentShader)
             {
                 // vertex shader only
-                success = shader.loadFromMemory(vertexShader, sf::Shader::Type::Vertex);
+                success = shader->loadFromMemory(vertexShader, sf::Shader::Type::Vertex);
             }
             else
             {
                 // vertex + fragment shaders
-                success = shader.loadFromMemory(vertexShader, fragmentShader);
+                success = shader->loadFromMemory(vertexShader, fragmentShader);
             }
         }
         else
@@ -111,12 +111,12 @@ sfShader* sfShader_createFromMemory(const char* vertexShader, const char* geomet
             if (!vertexShader && !fragmentShader)
             {
                 // geometry shader only
-                success = shader.loadFromMemory(geometryShader, sf::Shader::Type::Geometry);
+                success = shader->loadFromMemory(geometryShader, sf::Shader::Type::Geometry);
             }
             else
             {
                 // vertex + geometry + fragment shaders
-                success = shader.loadFromMemory(vertexShader, geometryShader, fragmentShader);
+                success = shader->loadFromMemory(vertexShader, geometryShader, fragmentShader);
             }
         }
     }
@@ -124,7 +124,7 @@ sfShader* sfShader_createFromMemory(const char* vertexShader, const char* geomet
     if (!success)
         return nullptr;
 
-    return new sfShader{std::move(shader)};
+    return shader.release();
 }
 
 
@@ -133,8 +133,8 @@ sfShader* sfShader_createFromStream(sfInputStream* vertexShaderStream,
                                     sfInputStream* geometryShaderStream,
                                     sfInputStream* fragmentShaderStream)
 {
-    bool       success = false;
-    sf::Shader shader;
+    bool success = false;
+    auto shader  = std::make_unique<sfShader>();
     if (vertexShaderStream || geometryShaderStream || fragmentShaderStream)
     {
         if (!geometryShaderStream)
@@ -143,20 +143,20 @@ sfShader* sfShader_createFromStream(sfInputStream* vertexShaderStream,
             {
                 // fragment shader only
                 CallbackStream stream(fragmentShaderStream);
-                success = shader.loadFromStream(stream, sf::Shader::Type::Fragment);
+                success = shader->loadFromStream(stream, sf::Shader::Type::Fragment);
             }
             else if (!fragmentShaderStream)
             {
                 // vertex shader only
                 CallbackStream stream(vertexShaderStream);
-                success = shader.loadFromStream(stream, sf::Shader::Type::Vertex);
+                success = shader->loadFromStream(stream, sf::Shader::Type::Vertex);
             }
             else
             {
                 // vertex + fragment shaders
                 CallbackStream vertexStream(vertexShaderStream);
                 CallbackStream fragmentStream(fragmentShaderStream);
-                success = shader.loadFromStream(vertexStream, fragmentStream);
+                success = shader->loadFromStream(vertexStream, fragmentStream);
             }
         }
         else
@@ -165,14 +165,14 @@ sfShader* sfShader_createFromStream(sfInputStream* vertexShaderStream,
             if (!vertexShaderStream && !fragmentShaderStream)
             {
                 // geometry shader only
-                success = shader.loadFromStream(geometryStream, sf::Shader::Type::Geometry);
+                success = shader->loadFromStream(geometryStream, sf::Shader::Type::Geometry);
             }
             else
             {
                 // vertex + geometry + fragment shaders
                 CallbackStream vertexStream(vertexShaderStream);
                 CallbackStream fragmentStream(fragmentShaderStream);
-                success = shader.loadFromStream(vertexStream, geometryStream, fragmentStream);
+                success = shader->loadFromStream(vertexStream, geometryStream, fragmentStream);
             }
         }
     }
@@ -180,7 +180,7 @@ sfShader* sfShader_createFromStream(sfInputStream* vertexShaderStream,
     if (!success)
         return nullptr;
 
-    return new sfShader{std::move(shader)};
+    return shader.release();
 }
 
 
@@ -196,7 +196,7 @@ void sfShader_setFloatUniform(sfShader* shader, const char* name, float x)
 {
     assert(shader);
     assert(name);
-    shader->This.setUniform(name, x);
+    shader->setUniform(name, x);
 }
 
 
@@ -205,7 +205,7 @@ void sfShader_setVec2Uniform(sfShader* shader, const char* name, sfGlslVec2 vect
 {
     assert(shader);
     assert(name);
-    shader->This.setUniform(name, sf::Glsl::Vec2(vector.x, vector.y));
+    shader->setUniform(name, sf::Glsl::Vec2(vector.x, vector.y));
 }
 
 
@@ -214,7 +214,7 @@ void sfShader_setVec3Uniform(sfShader* shader, const char* name, sfGlslVec3 vect
 {
     assert(shader);
     assert(name);
-    shader->This.setUniform(name, sf::Glsl::Vec3(vector.x, vector.y, vector.z));
+    shader->setUniform(name, sf::Glsl::Vec3(vector.x, vector.y, vector.z));
 }
 
 
@@ -223,7 +223,7 @@ void sfShader_setVec4Uniform(sfShader* shader, const char* name, sfGlslVec4 vect
 {
     assert(shader);
     assert(name);
-    shader->This.setUniform(name, sf::Glsl::Vec4(vector.x, vector.y, vector.z, vector.w));
+    shader->setUniform(name, sf::Glsl::Vec4(vector.x, vector.y, vector.z, vector.w));
 }
 
 
@@ -244,7 +244,7 @@ void sfShader_setIntUniform(sfShader* shader, const char* name, int x)
 {
     assert(shader);
     assert(name);
-    shader->This.setUniform(name, x);
+    shader->setUniform(name, x);
 }
 
 
@@ -253,7 +253,7 @@ void sfShader_setIvec2Uniform(sfShader* shader, const char* name, sfGlslIvec2 ve
 {
     assert(shader);
     assert(name);
-    shader->This.setUniform(name, sf::Glsl::Ivec2(vector.x, vector.y));
+    shader->setUniform(name, sf::Glsl::Ivec2(vector.x, vector.y));
 }
 
 
@@ -262,7 +262,7 @@ void sfShader_setIvec3Uniform(sfShader* shader, const char* name, sfGlslIvec3 ve
 {
     assert(shader);
     assert(name);
-    shader->This.setUniform(name, sf::Glsl::Ivec3(vector.x, vector.y, vector.z));
+    shader->setUniform(name, sf::Glsl::Ivec3(vector.x, vector.y, vector.z));
 }
 
 
@@ -271,7 +271,7 @@ void sfShader_setIvec4Uniform(sfShader* shader, const char* name, sfGlslIvec4 ve
 {
     assert(shader);
     assert(name);
-    shader->This.setUniform(name, sf::Glsl::Ivec4(vector.x, vector.y, vector.z, vector.w));
+    shader->setUniform(name, sf::Glsl::Ivec4(vector.x, vector.y, vector.z, vector.w));
 }
 
 
@@ -292,7 +292,7 @@ void sfShader_setBoolUniform(sfShader* shader, const char* name, bool x)
 {
     assert(shader);
     assert(name);
-    shader->This.setUniform(name, x);
+    shader->setUniform(name, x);
 }
 
 
@@ -301,7 +301,7 @@ void sfShader_setBvec2Uniform(sfShader* shader, const char* name, sfGlslBvec2 ve
 {
     assert(shader);
     assert(name);
-    shader->This.setUniform(name, sf::Glsl::Bvec2(vector.x, vector.y));
+    shader->setUniform(name, sf::Glsl::Bvec2(vector.x, vector.y));
 }
 
 
@@ -310,7 +310,7 @@ void sfShader_setBvec3Uniform(sfShader* shader, const char* name, sfGlslBvec3 ve
 {
     assert(shader);
     assert(name);
-    shader->This.setUniform(name, sf::Glsl::Bvec3(vector.x, vector.y, vector.z));
+    shader->setUniform(name, sf::Glsl::Bvec3(vector.x, vector.y, vector.z));
 }
 
 
@@ -319,7 +319,7 @@ void sfShader_setBvec4Uniform(sfShader* shader, const char* name, sfGlslBvec4 ve
 {
     assert(shader);
     assert(name);
-    shader->This.setUniform(name, sf::Glsl::Bvec4(vector.x, vector.y, vector.z, vector.w));
+    shader->setUniform(name, sf::Glsl::Bvec4(vector.x, vector.y, vector.z, vector.w));
 }
 
 
@@ -328,7 +328,7 @@ void sfShader_setMat3Uniform(sfShader* shader, const char* name, const sfGlslMat
 {
     assert(shader);
     assert(name);
-    shader->This.setUniform(name, sf::Glsl::Mat3(matrix->array));
+    shader->setUniform(name, sf::Glsl::Mat3(matrix->array));
 }
 
 
@@ -337,7 +337,7 @@ void sfShader_setMat4Uniform(sfShader* shader, const char* name, const sfGlslMat
 {
     assert(shader);
     assert(name);
-    shader->This.setUniform(name, sf::Glsl::Mat4(matrix->array));
+    shader->setUniform(name, sf::Glsl::Mat4(matrix->array));
 }
 
 
@@ -346,7 +346,7 @@ void sfShader_setTextureUniform(sfShader* shader, const char* name, const sfText
 {
     assert(shader);
     assert(name);
-    shader->This.setUniform(name, *texture->This);
+    shader->setUniform(name, *texture->This);
 }
 
 
@@ -355,7 +355,7 @@ void sfShader_setCurrentTextureUniform(sfShader* shader, const char* name)
 {
     assert(shader);
     assert(name);
-    shader->This.setUniform(name, sf::Shader::CurrentTexture);
+    shader->setUniform(name, sf::Shader::CurrentTexture);
 }
 
 
@@ -364,7 +364,7 @@ void sfShader_setFloatUniformArray(sfShader* shader, const char* name, const flo
 {
     assert(shader);
     assert(name);
-    shader->This.setUniformArray(name, scalarArray, length);
+    shader->setUniformArray(name, scalarArray, length);
 }
 
 
@@ -373,7 +373,7 @@ void sfShader_setVec2UniformArray(sfShader* shader, const char* name, const sfGl
 {
     assert(shader);
     assert(name);
-    shader->This.setUniformArray(name, reinterpret_cast<const sf::Glsl::Vec2*>(vectorArray), length);
+    shader->setUniformArray(name, reinterpret_cast<const sf::Glsl::Vec2*>(vectorArray), length);
 }
 
 
@@ -382,7 +382,7 @@ void sfShader_setVec3UniformArray(sfShader* shader, const char* name, const sfGl
 {
     assert(shader);
     assert(name);
-    shader->This.setUniformArray(name, reinterpret_cast<const sf::Glsl::Vec3*>(vectorArray), length);
+    shader->setUniformArray(name, reinterpret_cast<const sf::Glsl::Vec3*>(vectorArray), length);
 }
 
 
@@ -391,7 +391,7 @@ void sfShader_setVec4UniformArray(sfShader* shader, const char* name, const sfGl
 {
     assert(shader);
     assert(name);
-    shader->This.setUniformArray(name, reinterpret_cast<const sf::Glsl::Vec4*>(vectorArray), length);
+    shader->setUniformArray(name, reinterpret_cast<const sf::Glsl::Vec4*>(vectorArray), length);
 }
 
 
@@ -400,7 +400,7 @@ void sfShader_setMat3UniformArray(sfShader* shader, const char* name, const sfGl
 {
     assert(shader);
     assert(name);
-    shader->This.setUniformArray(name, reinterpret_cast<const sf::Glsl::Mat3*>(matrixArray), length);
+    shader->setUniformArray(name, reinterpret_cast<const sf::Glsl::Mat3*>(matrixArray), length);
 }
 
 
@@ -409,7 +409,7 @@ void sfShader_setMat4UniformArray(sfShader* shader, const char* name, const sfGl
 {
     assert(shader);
     assert(name);
-    shader->This.setUniformArray(name, reinterpret_cast<const sf::Glsl::Mat4*>(matrixArray), length);
+    shader->setUniformArray(name, reinterpret_cast<const sf::Glsl::Mat4*>(matrixArray), length);
 }
 
 
@@ -419,7 +419,7 @@ void sfShader_setTextureParameter(sfShader* shader, const char* name, const sfTe
     assert(shader);
     assert(name);
     assert(texture);
-    shader->This.setUniform(name, *texture->This);
+    shader->setUniform(name, *texture->This);
 }
 
 
@@ -427,14 +427,14 @@ void sfShader_setTextureParameter(sfShader* shader, const char* name, const sfTe
 unsigned int sfShader_getNativeHandle(const sfShader* shader)
 {
     assert(shader);
-    return shader->This.getNativeHandle();
+    return shader->getNativeHandle();
 }
 
 
 ////////////////////////////////////////////////////////////
 void sfShader_bind(const sfShader* shader)
 {
-    sf::Shader::bind(shader ? &shader->This : nullptr);
+    sf::Shader::bind(shader);
 }
 
 

src/CSFML/Graphics/ShaderStruct.hpp

@@ -33,7 +33,6 @@
 ////////////////////////////////////////////////////////////
 // Internal structure of sfShader
 ////////////////////////////////////////////////////////////
-struct sfShader
+struct sfShader : sf::Shader
 {
-    sf::Shader This;
 };

src/CSFML/Graphics/Sprite.cpp

@@ -41,7 +41,9 @@ sfSprite* sfSprite_create(const sfTexture* texture)
 {
     assert(texture);
     assert(texture->This);
-    return new sfSprite{sf::Sprite{*texture->This}, texture, {}, {}};
+    auto sprite     = new sfSprite(*texture->This);
+    sprite->Texture = texture;
+    return sprite;
 }
 
 
@@ -64,7 +66,7 @@ void sfSprite_destroy(const sfSprite* sprite)
 void sfSprite_setPosition(sfSprite* sprite, sfVector2f position)
 {
     assert(sprite);
-    sprite->This.setPosition(convertVector2(position));
+    sprite->setPosition(convertVector2(position));
 }
 
 
@@ -72,7 +74,7 @@ void sfSprite_setPosition(sfSprite* sprite, sfVector2f position)
 void sfSprite_setRotation(sfSprite* sprite, float angle)
 {
     assert(sprite);
-    sprite->This.setRotation(sf::degrees(angle));
+    sprite->setRotation(sf::degrees(angle));
 }
 
 
@@ -80,7 +82,7 @@ void sfSprite_setRotation(sfSprite* sprite, float angle)
 void sfSprite_setScale(sfSprite* sprite, sfVector2f scale)
 {
     assert(sprite);
-    sprite->This.setScale(convertVector2(scale));
+    sprite->setScale(convertVector2(scale));
 }
 
 
@@ -88,7 +90,7 @@ void sfSprite_setScale(sfSprite* sprite, sfVector2f scale)
 void sfSprite_setOrigin(sfSprite* sprite, sfVector2f origin)
 {
     assert(sprite);
-    sprite->This.setOrigin(convertVector2(origin));
+    sprite->setOrigin(convertVector2(origin));
 }
 
 
@@ -96,7 +98,7 @@ void sfSprite_setOrigin(sfSprite* sprite, sfVector2f origin)
 sfVector2f sfSprite_getPosition(const sfSprite* sprite)
 {
     assert(sprite);
-    return convertVector2(sprite->This.getPosition());
+    return convertVector2(sprite->getPosition());
 }
 
 
@@ -104,7 +106,7 @@ sfVector2f sfSprite_getPosition(const sfSprite* sprite)
 float sfSprite_getRotation(const sfSprite* sprite)
 {
     assert(sprite);
-    return sprite->This.getRotation().asDegrees();
+    return sprite->getRotation().asDegrees();
 }
 
 
@@ -112,7 +114,7 @@ float sfSprite_getRotation(const sfSprite* sprite)
 sfVector2f sfSprite_getScale(const sfSprite* sprite)
 {
     assert(sprite);
-    return convertVector2(sprite->This.getScale());
+    return convertVector2(sprite->getScale());
 }
 
 
@@ -120,7 +122,7 @@ sfVector2f sfSprite_getScale(const sfSprite* sprite)
 sfVector2f sfSprite_getOrigin(const sfSprite* sprite)
 {
     assert(sprite);
-    return convertVector2(sprite->This.getOrigin());
+    return convertVector2(sprite->getOrigin());
 }
 
 
@@ -128,7 +130,7 @@ sfVector2f sfSprite_getOrigin(const sfSprite* sprite)
 void sfSprite_move(sfSprite* sprite, sfVector2f offset)
 {
     assert(sprite);
-    sprite->This.move(convertVector2(offset));
+    sprite->move(convertVector2(offset));
 }
 
 
@@ -136,7 +138,7 @@ void sfSprite_move(sfSprite* sprite, sfVector2f offset)
 void sfSprite_rotate(sfSprite* sprite, float angle)
 {
     assert(sprite);
-    sprite->This.rotate(sf::degrees(angle));
+    sprite->rotate(sf::degrees(angle));
 }
 
 
@@ -144,7 +146,7 @@ void sfSprite_rotate(sfSprite* sprite, float angle)
 void sfSprite_scale(sfSprite* sprite, sfVector2f factors)
 {
     assert(sprite);
-    sprite->This.scale(convertVector2(factors));
+    sprite->scale(convertVector2(factors));
 }
 
 
@@ -152,7 +154,7 @@ void sfSprite_scale(sfSprite* sprite, sfVector2f factors)
 sfTransform sfSprite_getTransform(const sfSprite* sprite)
 {
     assert(sprite);
-    sprite->Transform = convertTransform(sprite->This.getTransform());
+    sprite->Transform = convertTransform(sprite->getTransform());
     return sprite->Transform;
 }
 
@@ -161,7 +163,7 @@ sfTransform sfSprite_getTransform(const sfSprite* sprite)
 sfTransform sfSprite_getInverseTransform(const sfSprite* sprite)
 {
     assert(sprite);
-    sprite->InverseTransform = convertTransform(sprite->This.getInverseTransform());
+    sprite->InverseTransform = convertTransform(sprite->getInverseTransform());
     return sprite->InverseTransform;
 }
 
@@ -172,7 +174,7 @@ void sfSprite_setTexture(sfSprite* sprite, const sfTexture* texture, bool resetR
     if (texture && texture->This)
     {
         assert(sprite);
-        sprite->This.setTexture(*texture->This, resetRect);
+        sprite->setTexture(*texture->This, resetRect);
         sprite->Texture = texture;
     }
 }
@@ -182,7 +184,7 @@ void sfSprite_setTexture(sfSprite* sprite, const sfTexture* texture, bool resetR
 void sfSprite_setTextureRect(sfSprite* sprite, sfIntRect rectangle)
 {
     assert(sprite);
-    sprite->This.setTextureRect(convertRect(rectangle));
+    sprite->setTextureRect(convertRect(rectangle));
 }
 
 
@@ -190,7 +192,7 @@ void sfSprite_setTextureRect(sfSprite* sprite, sfIntRect rectangle)
 void sfSprite_setColor(sfSprite* sprite, sfColor color)
 {
     assert(sprite);
-    sprite->This.setColor(convertColor(color));
+    sprite->setColor(convertColor(color));
 }
 
 
@@ -206,7 +208,7 @@ const sfTexture* sfSprite_getTexture(const sfSprite* sprite)
 sfIntRect sfSprite_getTextureRect(const sfSprite* sprite)
 {
     assert(sprite);
-    return convertRect(sprite->This.getTextureRect());
+    return convertRect(sprite->getTextureRect());
 }
 
 
@@ -214,7 +216,7 @@ sfIntRect sfSprite_getTextureRect(const sfSprite* sprite)
 sfColor sfSprite_getColor(const sfSprite* sprite)
 {
     assert(sprite);
-    return convertColor(sprite->This.getColor());
+    return convertColor(sprite->getColor());
 }
 
 
@@ -222,7 +224,7 @@ sfColor sfSprite_getColor(const sfSprite* sprite)
 sfFloatRect sfSprite_getLocalBounds(const sfSprite* sprite)
 {
     assert(sprite);
-    return convertRect(sprite->This.getLocalBounds());
+    return convertRect(sprite->getLocalBounds());
 }
 
 
@@ -230,5 +232,5 @@ sfFloatRect sfSprite_getLocalBounds(const sfSprite* sprite)
 sfFloatRect sfSprite_getGlobalBounds(const sfSprite* sprite)
 {
     assert(sprite);
-    return convertRect(sprite->This.getGlobalBounds());
+    return convertRect(sprite->getGlobalBounds());
 }

src/CSFML/Graphics/SpriteStruct.hpp

@@ -36,10 +36,10 @@
 ////////////////////////////////////////////////////////////
 // Internal structure of sfSprite
 ////////////////////////////////////////////////////////////
-struct sfSprite
+struct sfSprite : sf::Sprite
 {
-    sf::Sprite          This;
-    const sfTexture*    Texture;
-    mutable sfTransform Transform;
-    mutable sfTransform InverseTransform;
+    using sf::Sprite::Sprite;
+    const sfTexture*    Texture{};
+    mutable sfTransform Transform{};
+    mutable sfTransform InverseTransform{};
 };

src/CSFML/Graphics/Text.cpp

@@ -40,7 +40,9 @@
 sfText* sfText_create(const sfFont* font)
 {
     assert(font);
-    return new sfText{sf::Text{font->This}, font, {}, {}, {}};
+    auto text  = new sfText(*font);
+    text->Font = font;
+    return text;
 }
 
 
@@ -63,7 +65,7 @@ void sfText_destroy(const sfText* text)
 void sfText_setPosition(sfText* text, sfVector2f position)
 {
     assert(text);
-    text->This.setPosition(convertVector2(position));
+    text->setPosition(convertVector2(position));
 }
 
 
@@ -71,7 +73,7 @@ void sfText_setPosition(sfText* text, sfVector2f position)
 void sfText_setRotation(sfText* text, float angle)
 {
     assert(text);
-    text->This.setRotation(sf::degrees(angle));
+    text->setRotation(sf::degrees(angle));
 }
 
 
@@ -79,7 +81,7 @@ void sfText_setRotation(sfText* text, float angle)
 void sfText_setScale(sfText* text, sfVector2f scale)
 {
     assert(text);
-    text->This.setScale(convertVector2(scale));
+    text->setScale(convertVector2(scale));
 }
 
 
@@ -87,7 +89,7 @@ void sfText_setScale(sfText* text, sfVector2f scale)
 void sfText_setOrigin(sfText* text, sfVector2f origin)
 {
     assert(text);
-    text->This.setOrigin(convertVector2(origin));
+    text->setOrigin(convertVector2(origin));
 }
 
 
@@ -95,7 +97,7 @@ void sfText_setOrigin(sfText* text, sfVector2f origin)
 sfVector2f sfText_getPosition(const sfText* text)
 {
     assert(text);
-    return convertVector2(text->This.getPosition());
+    return convertVector2(text->getPosition());
 }
 
 
@@ -103,7 +105,7 @@ sfVector2f sfText_getPosition(const sfText* text)
 float sfText_getRotation(const sfText* text)
 {
     assert(text);
-    return text->This.getRotation().asDegrees();
+    return text->getRotation().asDegrees();
 }
 
 
@@ -111,7 +113,7 @@ float sfText_getRotation(const sfText* text)
 sfVector2f sfText_getScale(const sfText* text)
 {
     assert(text);
-    return convertVector2(text->This.getScale());
+    return convertVector2(text->getScale());
 }
 
 
@@ -119,7 +121,7 @@ sfVector2f sfText_getScale(const sfText* text)
 sfVector2f sfText_getOrigin(const sfText* text)
 {
     assert(text);
-    return convertVector2(text->This.getOrigin());
+    return convertVector2(text->getOrigin());
 }
 
 
@@ -127,7 +129,7 @@ sfVector2f sfText_getOrigin(const sfText* text)
 void sfText_move(sfText* text, sfVector2f offset)
 {
     assert(text);
-    text->This.move(convertVector2(offset));
+    text->move(convertVector2(offset));
 }
 
 
@@ -135,7 +137,7 @@ void sfText_move(sfText* text, sfVector2f offset)
 void sfText_rotate(sfText* text, float angle)
 {
     assert(text);
-    text->This.rotate(sf::degrees(angle));
+    text->rotate(sf::degrees(angle));
 }
 
 
@@ -143,7 +145,7 @@ void sfText_rotate(sfText* text, float angle)
 void sfText_scale(sfText* text, sfVector2f factors)
 {
     assert(text);
-    text->This.scale(convertVector2(factors));
+    text->scale(convertVector2(factors));
 }
 
 
@@ -151,7 +153,7 @@ void sfText_scale(sfText* text, sfVector2f factors)
 sfTransform sfText_getTransform(const sfText* text)
 {
     assert(text);
-    text->Transform = convertTransform(text->This.getTransform());
+    text->Transform = convertTransform(text->getTransform());
     return text->Transform;
 }
 
@@ -160,7 +162,7 @@ sfTransform sfText_getTransform(const sfText* text)
 sfTransform sfText_getInverseTransform(const sfText* text)
 {
     assert(text);
-    text->InverseTransform = convertTransform(text->This.getInverseTransform());
+    text->InverseTransform = convertTransform(text->getInverseTransform());
     return text->InverseTransform;
 }
 
@@ -169,7 +171,7 @@ sfTransform sfText_getInverseTransform(const sfText* text)
 void sfText_setString(sfText* text, const char* string)
 {
     assert(text);
-    text->This.setString(string);
+    text->setString(string);
 }
 
 
@@ -178,7 +180,7 @@ void sfText_setUnicodeString(sfText* text, const sfChar32* string)
 {
     assert(text);
     sf::String utf32Text = reinterpret_cast<const char32_t*>(string);
-    text->This.setString(utf32Text);
+    text->setString(utf32Text);
 }
 
 
@@ -187,7 +189,7 @@ void sfText_setFont(sfText* text, const sfFont* font)
 {
     assert(text);
     assert(font);
-    text->This.setFont(font->This);
+    text->setFont(*font);
     text->Font = font;
 }
 
@@ -196,7 +198,7 @@ void sfText_setFont(sfText* text, const sfFont* font)
 void sfText_setCharacterSize(sfText* text, unsigned int size)
 {
     assert(text);
-    text->This.setCharacterSize(size);
+    text->setCharacterSize(size);
 }
 
 
@@ -204,7 +206,7 @@ void sfText_setCharacterSize(sfText* text, unsigned int size)
 void sfText_setLineSpacing(sfText* text, float spacingFactor)
 {
     assert(text);
-    text->This.setLineSpacing(spacingFactor);
+    text->setLineSpacing(spacingFactor);
 }
 
 
@@ -212,7 +214,7 @@ void sfText_setLineSpacing(sfText* text, float spacingFactor)
 void sfText_setLetterSpacing(sfText* text, float spacingFactor)
 {
     assert(text);
-    text->This.setLetterSpacing(spacingFactor);
+    text->setLetterSpacing(spacingFactor);
 }
 
 
@@ -220,7 +222,7 @@ void sfText_setLetterSpacing(sfText* text, float spacingFactor)
 void sfText_setStyle(sfText* text, uint32_t style)
 {
     assert(text);
-    text->This.setStyle(style);
+    text->setStyle(style);
 }
 
 
@@ -228,7 +230,7 @@ void sfText_setStyle(sfText* text, uint32_t style)
 void sfText_setFillColor(sfText* text, sfColor color)
 {
     assert(text);
-    text->This.setFillColor(convertColor(color));
+    text->setFillColor(convertColor(color));
 }
 
 
@@ -236,7 +238,7 @@ void sfText_setFillColor(sfText* text, sfColor color)
 void sfText_setOutlineColor(sfText* text, sfColor color)
 {
     assert(text);
-    text->This.setOutlineColor(convertColor(color));
+    text->setOutlineColor(convertColor(color));
 }
 
 
@@ -244,7 +246,7 @@ void sfText_setOutlineColor(sfText* text, sfColor color)
 void sfText_setOutlineThickness(sfText* text, float thickness)
 {
     assert(text);
-    text->This.setOutlineThickness(thickness);
+    text->setOutlineThickness(thickness);
 }
 
 
@@ -253,7 +255,7 @@ const char* sfText_getString(const sfText* text)
 {
     assert(text);
 
-    text->String = text->This.getString().toAnsiString();
+    text->String = text->getString().toAnsiString();
 
     return text->String.c_str();
 }
@@ -263,7 +265,7 @@ const char* sfText_getString(const sfText* text)
 const sfChar32* sfText_getUnicodeString(const sfText* text)
 {
     assert(text);
-    return reinterpret_cast<const sfChar32*>(text->This.getString().getData());
+    return reinterpret_cast<const sfChar32*>(text->getString().getData());
 }
 
 
@@ -279,7 +281,7 @@ const sfFont* sfText_getFont(const sfText* text)
 unsigned int sfText_getCharacterSize(const sfText* text)
 {
     assert(text);
-    return text->This.getCharacterSize();
+    return text->getCharacterSize();
 }
 
 
@@ -287,7 +289,7 @@ unsigned int sfText_getCharacterSize(const sfText* text)
 float sfText_getLetterSpacing(const sfText* text)
 {
     assert(text);
-    return text->This.getLetterSpacing();
+    return text->getLetterSpacing();
 }
 
 
@@ -295,7 +297,7 @@ float sfText_getLetterSpacing(const sfText* text)
 float sfText_getLineSpacing(const sfText* text)
 {
     assert(text);
-    return text->This.getLineSpacing();
+    return text->getLineSpacing();
 }
 
 
@@ -303,7 +305,7 @@ float sfText_getLineSpacing(const sfText* text)
 uint32_t sfText_getStyle(const sfText* text)
 {
     assert(text);
-    return text->This.getStyle();
+    return text->getStyle();
 }
 
 
@@ -311,7 +313,7 @@ uint32_t sfText_getStyle(const sfText* text)
 sfColor sfText_getFillColor(const sfText* text)
 {
     assert(text);
-    return convertColor(text->This.getFillColor());
+    return convertColor(text->getFillColor());
 }
 
 
@@ -319,7 +321,7 @@ sfColor sfText_getFillColor(const sfText* text)
 sfColor sfText_getOutlineColor(const sfText* text)
 {
     assert(text);
-    return convertColor(text->This.getOutlineColor());
+    return convertColor(text->getOutlineColor());
 }
 
 
@@ -327,7 +329,7 @@ sfColor sfText_getOutlineColor(const sfText* text)
 float sfText_getOutlineThickness(const sfText* text)
 {
     assert(text);
-    return text->This.getOutlineThickness();
+    return text->getOutlineThickness();
 }
 
 
@@ -335,7 +337,7 @@ float sfText_getOutlineThickness(const sfText* text)
 sfVector2f sfText_findCharacterPos(const sfText* text, size_t index)
 {
     assert(text);
-    return convertVector2(text->This.findCharacterPos(index));
+    return convertVector2(text->findCharacterPos(index));
 }
 
 
@@ -343,7 +345,7 @@ sfVector2f sfText_findCharacterPos(const sfText* text, size_t index)
 sfFloatRect sfText_getLocalBounds(const sfText* text)
 {
     assert(text);
-    return convertRect(text->This.getLocalBounds());
+    return convertRect(text->getLocalBounds());
 }
 
 
@@ -351,5 +353,5 @@ sfFloatRect sfText_getLocalBounds(const sfText* text)
 sfFloatRect sfText_getGlobalBounds(const sfText* text)
 {
     assert(text);
-    return convertRect(text->This.getGlobalBounds());
+    return convertRect(text->getGlobalBounds());
 }

src/CSFML/Graphics/TextStruct.hpp

@@ -39,11 +39,11 @@
 ////////////////////////////////////////////////////////////
 // Internal structure of sfText
 ////////////////////////////////////////////////////////////
-struct sfText
+struct sfText : sf::Text
 {
-    sf::Text            This;
-    const sfFont*       Font;
+    using sf::Text::Text;
+    const sfFont*       Font{};
     mutable std::string String;
-    mutable sfTransform Transform;
-    mutable sfTransform InverseTransform;
+    mutable sfTransform Transform{};
+    mutable sfTransform InverseTransform{};
 };

src/CSFML/Graphics/Texture.cpp

@@ -64,9 +64,8 @@ sfTexture* sfTexture_createFromFile(const char* filename, const sfIntRect* area)
 {
     assert(filename);
 
-    const auto rect    = area ? convertRect(*area) : sf::IntRect();
-    auto       texture = std::make_unique<sfTexture>();
-    if (!texture->This->loadFromFile(filename, false, rect))
+    auto texture = std::make_unique<sfTexture>();
+    if (!texture->This->loadFromFile(filename, false, area ? convertRect(*area) : sf::IntRect()))
         return nullptr;
 
     return texture.release();
@@ -77,9 +76,8 @@ sfTexture* sfTexture_createSrgbFromFile(const char* filename, const sfIntRect* a
 {
     assert(filename);
 
-    const auto rect    = area ? convertRect(*area) : sf::IntRect();
-    auto       texture = std::make_unique<sfTexture>();
-    if (!texture->This->loadFromFile(filename, true, rect))
+    auto texture = std::make_unique<sfTexture>();
+    if (!texture->This->loadFromFile(filename, true, area ? convertRect(*area) : sf::IntRect()))
         return nullptr;
 
     return texture.release();
@@ -88,9 +86,8 @@ sfTexture* sfTexture_createSrgbFromFile(const char* filename, const sfIntRect* a
 ////////////////////////////////////////////////////////////
 sfTexture* sfTexture_createFromMemory(const void* data, size_t sizeInBytes, const sfIntRect* area)
 {
-    const auto rect    = area ? convertRect(*area) : sf::IntRect();
-    auto       texture = std::make_unique<sfTexture>();
-    if (!texture->This->loadFromMemory(data, sizeInBytes, false, rect))
+    auto texture = std::make_unique<sfTexture>();
+    if (!texture->This->loadFromMemory(data, sizeInBytes, false, area ? convertRect(*area) : sf::IntRect()))
         return nullptr;
 
     return texture.release();
@@ -99,9 +96,8 @@ sfTexture* sfTexture_createFromMemory(const void* data, size_t sizeInBytes, cons
 ////////////////////////////////////////////////////////////
 sfTexture* sfTexture_createSrgbFromMemory(const void* data, size_t sizeInBytes, const sfIntRect* area)
 {
-    const auto rect    = area ? convertRect(*area) : sf::IntRect();
-    auto       texture = std::make_unique<sfTexture>();
-    if (!texture->This->loadFromMemory(data, sizeInBytes, true, rect))
+    auto texture = std::make_unique<sfTexture>();
+    if (!texture->This->loadFromMemory(data, sizeInBytes, true, area ? convertRect(*area) : sf::IntRect()))
         return nullptr;
 
     return texture.release();
@@ -113,10 +109,9 @@ sfTexture* sfTexture_createFromStream(sfInputStream* stream, const sfIntRect* ar
 {
     assert(stream);
 
-    const auto     rect = area ? convertRect(*area) : sf::IntRect();
     CallbackStream sfmlStream(stream);
     auto           texture = std::make_unique<sfTexture>();
-    if (!texture->This->loadFromStream(sfmlStream, false, rect))
+    if (!texture->This->loadFromStream(sfmlStream, false, area ? convertRect(*area) : sf::IntRect()))
         return nullptr;
 
     return texture.release();
@@ -127,10 +122,9 @@ sfTexture* sfTexture_createSrgbFromStream(sfInputStream* stream, const sfIntRect
 {
     assert(stream);
 
-    const auto     rect = area ? convertRect(*area) : sf::IntRect();
     CallbackStream sfmlStream(stream);
     auto           texture = std::make_unique<sfTexture>();
-    if (!texture->This->loadFromStream(sfmlStream, true, rect))
+    if (!texture->This->loadFromStream(sfmlStream, true, area ? convertRect(*area) : sf::IntRect()))
         return nullptr;
 
     return texture.release();
@@ -142,9 +136,8 @@ sfTexture* sfTexture_createFromImage(const sfImage* image, const sfIntRect* area
 {
     assert(image);
 
-    const auto rect    = area ? convertRect(*area) : sf::IntRect();
-    auto       texture = std::make_unique<sfTexture>();
-    if (!texture->This->loadFromImage(image->This, false, rect))
+    auto texture = std::make_unique<sfTexture>();
+    if (!texture->This->loadFromImage(*image, false, area ? convertRect(*area) : sf::IntRect()))
         return nullptr;
 
     return texture.release();
@@ -155,9 +148,8 @@ sfTexture* sfTexture_createSrgbFromImage(const sfImage* image, const sfIntRect*
 {
     assert(image);
 
-    const auto rect    = area ? convertRect(*area) : sf::IntRect();
-    auto       texture = std::make_unique<sfTexture>();
-    if (!texture->This->loadFromImage(image->This, true, rect))
+    auto texture = std::make_unique<sfTexture>();
+    if (!texture->This->loadFromImage(*image, true, area ? convertRect(*area) : sf::IntRect()))
         return nullptr;
 
     return texture.release();
@@ -218,7 +210,7 @@ void sfTexture_updateFromImage(sfTexture* texture, const sfImage* image, sfVecto
 {
     assert(texture);
     assert(image);
-    texture->This->update(image->This, convertVector2(offset));
+    texture->This->update(*image, convertVector2(offset));
 }
 
 
@@ -227,7 +219,7 @@ void sfTexture_updateFromWindow(sfTexture* texture, const sfWindow* window, sfVe
 {
     assert(texture);
     assert(window);
-    texture->This->update(window->This, convertVector2(offset));
+    texture->This->update(*window, convertVector2(offset));
 }
 
 
@@ -236,7 +228,7 @@ void sfTexture_updateFromRenderWindow(sfTexture* texture, const sfRenderWindow*
 {
     assert(texture);
     assert(renderWindow);
-    texture->This->update(renderWindow->This, convertVector2(offset));
+    texture->This->update(*renderWindow, convertVector2(offset));
 }
 
 

src/CSFML/Graphics/Transformable.cpp

@@ -59,7 +59,7 @@ void sfTransformable_destroy(const sfTransformable* transformable)
 void sfTransformable_setPosition(sfTransformable* transformable, sfVector2f position)
 {
     assert(transformable);
-    transformable->This.setPosition(convertVector2(position));
+    transformable->setPosition(convertVector2(position));
 }
 
 
@@ -67,7 +67,7 @@ void sfTransformable_setPosition(sfTransformable* transformable, sfVector2f posi
 void sfTransformable_setRotation(sfTransformable* transformable, float angle)
 {
     assert(transformable);
-    transformable->This.setRotation(sf::degrees(angle));
+    transformable->setRotation(sf::degrees(angle));
 }
 
 
@@ -75,7 +75,7 @@ void sfTransformable_setRotation(sfTransformable* transformable, float angle)
 void sfTransformable_setScale(sfTransformable* transformable, sfVector2f scale)
 {
     assert(transformable);
-    transformable->This.setScale(convertVector2(scale));
+    transformable->setScale(convertVector2(scale));
 }
 
 
@@ -83,7 +83,7 @@ void sfTransformable_setScale(sfTransformable* transformable, sfVector2f scale)
 void sfTransformable_setOrigin(sfTransformable* transformable, sfVector2f origin)
 {
     assert(transformable);
-    transformable->This.setOrigin(convertVector2(origin));
+    transformable->setOrigin(convertVector2(origin));
 }
 
 
@@ -91,7 +91,7 @@ void sfTransformable_setOrigin(sfTransformable* transformable, sfVector2f origin
 sfVector2f sfTransformable_getPosition(const sfTransformable* transformable)
 {
     assert(transformable);
-    return convertVector2(transformable->This.getPosition());
+    return convertVector2(transformable->getPosition());
 }
 
 
@@ -99,7 +99,7 @@ sfVector2f sfTransformable_getPosition(const sfTransformable* transformable)
 float sfTransformable_getRotation(const sfTransformable* transformable)
 {
     assert(transformable);
-    return transformable->This.getRotation().asDegrees();
+    return transformable->getRotation().asDegrees();
 }
 
 
@@ -107,7 +107,7 @@ float sfTransformable_getRotation(const sfTransformable* transformable)
 sfVector2f sfTransformable_getScale(const sfTransformable* transformable)
 {
     assert(transformable);
-    return convertVector2(transformable->This.getScale());
+    return convertVector2(transformable->getScale());
 }
 
 
@@ -115,7 +115,7 @@ sfVector2f sfTransformable_getScale(const sfTransformable* transformable)
 sfVector2f sfTransformable_getOrigin(const sfTransformable* transformable)
 {
     assert(transformable);
-    return convertVector2(transformable->This.getOrigin());
+    return convertVector2(transformable->getOrigin());
 }
 
 
@@ -123,7 +123,7 @@ sfVector2f sfTransformable_getOrigin(const sfTransformable* transformable)
 void sfTransformable_move(sfTransformable* transformable, sfVector2f offset)
 {
     assert(transformable);
-    transformable->This.move(convertVector2(offset));
+    transformable->move(convertVector2(offset));
 }
 
 
@@ -131,7 +131,7 @@ void sfTransformable_move(sfTransformable* transformable, sfVector2f offset)
 void sfTransformable_rotate(sfTransformable* transformable, float angle)
 {
     assert(transformable);
-    transformable->This.rotate(sf::degrees(angle));
+    transformable->rotate(sf::degrees(angle));
 }
 
 
@@ -139,7 +139,7 @@ void sfTransformable_rotate(sfTransformable* transformable, float angle)
 void sfTransformable_scale(sfTransformable* transformable, sfVector2f factors)
 {
     assert(transformable);
-    transformable->This.scale(convertVector2(factors));
+    transformable->scale(convertVector2(factors));
 }
 
 
@@ -147,7 +147,7 @@ void sfTransformable_scale(sfTransformable* transformable, sfVector2f factors)
 sfTransform sfTransformable_getTransform(const sfTransformable* transformable)
 {
     assert(transformable);
-    transformable->Transform = convertTransform(transformable->This.getTransform());
+    transformable->Transform = convertTransform(transformable->getTransform());
     return transformable->Transform;
 }
 
@@ -156,6 +156,6 @@ sfTransform sfTransformable_getTransform(const sfTransformable* transformable)
 sfTransform sfTransformable_getInverseTransform(const sfTransformable* transformable)
 {
     assert(transformable);
-    transformable->InverseTransform = convertTransform(transformable->This.getInverseTransform());
+    transformable->InverseTransform = convertTransform(transformable->getInverseTransform());
     return transformable->InverseTransform;
 }

src/CSFML/Graphics/TransformableStruct.hpp

@@ -35,9 +35,8 @@
 ////////////////////////////////////////////////////////////
 // Internal structure of sfTransformable
 ////////////////////////////////////////////////////////////
-struct sfTransformable
+struct sfTransformable : sf::Transformable
 {
-    sf::Transformable   This;
     mutable sfTransform Transform{};
     mutable sfTransform InverseTransform{};
 };

src/CSFML/Graphics/VertexArray.cpp

@@ -56,7 +56,7 @@ void sfVertexArray_destroy(const sfVertexArray* vertexArray)
 size_t sfVertexArray_getVertexCount(const sfVertexArray* vertexArray)
 {
     assert(vertexArray);
-    return vertexArray->This.getVertexCount();
+    return vertexArray->getVertexCount();
 }
 
 
@@ -66,7 +66,7 @@ sfVertex* sfVertexArray_getVertex(sfVertexArray* vertexArray, size_t index)
     assert(vertexArray);
 
     // the cast is safe, sfVertex has to be binary compatible with sf::Vertex
-    return reinterpret_cast<sfVertex*>(&vertexArray->This[index]);
+    return reinterpret_cast<sfVertex*>(&(*vertexArray)[index]);
 }
 
 
@@ -74,7 +74,7 @@ sfVertex* sfVertexArray_getVertex(sfVertexArray* vertexArray, size_t index)
 void sfVertexArray_clear(sfVertexArray* vertexArray)
 {
     assert(vertexArray);
-    vertexArray->This.clear();
+    vertexArray->clear();
 }
 
 
@@ -82,7 +82,7 @@ void sfVertexArray_clear(sfVertexArray* vertexArray)
 void sfVertexArray_resize(sfVertexArray* vertexArray, size_t vertexCount)
 {
     assert(vertexArray);
-    vertexArray->This.resize(vertexCount);
+    vertexArray->resize(vertexCount);
 }
 
 
@@ -91,7 +91,7 @@ void sfVertexArray_append(sfVertexArray* vertexArray, sfVertex vertex)
 {
     // the cast is safe, sfVertex has to be binary compatible with sf::Vertex
     assert(vertexArray);
-    vertexArray->This.append(reinterpret_cast<sf::Vertex&>(vertex));
+    vertexArray->append(reinterpret_cast<sf::Vertex&>(vertex));
 }
 
 
@@ -99,7 +99,7 @@ void sfVertexArray_append(sfVertexArray* vertexArray, sfVertex vertex)
 void sfVertexArray_setPrimitiveType(sfVertexArray* vertexArray, sfPrimitiveType type)
 {
     assert(vertexArray);
-    vertexArray->This.setPrimitiveType(static_cast<sf::PrimitiveType>(type));
+    vertexArray->setPrimitiveType(static_cast<sf::PrimitiveType>(type));
 }
 
 
@@ -107,7 +107,7 @@ void sfVertexArray_setPrimitiveType(sfVertexArray* vertexArray, sfPrimitiveType
 sfPrimitiveType sfVertexArray_getPrimitiveType(sfVertexArray* vertexArray)
 {
     assert(vertexArray);
-    return static_cast<sfPrimitiveType>(vertexArray->This.getPrimitiveType());
+    return static_cast<sfPrimitiveType>(vertexArray->getPrimitiveType());
 }
 
 
@@ -115,5 +115,5 @@ sfPrimitiveType sfVertexArray_getPrimitiveType(sfVertexArray* vertexArray)
 sfFloatRect sfVertexArray_getBounds(sfVertexArray* vertexArray)
 {
     assert(vertexArray);
-    return convertRect(vertexArray->This.getBounds());
+    return convertRect(vertexArray->getBounds());
 }

src/CSFML/Graphics/VertexArrayStruct.hpp

@@ -33,7 +33,6 @@
 ////////////////////////////////////////////////////////////
 // Internal structure of sfVertexArray
 ////////////////////////////////////////////////////////////
-struct sfVertexArray
+struct sfVertexArray : sf::VertexArray
 {
-    sf::VertexArray This;
 };

src/CSFML/Graphics/VertexBuffer.cpp

@@ -32,23 +32,21 @@
 ////////////////////////////////////////////////////////////
 sfVertexBuffer* sfVertexBuffer_create(unsigned int vertexCount, sfPrimitiveType type, sfVertexBufferUsage usage)
 {
-    sf::VertexBuffer buffer;
-    if (!buffer.create(vertexCount))
+    auto buffer = std::make_unique<sfVertexBuffer>();
+    if (!buffer->create(vertexCount))
         return nullptr;
 
-    buffer.setPrimitiveType(static_cast<sf::PrimitiveType>(type));
-    buffer.setUsage(static_cast<sf::VertexBuffer::Usage>(usage));
+    buffer->setPrimitiveType(static_cast<sf::PrimitiveType>(type));
+    buffer->setUsage(static_cast<sf::VertexBuffer::Usage>(usage));
 
-    return new sfVertexBuffer{std::move(buffer)};
+    return buffer.release();
 }
 
 
 ////////////////////////////////////////////////////////////
 sfVertexBuffer* sfVertexBuffer_copy(const sfVertexBuffer* vertexBuffer)
 {
-    auto* buffer = new sfVertexBuffer;
-    buffer->This = sf::VertexBuffer(vertexBuffer->This);
-    return buffer;
+    return new sfVertexBuffer(*vertexBuffer);
 }
 
 
@@ -63,7 +61,7 @@ void sfVertexBuffer_destroy(const sfVertexBuffer* vertexBuffer)
 size_t sfVertexBuffer_getVertexCount(const sfVertexBuffer* vertexBuffer)
 {
     assert(vertexBuffer);
-    return vertexBuffer->This.getVertexCount();
+    return vertexBuffer->getVertexCount();
 }
 
 
@@ -72,7 +70,7 @@ bool sfVertexBuffer_update(sfVertexBuffer* vertexBuffer, const sfVertex* vertice
 {
     // the cast is safe, sfVertex has to be binary compatible with sf::Vertex
     assert(vertexBuffer);
-    return vertexBuffer->This.update(reinterpret_cast<const sf::Vertex*>(vertices), vertexCount, offset);
+    return vertexBuffer->update(reinterpret_cast<const sf::Vertex*>(vertices), vertexCount, offset);
 }
 
 
@@ -80,7 +78,7 @@ bool sfVertexBuffer_update(sfVertexBuffer* vertexBuffer, const sfVertex* vertice
 bool sfVertexBuffer_updateFromVertexBuffer(sfVertexBuffer* vertexBuffer, const sfVertexBuffer* other)
 {
     assert(vertexBuffer);
-    return vertexBuffer->This.update(other->This);
+    return vertexBuffer->update(*other);
 }
 
 
@@ -89,7 +87,7 @@ void sfVertexBuffer_swap(sfVertexBuffer* left, sfVertexBuffer* right)
 {
     assert(left);
     assert(right);
-    left->This.swap(right->This);
+    left->swap(*right);
 }
 
 
@@ -97,7 +95,7 @@ void sfVertexBuffer_swap(sfVertexBuffer* left, sfVertexBuffer* right)
 unsigned int sfVertexBuffer_getNativeHandle(sfVertexBuffer* vertexBuffer)
 {
     assert(vertexBuffer);
-    return vertexBuffer->This.getNativeHandle();
+    return vertexBuffer->getNativeHandle();
 }
 
 
@@ -105,7 +103,7 @@ unsigned int sfVertexBuffer_getNativeHandle(sfVertexBuffer* vertexBuffer)
 void sfVertexBuffer_setPrimitiveType(sfVertexBuffer* vertexBuffer, sfPrimitiveType type)
 {
     assert(vertexBuffer);
-    vertexBuffer->This.setPrimitiveType(static_cast<sf::PrimitiveType>(type));
+    vertexBuffer->setPrimitiveType(static_cast<sf::PrimitiveType>(type));
 }
 
 
@@ -113,7 +111,7 @@ void sfVertexBuffer_setPrimitiveType(sfVertexBuffer* vertexBuffer, sfPrimitiveTy
 sfPrimitiveType sfVertexBuffer_getPrimitiveType(const sfVertexBuffer* vertexBuffer)
 {
     assert(vertexBuffer);
-    return static_cast<sfPrimitiveType>(vertexBuffer->This.getPrimitiveType());
+    return static_cast<sfPrimitiveType>(vertexBuffer->getPrimitiveType());
 }
 
 
@@ -121,7 +119,7 @@ sfPrimitiveType sfVertexBuffer_getPrimitiveType(const sfVertexBuffer* vertexBuff
 void sfVertexBuffer_setUsage(sfVertexBuffer* vertexBuffer, sfVertexBufferUsage usage)
 {
     assert(vertexBuffer);
-    vertexBuffer->This.setUsage(static_cast<sf::VertexBuffer::Usage>(usage));
+    vertexBuffer->setUsage(static_cast<sf::VertexBuffer::Usage>(usage));
 }
 
 
@@ -129,14 +127,14 @@ void sfVertexBuffer_setUsage(sfVertexBuffer* vertexBuffer, sfVertexBufferUsage u
 sfVertexBufferUsage sfVertexBuffer_getUsage(const sfVertexBuffer* vertexBuffer)
 {
     assert(vertexBuffer);
-    return static_cast<sfVertexBufferUsage>(vertexBuffer->This.getUsage());
+    return static_cast<sfVertexBufferUsage>(vertexBuffer->getUsage());
 }
 
 
 ////////////////////////////////////////////////////////////
 void sfVertexBuffer_bind(const sfVertexBuffer* vertexBuffer)
 {
-    sf::VertexBuffer::bind(&vertexBuffer->This);
+    sf::VertexBuffer::bind(vertexBuffer);
 }
 
 

src/CSFML/Graphics/VertexBufferStruct.hpp

@@ -33,7 +33,6 @@
 ////////////////////////////////////////////////////////////
 // Internal structure of sfVertexBuffer
 ////////////////////////////////////////////////////////////
-struct sfVertexBuffer
+struct sfVertexBuffer : sf::VertexBuffer
 {
-    sf::VertexBuffer This;
 };

src/CSFML/Graphics/View.cpp

@@ -64,7 +64,7 @@ void sfView_destroy(const sfView* view)
 void sfView_setCenter(sfView* view, sfVector2f center)
 {
     assert(view);
-    view->This.setCenter(convertVector2(center));
+    view->setCenter(convertVector2(center));
 }
 
 
@@ -72,7 +72,7 @@ void sfView_setCenter(sfView* view, sfVector2f center)
 void sfView_setSize(sfView* view, sfVector2f size)
 {
     assert(view);
-    view->This.setSize(convertVector2(size));
+    view->setSize(convertVector2(size));
 }
 
 
@@ -80,7 +80,7 @@ void sfView_setSize(sfView* view, sfVector2f size)
 void sfView_setRotation(sfView* view, float angle)
 {
     assert(view);
-    view->This.setRotation(sf::degrees(angle));
+    view->setRotation(sf::degrees(angle));
 }
 
 
@@ -88,7 +88,7 @@ void sfView_setRotation(sfView* view, float angle)
 void sfView_setViewport(sfView* view, sfFloatRect viewport)
 {
     assert(view);
-    view->This.setViewport(convertRect(viewport));
+    view->setViewport(convertRect(viewport));
 }
 
 
@@ -96,7 +96,7 @@ void sfView_setViewport(sfView* view, sfFloatRect viewport)
 void sfView_setScissor(sfView* view, sfFloatRect scissor)
 {
     assert(view);
-    view->This.setScissor(convertRect(scissor));
+    view->setScissor(convertRect(scissor));
 }
 
 
@@ -104,7 +104,7 @@ void sfView_setScissor(sfView* view, sfFloatRect scissor)
 sfVector2f sfView_getCenter(const sfView* view)
 {
     assert(view);
-    return convertVector2(view->This.getCenter());
+    return convertVector2(view->getCenter());
 }
 
 
@@ -112,7 +112,7 @@ sfVector2f sfView_getCenter(const sfView* view)
 sfVector2f sfView_getSize(const sfView* view)
 {
     assert(view);
-    return convertVector2(view->This.getSize());
+    return convertVector2(view->getSize());
 }
 
 
@@ -120,7 +120,7 @@ sfVector2f sfView_getSize(const sfView* view)
 float sfView_getRotation(const sfView* view)
 {
     assert(view);
-    return view->This.getRotation().asDegrees();
+    return view->getRotation().asDegrees();
 }
 
 
@@ -128,7 +128,7 @@ float sfView_getRotation(const sfView* view)
 sfFloatRect sfView_getViewport(const sfView* view)
 {
     assert(view);
-    return convertRect(view->This.getViewport());
+    return convertRect(view->getViewport());
 }
 
 
@@ -136,7 +136,7 @@ sfFloatRect sfView_getViewport(const sfView* view)
 sfFloatRect sfView_getScissor(const sfView* view)
 {
     assert(view);
-    return convertRect(view->This.getScissor());
+    return convertRect(view->getScissor());
 }
 
 
@@ -144,7 +144,7 @@ sfFloatRect sfView_getScissor(const sfView* view)
 void sfView_move(sfView* view, sfVector2f offset)
 {
     assert(view);
-    view->This.move(convertVector2(offset));
+    view->move(convertVector2(offset));
 }
 
 
@@ -152,7 +152,7 @@ void sfView_move(sfView* view, sfVector2f offset)
 void sfView_rotate(sfView* view, float angle)
 {
     assert(view);
-    view->This.rotate(sf::degrees(angle));
+    view->rotate(sf::degrees(angle));
 }
 
 
@@ -160,5 +160,5 @@ void sfView_rotate(sfView* view, float angle)
 void sfView_zoom(sfView* view, float factor)
 {
     assert(view);
-    view->This.zoom(factor);
+    view->zoom(factor);
 }

src/CSFML/Graphics/ViewStruct.hpp

@@ -33,7 +33,6 @@
 ////////////////////////////////////////////////////////////
 // Internal structure of sfMusic
 ////////////////////////////////////////////////////////////
-struct sfView
+struct sfView : sf::View
 {
-    sf::View This;
 };

src/CSFML/Network/Ftp.cpp

@@ -70,7 +70,7 @@ void sfFtpListingResponse_destroy(const sfFtpListingResponse* ftpListingResponse
 bool sfFtpListingResponse_isOk(const sfFtpListingResponse* ftpListingResponse)
 {
     assert(ftpListingResponse);
-    return ftpListingResponse->This.isOk();
+    return ftpListingResponse->isOk();
 }
 
 
@@ -78,7 +78,7 @@ bool sfFtpListingResponse_isOk(const sfFtpListingResponse* ftpListingResponse)
 sfFtpStatus sfFtpListingResponse_getStatus(const sfFtpListingResponse* ftpListingResponse)
 {
     assert(ftpListingResponse);
-    return static_cast<sfFtpStatus>(ftpListingResponse->This.getStatus());
+    return static_cast<sfFtpStatus>(ftpListingResponse->getStatus());
 }
 
 
@@ -86,7 +86,7 @@ sfFtpStatus sfFtpListingResponse_getStatus(const sfFtpListingResponse* ftpListin
 const char* sfFtpListingResponse_getMessage(const sfFtpListingResponse* ftpListingResponse)
 {
     assert(ftpListingResponse);
-    return ftpListingResponse->This.getMessage().c_str();
+    return ftpListingResponse->getMessage().c_str();
 }
 
 
@@ -94,7 +94,7 @@ const char* sfFtpListingResponse_getMessage(const sfFtpListingResponse* ftpListi
 size_t sfFtpListingResponse_getCount(const sfFtpListingResponse* ftpListingResponse)
 {
     assert(ftpListingResponse);
-    return ftpListingResponse->This.getListing().size();
+    return ftpListingResponse->getListing().size();
 }
 
 
@@ -102,7 +102,7 @@ size_t sfFtpListingResponse_getCount(const sfFtpListingResponse* ftpListingRespo
 const char* sfFtpListingResponse_getName(const sfFtpListingResponse* ftpListingResponse, size_t index)
 {
     assert(ftpListingResponse);
-    return ftpListingResponse->This.getListing()[index].c_str();
+    return ftpListingResponse->getListing()[index].c_str();
 }
 
 
@@ -117,7 +117,7 @@ void sfFtpDirectoryResponse_destroy(const sfFtpDirectoryResponse* ftpDirectoryRe
 bool sfFtpDirectoryResponse_isOk(const sfFtpDirectoryResponse* ftpDirectoryResponse)
 {
     assert(ftpDirectoryResponse);
-    return ftpDirectoryResponse->This.isOk();
+    return ftpDirectoryResponse->isOk();
 }
 
 
@@ -125,7 +125,7 @@ bool sfFtpDirectoryResponse_isOk(const sfFtpDirectoryResponse* ftpDirectoryRespo
 sfFtpStatus sfFtpDirectoryResponse_getStatus(const sfFtpDirectoryResponse* ftpDirectoryResponse)
 {
     assert(ftpDirectoryResponse);
-    return static_cast<sfFtpStatus>(ftpDirectoryResponse->This.getStatus());
+    return static_cast<sfFtpStatus>(ftpDirectoryResponse->getStatus());
 }
 
 
@@ -133,7 +133,7 @@ sfFtpStatus sfFtpDirectoryResponse_getStatus(const sfFtpDirectoryResponse* ftpDi
 const char* sfFtpDirectoryResponse_getMessage(const sfFtpDirectoryResponse* ftpDirectoryResponse)
 {
     assert(ftpDirectoryResponse);
-    return ftpDirectoryResponse->This.getMessage().c_str();
+    return ftpDirectoryResponse->getMessage().c_str();
 }
 
 
@@ -141,7 +141,7 @@ const char* sfFtpDirectoryResponse_getMessage(const sfFtpDirectoryResponse* ftpD
 const char* sfFtpDirectoryResponse_getDirectory(const sfFtpDirectoryResponse* ftpDirectoryResponse)
 {
     assert(ftpDirectoryResponse);
-    return strdup(ftpDirectoryResponse->This.getDirectory().string().c_str());
+    return strdup(ftpDirectoryResponse->getDirectory().string().c_str());
 }
 
 
@@ -149,7 +149,7 @@ const char* sfFtpDirectoryResponse_getDirectory(const sfFtpDirectoryResponse* ft
 const sfChar32* sfFtpDirectoryResponse_getDirectoryUnicode(const sfFtpDirectoryResponse* ftpDirectoryResponse)
 {
     assert(ftpDirectoryResponse);
-    return copyToChar32(sf::String(ftpDirectoryResponse->This.getDirectory().string()));
+    return copyToChar32(sf::String(ftpDirectoryResponse->getDirectory().string()));
 }
 
 
@@ -164,7 +164,7 @@ void sfFtpResponse_destroy(const sfFtpResponse* ftpResponse)
 bool sfFtpResponse_isOk(const sfFtpResponse* ftpResponse)
 {
     assert(ftpResponse);
-    return ftpResponse->This.isOk();
+    return ftpResponse->isOk();
 }
 
 
@@ -172,7 +172,7 @@ bool sfFtpResponse_isOk(const sfFtpResponse* ftpResponse)
 sfFtpStatus sfFtpResponse_getStatus(const sfFtpResponse* ftpResponse)
 {
     assert(ftpResponse);
-    return static_cast<sfFtpStatus>(ftpResponse->This.getStatus());
+    return static_cast<sfFtpStatus>(ftpResponse->getStatus());
 }
 
 
@@ -180,7 +180,7 @@ sfFtpStatus sfFtpResponse_getStatus(const sfFtpResponse* ftpResponse)
 const char* sfFtpResponse_getMessage(const sfFtpResponse* ftpResponse)
 {
     assert(ftpResponse);
-    return ftpResponse->This.getMessage().c_str();
+    return ftpResponse->getMessage().c_str();
 }
 
 
@@ -208,7 +208,7 @@ sfFtpResponse* sfFtp_connect(sfFtp* ftp, sfIpAddress server, unsigned short port
     if (!sfmlServer)
         return nullptr;
 
-    return new sfFtpResponse{ftp->This.connect(*sfmlServer, port, sf::microseconds(timeout.microseconds))};
+    return new sfFtpResponse{ftp->connect(*sfmlServer, port, sf::microseconds(timeout.microseconds))};
 }
 
 
@@ -216,7 +216,7 @@ sfFtpResponse* sfFtp_connect(sfFtp* ftp, sfIpAddress server, unsigned short port
 sfFtpResponse* sfFtp_loginAnonymous(sfFtp* ftp)
 {
     assert(ftp);
-    return new sfFtpResponse{ftp->This.login()};
+    return new sfFtpResponse{ftp->login()};
 }
 
 
@@ -224,7 +224,7 @@ sfFtpResponse* sfFtp_loginAnonymous(sfFtp* ftp)
 sfFtpResponse* sfFtp_login(sfFtp* ftp, const char* name, const char* password)
 {
     assert(ftp);
-    return new sfFtpResponse{ftp->This.login(name ? name : "", password ? password : "")};
+    return new sfFtpResponse{ftp->login(name ? name : "", password ? password : "")};
 }
 
 
@@ -232,7 +232,7 @@ sfFtpResponse* sfFtp_login(sfFtp* ftp, const char* name, const char* password)
 sfFtpResponse* sfFtp_disconnect(sfFtp* ftp)
 {
     assert(ftp);
-    return new sfFtpResponse{ftp->This.disconnect()};
+    return new sfFtpResponse{ftp->disconnect()};
 }
 
 
@@ -240,7 +240,7 @@ sfFtpResponse* sfFtp_disconnect(sfFtp* ftp)
 sfFtpResponse* sfFtp_keepAlive(sfFtp* ftp)
 {
     assert(ftp);
-    return new sfFtpResponse{ftp->This.keepAlive()};
+    return new sfFtpResponse{ftp->keepAlive()};
 }
 
 
@@ -248,7 +248,7 @@ sfFtpResponse* sfFtp_keepAlive(sfFtp* ftp)
 sfFtpDirectoryResponse* sfFtp_getWorkingDirectory(sfFtp* ftp)
 {
     assert(ftp);
-    return new sfFtpDirectoryResponse{ftp->This.getWorkingDirectory()};
+    return new sfFtpDirectoryResponse{ftp->getWorkingDirectory()};
 }
 
 
@@ -256,7 +256,7 @@ sfFtpDirectoryResponse* sfFtp_getWorkingDirectory(sfFtp* ftp)
 sfFtpListingResponse* sfFtp_getDirectoryListing(sfFtp* ftp, const char* directory)
 {
     assert(ftp);
-    return new sfFtpListingResponse{ftp->This.getDirectoryListing(directory ? directory : "")};
+    return new sfFtpListingResponse{ftp->getDirectoryListing(directory ? directory : "")};
 }
 
 
@@ -264,7 +264,7 @@ sfFtpListingResponse* sfFtp_getDirectoryListing(sfFtp* ftp, const char* director
 sfFtpResponse* sfFtp_changeDirectory(sfFtp* ftp, const char* directory)
 {
     assert(ftp);
-    return new sfFtpResponse{ftp->This.changeDirectory(directory ? directory : "")};
+    return new sfFtpResponse{ftp->changeDirectory(directory ? directory : "")};
 }
 
 
@@ -272,7 +272,7 @@ sfFtpResponse* sfFtp_changeDirectory(sfFtp* ftp, const char* directory)
 sfFtpResponse* sfFtp_parentDirectory(sfFtp* ftp)
 {
     assert(ftp);
-    return new sfFtpResponse{ftp->This.parentDirectory()};
+    return new sfFtpResponse{ftp->parentDirectory()};
 }
 
 
@@ -280,7 +280,7 @@ sfFtpResponse* sfFtp_parentDirectory(sfFtp* ftp)
 sfFtpResponse* sfFtp_createDirectory(sfFtp* ftp, const char* name)
 {
     assert(ftp);
-    return new sfFtpResponse{ftp->This.createDirectory(name ? name : "")};
+    return new sfFtpResponse{ftp->createDirectory(name ? name : "")};
 }
 
 
@@ -288,7 +288,7 @@ sfFtpResponse* sfFtp_createDirectory(sfFtp* ftp, const char* name)
 sfFtpResponse* sfFtp_deleteDirectory(sfFtp* ftp, const char* name)
 {
     assert(ftp);
-    return new sfFtpResponse{ftp->This.deleteDirectory(name ? name : "")};
+    return new sfFtpResponse{ftp->deleteDirectory(name ? name : "")};
 }
 
 
@@ -296,7 +296,7 @@ sfFtpResponse* sfFtp_deleteDirectory(sfFtp* ftp, const char* name)
 sfFtpResponse* sfFtp_renameFile(sfFtp* ftp, const char* file, const char* newName)
 {
     assert(ftp);
-    return new sfFtpResponse{ftp->This.renameFile(file ? file : "", newName ? newName : "")};
+    return new sfFtpResponse{ftp->renameFile(file ? file : "", newName ? newName : "")};
 }
 
 
@@ -304,7 +304,7 @@ sfFtpResponse* sfFtp_renameFile(sfFtp* ftp, const char* file, const char* newNam
 sfFtpResponse* sfFtp_deleteFile(sfFtp* ftp, const char* name)
 {
     assert(ftp);
-    return new sfFtpResponse{ftp->This.deleteFile(name ? name : "")};
+    return new sfFtpResponse{ftp->deleteFile(name ? name : "")};
 }
 
 
@@ -312,9 +312,8 @@ sfFtpResponse* sfFtp_deleteFile(sfFtp* ftp, const char* name)
 sfFtpResponse* sfFtp_download(sfFtp* ftp, const char* remoteFile, const char* localPath, sfFtpTransferMode mode)
 {
     assert(ftp);
-    return new sfFtpResponse{ftp->This.download(remoteFile ? remoteFile : "",
-                                                localPath ? localPath : "",
-                                                static_cast<sf::Ftp::TransferMode>(mode))};
+    return new sfFtpResponse{
+        ftp->download(remoteFile ? remoteFile : "", localPath ? localPath : "", static_cast<sf::Ftp::TransferMode>(mode))};
 }
 
 
@@ -322,10 +321,8 @@ sfFtpResponse* sfFtp_download(sfFtp* ftp, const char* remoteFile, const char* lo
 sfFtpResponse* sfFtp_upload(sfFtp* ftp, const char* localFile, const char* remotePath, sfFtpTransferMode mode, bool append)
 {
     assert(ftp);
-    return new sfFtpResponse{ftp->This.upload(localFile ? localFile : "",
-                                              remotePath ? remotePath : "",
-                                              static_cast<sf::Ftp::TransferMode>(mode),
-                                              append)};
+    return new sfFtpResponse{
+        ftp->upload(localFile ? localFile : "", remotePath ? remotePath : "", static_cast<sf::Ftp::TransferMode>(mode), append)};
 }
 
 
@@ -333,5 +330,5 @@ sfFtpResponse* sfFtp_upload(sfFtp* ftp, const char* localFile, const char* remot
 sfFtpResponse* sfFtp_sendCommand(sfFtp* ftp, const char* command, const char* parameter)
 {
     assert(ftp);
-    return new sfFtpResponse{ftp->This.sendCommand(command ? command : "", parameter ? parameter : "")};
+    return new sfFtpResponse{ftp->sendCommand(command ? command : "", parameter ? parameter : "")};
 }

src/CSFML/Network/FtpStruct.hpp

@@ -29,41 +29,34 @@
 ////////////////////////////////////////////////////////////
 #include <SFML/Network/Ftp.hpp>
 
-#include <utility>
-#include <vector>
-
 
 ////////////////////////////////////////////////////////////
 // Internal structure of sfFtp
 ////////////////////////////////////////////////////////////
-struct sfFtp
+struct sfFtp : sf::Ftp
 {
-    sf::Ftp This;
 };
 
 
 ////////////////////////////////////////////////////////////
 // Internal structure of sfFtpResponse
 ////////////////////////////////////////////////////////////
-struct sfFtpResponse
+struct sfFtpResponse : sf::Ftp::Response
 {
-    sf::Ftp::Response This;
 };
 
 
 ////////////////////////////////////////////////////////////
 // Internal structure of sfFtpDirectoryResponse
 ////////////////////////////////////////////////////////////
-struct sfFtpDirectoryResponse
+struct sfFtpDirectoryResponse : sf::Ftp::DirectoryResponse
 {
-    sf::Ftp::DirectoryResponse This;
 };
 
 
 ////////////////////////////////////////////////////////////
 // Internal structure of sfFtpListingResponse
 ////////////////////////////////////////////////////////////
-struct sfFtpListingResponse
+struct sfFtpListingResponse : sf::Ftp::ListingResponse
 {
-    sf::Ftp::ListingResponse This;
 };

src/CSFML/Network/Http.cpp

@@ -48,7 +48,7 @@ void sfHttpRequest_setField(sfHttpRequest* httpRequest, const char* field, const
 {
     assert(httpRequest);
     if (field)
-        httpRequest->This.setField(field, value);
+        httpRequest->setField(field, value);
 }
 
 
@@ -56,7 +56,7 @@ void sfHttpRequest_setField(sfHttpRequest* httpRequest, const char* field, const
 void sfHttpRequest_setMethod(sfHttpRequest* httpRequest, sfHttpMethod method)
 {
     assert(httpRequest);
-    httpRequest->This.setMethod(static_cast<sf::Http::Request::Method>(method));
+    httpRequest->setMethod(static_cast<sf::Http::Request::Method>(method));
 }
 
 
@@ -64,7 +64,7 @@ void sfHttpRequest_setMethod(sfHttpRequest* httpRequest, sfHttpMethod method)
 void sfHttpRequest_setUri(sfHttpRequest* httpRequest, const char* uri)
 {
     assert(httpRequest);
-    httpRequest->This.setUri(uri ? uri : "");
+    httpRequest->setUri(uri ? uri : "");
 }
 
 
@@ -72,7 +72,7 @@ void sfHttpRequest_setUri(sfHttpRequest* httpRequest, const char* uri)
 void sfHttpRequest_setHttpVersion(sfHttpRequest* httpRequest, unsigned int major, unsigned int minor)
 {
     assert(httpRequest);
-    httpRequest->This.setHttpVersion(major, minor);
+    httpRequest->setHttpVersion(major, minor);
 }
 
 
@@ -80,7 +80,7 @@ void sfHttpRequest_setHttpVersion(sfHttpRequest* httpRequest, unsigned int major
 void sfHttpRequest_setBody(sfHttpRequest* httpRequest, const char* body)
 {
     assert(httpRequest);
-    httpRequest->This.setBody(body ? body : "");
+    httpRequest->setBody(body ? body : "");
 }
 
 
@@ -98,7 +98,7 @@ const char* sfHttpResponse_getField(const sfHttpResponse* httpResponse, const ch
     if (!field)
         return nullptr;
 
-    return httpResponse->This.getField(field).c_str();
+    return httpResponse->getField(field).c_str();
 }
 
 
@@ -106,7 +106,7 @@ const char* sfHttpResponse_getField(const sfHttpResponse* httpResponse, const ch
 sfHttpStatus sfHttpResponse_getStatus(const sfHttpResponse* httpResponse)
 {
     assert(httpResponse);
-    return static_cast<sfHttpStatus>(httpResponse->This.getStatus());
+    return static_cast<sfHttpStatus>(httpResponse->getStatus());
 }
 
 
@@ -114,7 +114,7 @@ sfHttpStatus sfHttpResponse_getStatus(const sfHttpResponse* httpResponse)
 unsigned int sfHttpResponse_getMajorVersion(const sfHttpResponse* httpResponse)
 {
     assert(httpResponse);
-    return httpResponse->This.getMajorHttpVersion();
+    return httpResponse->getMajorHttpVersion();
 }
 
 
@@ -122,7 +122,7 @@ unsigned int sfHttpResponse_getMajorVersion(const sfHttpResponse* httpResponse)
 unsigned int sfHttpResponse_getMinorVersion(const sfHttpResponse* httpResponse)
 {
     assert(httpResponse);
-    return httpResponse->This.getMinorHttpVersion();
+    return httpResponse->getMinorHttpVersion();
 }
 
 
@@ -130,7 +130,7 @@ unsigned int sfHttpResponse_getMinorVersion(const sfHttpResponse* httpResponse)
 const char* sfHttpResponse_getBody(const sfHttpResponse* httpResponse)
 {
     assert(httpResponse);
-    return httpResponse->This.getBody().c_str();
+    return httpResponse->getBody().c_str();
 }
 
 
@@ -152,7 +152,7 @@ void sfHttp_destroy(const sfHttp* http)
 void sfHttp_setHost(sfHttp* http, const char* host, unsigned short port)
 {
     assert(http);
-    http->This.setHost(host ? host : "", port);
+    http->setHost(host ? host : "", port);
 }
 
 
@@ -161,9 +161,5 @@ sfHttpResponse* sfHttp_sendRequest(sfHttp* http, const sfHttpRequest* request, s
 {
     assert(http);
     assert(request);
-
-    auto* response = new sfHttpResponse;
-    response->This = http->This.sendRequest(request->This, sf::microseconds(timeout.microseconds));
-
-    return response;
+    return new sfHttpResponse{http->sendRequest(*request, sf::microseconds(timeout.microseconds))};
 }

src/CSFML/Network/HttpStruct.hpp

@@ -33,25 +33,22 @@
 ////////////////////////////////////////////////////////////
 // Internal structure of sfHttp
 ////////////////////////////////////////////////////////////
-struct sfHttp
+struct sfHttp : sf::Http
 {
-    sf::Http This;
 };
 
 
 ////////////////////////////////////////////////////////////
 // Internal structure of sfHttpRequest
 ////////////////////////////////////////////////////////////
-struct sfHttpRequest
+struct sfHttpRequest : sf::Http::Request
 {
-    sf::Http::Request This;
 };
 
 
 ////////////////////////////////////////////////////////////
 // Internal structure of sfHttpResponse
 ////////////////////////////////////////////////////////////
-struct sfHttpResponse
+struct sfHttpResponse : sf::Http::Response
 {
-    sf::Http::Response This;
 };

src/CSFML/Network/Packet.cpp

@@ -57,7 +57,7 @@ void sfPacket_destroy(const sfPacket* packet)
 void sfPacket_append(sfPacket* packet, const void* data, size_t sizeInBytes)
 {
     assert(packet);
-    packet->This.append(data, sizeInBytes);
+    packet->append(data, sizeInBytes);
 }
 
 
@@ -65,7 +65,7 @@ void sfPacket_append(sfPacket* packet, const void* data, size_t sizeInBytes)
 size_t sfPacket_getReadPosition(const sfPacket* packet)
 {
     assert(packet);
-    return packet->This.getReadPosition();
+    return packet->getReadPosition();
 }
 
 
@@ -73,7 +73,7 @@ size_t sfPacket_getReadPosition(const sfPacket* packet)
 void sfPacket_clear(sfPacket* packet)
 {
     assert(packet);
-    packet->This.clear();
+    packet->clear();
 }
 
 
@@ -81,7 +81,7 @@ void sfPacket_clear(sfPacket* packet)
 const void* sfPacket_getData(const sfPacket* packet)
 {
     assert(packet);
-    return packet->This.getData();
+    return packet->getData();
 }
 
 
@@ -89,7 +89,7 @@ const void* sfPacket_getData(const sfPacket* packet)
 size_t sfPacket_getDataSize(const sfPacket* packet)
 {
     assert(packet);
-    return packet->This.getDataSize();
+    return packet->getDataSize();
 }
 
 
@@ -97,7 +97,7 @@ size_t sfPacket_getDataSize(const sfPacket* packet)
 bool sfPacket_endOfPacket(const sfPacket* packet)
 {
     assert(packet);
-    return packet->This.endOfPacket();
+    return packet->endOfPacket();
 }
 
 
@@ -105,7 +105,7 @@ bool sfPacket_endOfPacket(const sfPacket* packet)
 bool sfPacket_canRead(const sfPacket* packet)
 {
     assert(packet);
-    return static_cast<bool>(packet->This);
+    return static_cast<bool>(*packet);
 }
 
 
@@ -118,69 +118,69 @@ int8_t sfPacket_readInt8(sfPacket* packet)
 {
     assert(packet);
     int8_t value = 0;
-    packet->This >> value;
+    *packet >> value;
     return value;
 }
 uint8_t sfPacket_readUint8(sfPacket* packet)
 {
     assert(packet);
     uint8_t value = 0;
-    packet->This >> value;
+    *packet >> value;
     return value;
 }
 int16_t sfPacket_readInt16(sfPacket* packet)
 {
     assert(packet);
     int16_t value = 0;
-    packet->This >> value;
+    *packet >> value;
     return value;
 }
 uint16_t sfPacket_readUint16(sfPacket* packet)
 {
     assert(packet);
     uint16_t value = 0;
-    packet->This >> value;
+    *packet >> value;
     return value;
 }
 int32_t sfPacket_readInt32(sfPacket* packet)
 {
     assert(packet);
     int32_t value = 0;
-    packet->This >> value;
+    *packet >> value;
     return value;
 }
 uint32_t sfPacket_readUint32(sfPacket* packet)
 {
     assert(packet);
     uint32_t value = 0;
-    packet->This >> value;
+    *packet >> value;
     return value;
 }
 float sfPacket_readFloat(sfPacket* packet)
 {
     assert(packet);
     float value = 0;
-    packet->This >> value;
+    *packet >> value;
     return value;
 }
 double sfPacket_readDouble(sfPacket* packet)
 {
     assert(packet);
     double value = 0;
-    packet->This >> value;
+    *packet >> value;
     return value;
 }
 void sfPacket_readString(sfPacket* packet, char* string)
 {
     assert(packet);
     if (string)
-        packet->This >> string;
+        *packet >> string;
 }
 void sfPacket_readWideString(sfPacket* packet, wchar_t* string)
 {
     assert(packet);
     if (string)
-        packet->This >> string;
+        *packet >> string;
 }
 
 
@@ -192,52 +192,52 @@ void sfPacket_writeBool(sfPacket* packet, bool value)
 void sfPacket_writeInt8(sfPacket* packet, int8_t value)
 {
     assert(packet);
-    packet->This << value;
+    *packet << value;
 }
 void sfPacket_writeUint8(sfPacket* packet, uint8_t value)
 {
     assert(packet);
-    packet->This << value;
+    *packet << value;
 }
 void sfPacket_writeInt16(sfPacket* packet, int16_t value)
 {
     assert(packet);
-    packet->This << value;
+    *packet << value;
 }
 void sfPacket_writeUint16(sfPacket* packet, uint16_t value)
 {
     assert(packet);
-    packet->This << value;
+    *packet << value;
 }
 void sfPacket_writeInt32(sfPacket* packet, int32_t value)
 {
     assert(packet);
-    packet->This << value;
+    *packet << value;
 }
 void sfPacket_writeUint32(sfPacket* packet, uint32_t value)
 {
     assert(packet);
-    packet->This << value;
+    *packet << value;
 }
 void sfPacket_writeFloat(sfPacket* packet, float value)
 {
     assert(packet);
-    packet->This << value;
+    *packet << value;
 }
 void sfPacket_writeDouble(sfPacket* packet, double value)
 {
     assert(packet);
-    packet->This << value;
+    *packet << value;
 }
 void sfPacket_writeString(sfPacket* packet, const char* string)
 {
     assert(packet);
     if (string)
-        packet->This << string;
+        *packet << string;
 }
 void sfPacket_writeWideString(sfPacket* packet, const wchar_t* string)
 {
     assert(packet);
     if (string)
-        packet->This << string;
+        *packet << string;
 }

src/CSFML/Network/PacketStruct.hpp

@@ -33,7 +33,6 @@
 ////////////////////////////////////////////////////////////
 // Internal structure of sfPacket
 ////////////////////////////////////////////////////////////
-struct sfPacket
+struct sfPacket : sf::Packet
 {
-    sf::Packet This;
 };

src/CSFML/Network/SocketSelector.cpp

@@ -59,19 +59,19 @@ void sfSocketSelector_addTcpListener(sfSocketSelector* selector, sfTcpListener*
 {
     assert(selector);
     assert(socket);
-    selector->This.add(socket->This);
+    selector->add(*socket);
 }
 void sfSocketSelector_addTcpSocket(sfSocketSelector* selector, sfTcpSocket* socket)
 {
     assert(selector);
     assert(socket);
-    selector->This.add(socket->This);
+    selector->add(*socket);
 }
 void sfSocketSelector_addUdpSocket(sfSocketSelector* selector, sfUdpSocket* socket)
 {
     assert(selector);
     assert(socket);
-    selector->This.add(socket->This);
+    selector->add(*socket);
 }
 
 
@@ -80,19 +80,19 @@ void sfSocketSelector_removeTcpListener(sfSocketSelector* selector, sfTcpListene
 {
     assert(selector);
     assert(socket);
-    selector->This.remove(socket->This);
+    selector->remove(*socket);
 }
 void sfSocketSelector_removeTcpSocket(sfSocketSelector* selector, sfTcpSocket* socket)
 {
     assert(selector);
     assert(socket);
-    selector->This.remove(socket->This);
+    selector->remove(*socket);
 }
 void sfSocketSelector_removeUdpSocket(sfSocketSelector* selector, sfUdpSocket* socket)
 {
     assert(selector);
     assert(socket);
-    selector->This.remove(socket->This);
+    selector->remove(*socket);
 }
 
 
@@ -100,7 +100,7 @@ void sfSocketSelector_removeUdpSocket(sfSocketSelector* selector, sfUdpSocket* s
 void sfSocketSelector_clear(sfSocketSelector* selector)
 {
     assert(selector);
-    selector->This.clear();
+    selector->clear();
 }
 
 
@@ -108,7 +108,7 @@ void sfSocketSelector_clear(sfSocketSelector* selector)
 bool sfSocketSelector_wait(sfSocketSelector* selector, sfTime timeout)
 {
     assert(selector);
-    return selector->This.wait(sf::microseconds(timeout.microseconds));
+    return selector->wait(sf::microseconds(timeout.microseconds));
 }
 
 
@@ -117,17 +117,17 @@ bool sfSocketSelector_isTcpListenerReady(const sfSocketSelector* selector, sfTcp
 {
     assert(selector);
     assert(socket);
-    return selector->This.isReady(socket->This);
+    return selector->isReady(*socket);
 }
 bool sfSocketSelector_isTcpSocketReady(const sfSocketSelector* selector, sfTcpSocket* socket)
 {
     assert(selector);
     assert(socket);
-    return selector->This.isReady(socket->This);
+    return selector->isReady(*socket);
 }
 bool sfSocketSelector_isUdpSocketReady(const sfSocketSelector* selector, sfUdpSocket* socket)
 {
     assert(selector);
     assert(socket);
-    return selector->This.isReady(socket->This);
+    return selector->isReady(*socket);
 }

src/CSFML/Network/SocketSelectorStruct.hpp

@@ -33,7 +33,6 @@
 ////////////////////////////////////////////////////////////
 // Internal structure of sfSocketSelector
 ////////////////////////////////////////////////////////////
-struct sfSocketSelector
+struct sfSocketSelector : sf::SocketSelector
 {
-    sf::SocketSelector This;
 };

src/CSFML/Network/TcpListener.cpp

@@ -50,7 +50,7 @@ void sfTcpListener_destroy(const sfTcpListener* listener)
 void sfTcpListener_setBlocking(sfTcpListener* listener, bool blocking)
 {
     assert(listener);
-    listener->This.setBlocking(blocking);
+    listener->setBlocking(blocking);
 }
 
 
@@ -58,7 +58,7 @@ void sfTcpListener_setBlocking(sfTcpListener* listener, bool blocking)
 bool sfTcpListener_isBlocking(const sfTcpListener* listener)
 {
     assert(listener);
-    return listener->This.isBlocking();
+    return listener->isBlocking();
 }
 
 
@@ -66,7 +66,7 @@ bool sfTcpListener_isBlocking(const sfTcpListener* listener)
 unsigned short sfTcpListener_getLocalPort(const sfTcpListener* listener)
 {
     assert(listener);
-    return listener->This.getLocalPort();
+    return listener->getLocalPort();
 }
 
 
@@ -82,7 +82,7 @@ sfSocketStatus sfTcpListener_listen(sfTcpListener* listener, unsigned short port
         return sfSocketError;
     }
 
-    return static_cast<sfSocketStatus>(listener->This.listen(port, *sfmlAddress));
+    return static_cast<sfSocketStatus>(listener->listen(port, *sfmlAddress));
 }
 
 
@@ -93,7 +93,7 @@ sfSocketStatus sfTcpListener_accept(sfTcpListener* listener, sfTcpSocket** conne
     assert(connected);
 
     auto socket = std::make_unique<sfTcpSocket>();
-    auto status = static_cast<sfSocketStatus>(listener->This.accept(socket->This));
+    auto status = static_cast<sfSocketStatus>(listener->accept(*socket));
 
     if (status != sfSocketDone)
         *connected = nullptr;

src/CSFML/Network/TcpListenerStruct.hpp

@@ -33,7 +33,6 @@
 ////////////////////////////////////////////////////////////
 // Internal structure of sfTcpListener
 ////////////////////////////////////////////////////////////
-struct sfTcpListener
+struct sfTcpListener : sf::TcpListener
 {
-    sf::TcpListener This;
 };

src/CSFML/Network/TcpSocket.cpp

@@ -52,7 +52,7 @@ void sfTcpSocket_destroy(const sfTcpSocket* socket)
 void sfTcpSocket_setBlocking(sfTcpSocket* socket, bool blocking)
 {
     assert(socket);
-    socket->This.setBlocking(blocking);
+    socket->setBlocking(blocking);
 }
 
 
@@ -60,7 +60,7 @@ void sfTcpSocket_setBlocking(sfTcpSocket* socket, bool blocking)
 bool sfTcpSocket_isBlocking(const sfTcpSocket* socket)
 {
     assert(socket);
-    return socket->This.isBlocking();
+    return socket->isBlocking();
 }
 
 
@@ -68,7 +68,7 @@ bool sfTcpSocket_isBlocking(const sfTcpSocket* socket)
 unsigned short sfTcpSocket_getLocalPort(const sfTcpSocket* socket)
 {
     assert(socket);
-    return socket->This.getLocalPort();
+    return socket->getLocalPort();
 }
 
 
@@ -77,7 +77,7 @@ sfIpAddress sfTcpSocket_getRemoteAddress(const sfTcpSocket* socket)
 {
     assert(socket);
 
-    std::optional<sf::IpAddress> address = socket->This.getRemoteAddress();
+    std::optional<sf::IpAddress> address = socket->getRemoteAddress();
 
     sfIpAddress result = sfIpAddress_None;
     if (address)
@@ -93,7 +93,7 @@ sfIpAddress sfTcpSocket_getRemoteAddress(const sfTcpSocket* socket)
 unsigned short sfTcpSocket_getRemotePort(const sfTcpSocket* socket)
 {
     assert(socket);
-    return socket->This.getRemotePort();
+    return socket->getRemotePort();
 }
 
 
@@ -108,7 +108,7 @@ sfSocketStatus sfTcpSocket_connect(sfTcpSocket* socket, sfIpAddress remoteAddres
     }
 
     assert(socket);
-    return static_cast<sfSocketStatus>(socket->This.connect(*address, remotePort, sf::microseconds(timeout.microseconds)));
+    return static_cast<sfSocketStatus>(socket->connect(*address, remotePort, sf::microseconds(timeout.microseconds)));
 }
 
 
@@ -116,7 +116,7 @@ sfSocketStatus sfTcpSocket_connect(sfTcpSocket* socket, sfIpAddress remoteAddres
 void sfTcpSocket_disconnect(sfTcpSocket* socket)
 {
     assert(socket);
-    socket->This.disconnect();
+    socket->disconnect();
 }
 
 
@@ -124,7 +124,7 @@ void sfTcpSocket_disconnect(sfTcpSocket* socket)
 sfSocketStatus sfTcpSocket_send(sfTcpSocket* socket, const void* data, size_t size)
 {
     assert(socket);
-    return static_cast<sfSocketStatus>(socket->This.send(data, size));
+    return static_cast<sfSocketStatus>(socket->send(data, size));
 }
 
 
@@ -132,7 +132,7 @@ sfSocketStatus sfTcpSocket_send(sfTcpSocket* socket, const void* data, size_t si
 sfSocketStatus sfTcpSocket_sendPartial(sfTcpSocket* socket, const void* data, size_t size, size_t* sent)
 {
     assert(socket);
-    return static_cast<sfSocketStatus>(socket->This.send(data, size, *sent));
+    return static_cast<sfSocketStatus>(socket->send(data, size, *sent));
 }
 
 
@@ -143,12 +143,12 @@ sfSocketStatus sfTcpSocket_receive(sfTcpSocket* socket, void* data, size_t size,
 
     if (received)
     {
-        return static_cast<sfSocketStatus>(socket->This.receive(data, size, *received));
+        return static_cast<sfSocketStatus>(socket->receive(data, size, *received));
     }
     else
     {
         std::size_t tempReceived = 0;
-        return static_cast<sfSocketStatus>(socket->This.receive(data, size, tempReceived));
+        return static_cast<sfSocketStatus>(socket->receive(data, size, tempReceived));
     }
 }
 
@@ -158,7 +158,7 @@ sfSocketStatus sfTcpSocket_sendPacket(sfTcpSocket* socket, sfPacket* packet)
 {
     assert(socket);
     assert(packet);
-    return static_cast<sfSocketStatus>(socket->This.send(packet->This));
+    return static_cast<sfSocketStatus>(socket->send(*packet));
 }
 
 
@@ -167,5 +167,5 @@ sfSocketStatus sfTcpSocket_receivePacket(sfTcpSocket* socket, sfPacket* packet)
 {
     assert(socket);
     assert(packet);
-    return static_cast<sfSocketStatus>(socket->This.receive(packet->This));
+    return static_cast<sfSocketStatus>(socket->receive(*packet));
 }

src/CSFML/Network/TcpSocketStruct.hpp

@@ -33,7 +33,6 @@
 ////////////////////////////////////////////////////////////
 // Internal structure of sfTcpSocket
 ////////////////////////////////////////////////////////////
-struct sfTcpSocket
+struct sfTcpSocket : sf::TcpSocket
 {
-    sf::TcpSocket This;
 };

src/CSFML/Network/UdpSocket.cpp

@@ -52,14 +52,14 @@ void sfUdpSocket_destroy(const sfUdpSocket* socket)
 void sfUdpSocket_setBlocking(sfUdpSocket* socket, bool blocking)
 {
     assert(socket);
-    socket->This.setBlocking(blocking);
+    socket->setBlocking(blocking);
 }
 
 ////////////////////////////////////////////////////////////
 bool sfUdpSocket_isBlocking(const sfUdpSocket* socket)
 {
     assert(socket);
-    return socket->This.isBlocking();
+    return socket->isBlocking();
 }
 
 
@@ -67,7 +67,7 @@ bool sfUdpSocket_isBlocking(const sfUdpSocket* socket)
 unsigned short sfUdpSocket_getLocalPort(const sfUdpSocket* socket)
 {
     assert(socket);
-    return socket->This.getLocalPort();
+    return socket->getLocalPort();
 }
 
 
@@ -83,7 +83,7 @@ sfSocketStatus sfUdpSocket_bind(sfUdpSocket* socket, unsigned short port, sfIpAd
         return sfSocketError;
     }
 
-    return static_cast<sfSocketStatus>(socket->This.bind(port, *sfmlAddress));
+    return static_cast<sfSocketStatus>(socket->bind(port, *sfmlAddress));
 }
 
 
@@ -91,7 +91,7 @@ sfSocketStatus sfUdpSocket_bind(sfUdpSocket* socket, unsigned short port, sfIpAd
 void sfUdpSocket_unbind(sfUdpSocket* socket)
 {
     assert(socket);
-    socket->This.unbind();
+    socket->unbind();
 }
 
 
@@ -108,7 +108,7 @@ sfSocketStatus sfUdpSocket_send(sfUdpSocket* socket, const void* data, size_t si
         return sfSocketError;
     }
 
-    return static_cast<sfSocketStatus>(socket->This.send(data, size, *address, remotePort));
+    return static_cast<sfSocketStatus>(socket->send(data, size, *address, remotePort));
 }
 
 
@@ -126,7 +126,7 @@ sfSocketStatus sfUdpSocket_receive(sfUdpSocket*    socket,
     unsigned short               port         = 0;
     std::size_t                  sizeReceived = 0;
 
-    sf::Socket::Status status = socket->This.receive(data, size, sizeReceived, address, port);
+    sf::Socket::Status status = socket->receive(data, size, sizeReceived, address, port);
     if (status != sf::Socket::Status::Done)
         return static_cast<sfSocketStatus>(status);
 
@@ -164,7 +164,7 @@ sfSocketStatus sfUdpSocket_sendPacket(sfUdpSocket* socket, sfPacket* packet, sfI
         return sfSocketError;
     }
 
-    return static_cast<sfSocketStatus>(socket->This.send(packet->This, *address, remotePort));
+    return static_cast<sfSocketStatus>(socket->send(*packet, *address, remotePort));
 }
 
 
@@ -177,7 +177,7 @@ sfSocketStatus sfUdpSocket_receivePacket(sfUdpSocket* socket, sfPacket* packet,
     std::optional<sf::IpAddress> address;
     unsigned short               port = 0;
 
-    sf::Socket::Status status = socket->This.receive(packet->This, address, port);
+    sf::Socket::Status status = socket->receive(*packet, address, port);
     if (status != sf::Socket::Status::Done)
         return static_cast<sfSocketStatus>(status);
 

src/CSFML/Network/UdpSocketStruct.hpp

@@ -33,7 +33,6 @@
 ////////////////////////////////////////////////////////////
 // Internal structure of sfUdpSocket
 ////////////////////////////////////////////////////////////
-struct sfUdpSocket
+struct sfUdpSocket : sf::UdpSocket
 {
-    sf::UdpSocket This;
 };

src/CSFML/System/Buffer.cpp

@@ -49,7 +49,7 @@ void sfBuffer_destroy(const sfBuffer* buffer)
 size_t sfBuffer_getSize(const sfBuffer* buffer)
 {
     assert(buffer);
-    return buffer->buffer.size();
+    return buffer->size();
 }
 
 
@@ -57,5 +57,5 @@ size_t sfBuffer_getSize(const sfBuffer* buffer)
 const uint8_t* sfBuffer_getData(const sfBuffer* buffer)
 {
     assert(buffer);
-    return !buffer->buffer.empty() ? buffer->buffer.data() : nullptr;
+    return !buffer->empty() ? buffer->data() : nullptr;
 }

src/CSFML/System/BufferStruct.hpp

@@ -36,7 +36,6 @@
 ////////////////////////////////////////////////////////////
 // Internal structure of sfBuffer
 ////////////////////////////////////////////////////////////
-struct sfBuffer
+struct sfBuffer : std::vector<std::uint8_t>
 {
-    std::vector<std::uint8_t> buffer;
 };

src/CSFML/System/Clock.cpp

@@ -57,7 +57,7 @@ void sfClock_destroy(const sfClock* clock)
 sfTime sfClock_getElapsedTime(const sfClock* clock)
 {
     assert(clock);
-    return {clock->This.getElapsedTime().asMicroseconds()};
+    return {clock->getElapsedTime().asMicroseconds()};
 }
 
 
@@ -65,7 +65,7 @@ sfTime sfClock_getElapsedTime(const sfClock* clock)
 bool sfClock_isRunning(const sfClock* clock)
 {
     assert(clock);
-    return clock->This.isRunning();
+    return clock->isRunning();
 }
 
 
@@ -73,7 +73,7 @@ bool sfClock_isRunning(const sfClock* clock)
 void sfClock_start(sfClock* clock)
 {
     assert(clock);
-    clock->This.start();
+    clock->start();
 }
 
 
@@ -81,7 +81,7 @@ void sfClock_start(sfClock* clock)
 void sfClock_stop(sfClock* clock)
 {
     assert(clock);
-    clock->This.stop();
+    clock->stop();
 }
 
 
@@ -89,7 +89,7 @@ void sfClock_stop(sfClock* clock)
 sfTime sfClock_restart(sfClock* clock)
 {
     assert(clock);
-    return {clock->This.restart().asMicroseconds()};
+    return {clock->restart().asMicroseconds()};
 }
 
 
@@ -97,5 +97,5 @@ sfTime sfClock_restart(sfClock* clock)
 sfTime sfClock_reset(sfClock* clock)
 {
     assert(clock);
-    return {clock->This.reset().asMicroseconds()};
+    return {clock->reset().asMicroseconds()};
 }

src/CSFML/System/ClockStruct.hpp

@@ -33,7 +33,6 @@
 ////////////////////////////////////////////////////////////
 // Internal structure of sfClock
 ////////////////////////////////////////////////////////////
-struct sfClock
+struct sfClock : sf::Clock
 {
-    sf::Clock This;
 };

src/CSFML/Window/Context.cpp

@@ -56,7 +56,7 @@ bool sfContext_isExtensionAvailable(const char* name)
 bool sfContext_setActive(sfContext* context, bool active)
 {
     assert(context);
-    return context->This.setActive(active);
+    return context->setActive(active);
 }
 
 
@@ -71,7 +71,7 @@ sfGlFunctionPointer sfContext_getFunction(const char* name)
 sfContextSettings sfContext_getSettings(const sfContext* context)
 {
     assert(context);
-    return convertContextSettings(context->This.getSettings());
+    return convertContextSettings(context->getSettings());
 }
 
 

src/CSFML/Window/ContextStruct.hpp

@@ -33,7 +33,6 @@
 ////////////////////////////////////////////////////////////
 // Internal structure of sfContext
 ////////////////////////////////////////////////////////////
-struct sfContext
+struct sfContext : sf::Context
 {
-    sf::Context This;
 };

src/CSFML/Window/CursorStruct.hpp

@@ -33,7 +33,6 @@
 ////////////////////////////////////////////////////////////
 // Internal structure of sfCursor
 ////////////////////////////////////////////////////////////
-struct sfCursor
+struct sfCursor : sf::Cursor
 {
-    sf::Cursor This;
 };

src/CSFML/Window/Mouse.cpp

@@ -44,7 +44,7 @@ bool sfMouse_isButtonPressed(sfMouseButton button)
 sfVector2i sfMouse_getPosition(const sfWindow* relativeTo)
 {
     if (relativeTo)
-        return convertVector2(sf::Mouse::getPosition(relativeTo->This));
+        return convertVector2(sf::Mouse::getPosition(*relativeTo));
 
     return convertVector2(sf::Mouse::getPosition());
 }
@@ -54,7 +54,7 @@ sfVector2i sfMouse_getPosition(const sfWindow* relativeTo)
 void sfMouse_setPosition(sfVector2i position, const sfWindow* relativeTo)
 {
     if (relativeTo)
-        sf::Mouse::setPosition(convertVector2(position), relativeTo->This);
+        sf::Mouse::setPosition(convertVector2(position), *relativeTo);
     else
         sf::Mouse::setPosition(convertVector2(position));
 }
@@ -64,7 +64,7 @@ void sfMouse_setPosition(sfVector2i position, const sfWindow* relativeTo)
 sfVector2i sfMouse_getPositionWindowBase(const sfWindowBase* relativeTo)
 {
     if (relativeTo)
-        return convertVector2(sf::Mouse::getPosition(relativeTo->This));
+        return convertVector2(sf::Mouse::getPosition(*relativeTo));
 
     return convertVector2(sf::Mouse::getPosition());
 }
@@ -74,7 +74,7 @@ sfVector2i sfMouse_getPositionWindowBase(const sfWindowBase* relativeTo)
 void sfMouse_setPositionWindowBase(sfVector2i position, const sfWindowBase* relativeTo)
 {
     if (relativeTo)
-        sf::Mouse::setPosition(convertVector2(position), relativeTo->This);
+        sf::Mouse::setPosition(convertVector2(position), *relativeTo);
     else
         sf::Mouse::setPosition(convertVector2(position));
 }

src/CSFML/Window/Touch.cpp

@@ -43,7 +43,7 @@ bool sfTouch_isDown(unsigned int finger)
 sfVector2i sfTouch_getPosition(unsigned int finger, const sfWindow* relativeTo)
 {
     if (relativeTo)
-        return convertVector2(sf::Touch::getPosition(finger, relativeTo->This));
+        return convertVector2(sf::Touch::getPosition(finger, *relativeTo));
 
     return convertVector2(sf::Touch::getPosition(finger));
 }
@@ -52,7 +52,7 @@ sfVector2i sfTouch_getPosition(unsigned int finger, const sfWindow* relativeTo)
 sfVector2i sfTouch_getPositionWindowBase(unsigned int finger, const sfWindowBase* relativeTo)
 {
     if (relativeTo)
-        return convertVector2(sf::Touch::getPosition(finger, relativeTo->This));
+        return convertVector2(sf::Touch::getPosition(finger, *relativeTo));
 
     return convertVector2(sf::Touch::getPosition(finger));
 }

src/CSFML/Window/Window.cpp

@@ -42,7 +42,7 @@ sfWindow* sfWindow_create(sfVideoMode mode, const char* title, uint32_t style, s
 
     // Create the window
     auto* window = new sfWindow;
-    window->This.create(convertVideoMode(mode), title, style, static_cast<sf::State>(state), params);
+    window->create(convertVideoMode(mode), title, style, static_cast<sf::State>(state), params);
 
     return window;
 }
@@ -59,11 +59,7 @@ sfWindow* sfWindow_createUnicode(sfVideoMode              mode,
 
     // Create the window
     auto* window = new sfWindow;
-    window->This.create(convertVideoMode(mode),
-                        reinterpret_cast<const char32_t*>(title),
-                        style,
-                        static_cast<sf::State>(state),
-                        params);
+    window->create(convertVideoMode(mode), reinterpret_cast<const char32_t*>(title), style, static_cast<sf::State>(state), params);
 
     return window;
 }
@@ -77,7 +73,7 @@ sfWindow* sfWindow_createFromHandle(sfWindowHandle handle, const sfContextSettin
 
     // Create the window
     auto* window = new sfWindow;
-    window->This.create(handle, params);
+    window->create(handle, params);
 
     return window;
 }
@@ -93,7 +89,7 @@ void sfWindow_destroy(const sfWindow* window)
 void sfWindow_close(sfWindow* window)
 {
     assert(window);
-    window->This.close();
+    window->close();
 }
 
 
@@ -101,7 +97,7 @@ void sfWindow_close(sfWindow* window)
 bool sfWindow_isOpen(const sfWindow* window)
 {
     assert(window);
-    return window->This.isOpen();
+    return window->isOpen();
 }
 
 
@@ -109,7 +105,7 @@ bool sfWindow_isOpen(const sfWindow* window)
 sfContextSettings sfWindow_getSettings(const sfWindow* window)
 {
     assert(window);
-    return convertContextSettings(window->This.getSettings());
+    return convertContextSettings(window->getSettings());
 }
 
 
@@ -118,7 +114,7 @@ bool sfWindow_pollEvent(sfWindow* window, sfEvent* event)
 {
     assert(window);
     assert(event);
-    return convertEvent(window->This.pollEvent(), event);
+    return convertEvent(window->pollEvent(), event);
 }
 
 
@@ -127,7 +123,7 @@ bool sfWindow_waitEvent(sfWindow* window, sfTime timeout, sfEvent* event)
 {
     assert(window);
     assert(event);
-    return convertEvent(window->This.waitEvent(sf::microseconds(timeout.microseconds)), event);
+    return convertEvent(window->waitEvent(sf::microseconds(timeout.microseconds)), event);
 }
 
 
@@ -135,7 +131,7 @@ bool sfWindow_waitEvent(sfWindow* window, sfTime timeout, sfEvent* event)
 sfVector2i sfWindow_getPosition(const sfWindow* window)
 {
     assert(window);
-    return convertVector2(window->This.getPosition());
+    return convertVector2(window->getPosition());
 }
 
 
@@ -143,7 +139,7 @@ sfVector2i sfWindow_getPosition(const sfWindow* window)
 void sfWindow_setPosition(sfWindow* window, sfVector2i position)
 {
     assert(window);
-    window->This.setPosition(convertVector2(position));
+    window->setPosition(convertVector2(position));
 }
 
 
@@ -151,7 +147,7 @@ void sfWindow_setPosition(sfWindow* window, sfVector2i position)
 sfVector2u sfWindow_getSize(const sfWindow* window)
 {
     assert(window);
-    return convertVector2(window->This.getSize());
+    return convertVector2(window->getSize());
 }
 
 
@@ -159,7 +155,7 @@ sfVector2u sfWindow_getSize(const sfWindow* window)
 void sfWindow_setSize(sfWindow* window, sfVector2u size)
 {
     assert(window);
-    window->This.setSize(convertVector2(size));
+    window->setSize(convertVector2(size));
 }
 
 
@@ -167,7 +163,7 @@ void sfWindow_setSize(sfWindow* window, sfVector2u size)
 void sfWindow_setTitle(sfWindow* window, const char* title)
 {
     assert(window);
-    window->This.setTitle(title);
+    window->setTitle(title);
 }
 
 
@@ -175,7 +171,7 @@ void sfWindow_setTitle(sfWindow* window, const char* title)
 void sfWindow_setUnicodeTitle(sfWindow* window, const sfChar32* title)
 {
     assert(window);
-    window->This.setTitle(reinterpret_cast<const char32_t*>(title));
+    window->setTitle(reinterpret_cast<const char32_t*>(title));
 }
 
 
@@ -183,7 +179,7 @@ void sfWindow_setUnicodeTitle(sfWindow* window, const sfChar32* title)
 void sfWindow_setIcon(sfWindow* window, sfVector2u size, const uint8_t* pixels)
 {
     assert(window);
-    window->This.setIcon(convertVector2(size), pixels);
+    window->setIcon(convertVector2(size), pixels);
 }
 
 
@@ -191,7 +187,7 @@ void sfWindow_setIcon(sfWindow* window, sfVector2u size, const uint8_t* pixels)
 void sfWindow_setVisible(sfWindow* window, bool visible)
 {
     assert(window);
-    window->This.setVisible(visible);
+    window->setVisible(visible);
 }
 
 
@@ -199,7 +195,7 @@ void sfWindow_setVisible(sfWindow* window, bool visible)
 void sfWindow_setMouseCursorVisible(sfWindow* window, bool visible)
 {
     assert(window);
-    window->This.setMouseCursorVisible(visible);
+    window->setMouseCursorVisible(visible);
 }
 
 
@@ -207,7 +203,7 @@ void sfWindow_setMouseCursorVisible(sfWindow* window, bool visible)
 void sfWindow_setMouseCursorGrabbed(sfWindow* window, bool grabbed)
 {
     assert(window);
-    window->This.setMouseCursorGrabbed(grabbed);
+    window->setMouseCursorGrabbed(grabbed);
 }
 
 
@@ -216,14 +212,14 @@ void sfWindow_setMouseCursor(sfWindow* window, const sfCursor* cursor)
 {
     assert(window);
     assert(cursor);
-    window->This.setMouseCursor(cursor->This);
+    window->setMouseCursor(*cursor);
 }
 
 ////////////////////////////////////////////////////////////
 void sfWindow_setVerticalSyncEnabled(sfWindow* window, bool enabled)
 {
     assert(window);
-    window->This.setVerticalSyncEnabled(enabled);
+    window->setVerticalSyncEnabled(enabled);
 }
 
 
@@ -231,7 +227,7 @@ void sfWindow_setVerticalSyncEnabled(sfWindow* window, bool enabled)
 void sfWindow_setKeyRepeatEnabled(sfWindow* window, bool enabled)
 {
     assert(window);
-    window->This.setKeyRepeatEnabled(enabled);
+    window->setKeyRepeatEnabled(enabled);
 }
 
 
@@ -239,7 +235,7 @@ void sfWindow_setKeyRepeatEnabled(sfWindow* window, bool enabled)
 bool sfWindow_setActive(sfWindow* window, bool active)
 {
     assert(window);
-    return window->This.setActive(active);
+    return window->setActive(active);
 }
 
 
@@ -247,7 +243,7 @@ bool sfWindow_setActive(sfWindow* window, bool active)
 void sfWindow_requestFocus(sfWindow* window)
 {
     assert(window);
-    window->This.requestFocus();
+    window->requestFocus();
 }
 
 
@@ -255,7 +251,7 @@ void sfWindow_requestFocus(sfWindow* window)
 bool sfWindow_hasFocus(const sfWindow* window)
 {
     assert(window);
-    return window->This.hasFocus();
+    return window->hasFocus();
 }
 
 
@@ -263,7 +259,7 @@ bool sfWindow_hasFocus(const sfWindow* window)
 void sfWindow_display(sfWindow* window)
 {
     assert(window);
-    window->This.display();
+    window->display();
 }
 
 
@@ -271,7 +267,7 @@ void sfWindow_display(sfWindow* window)
 void sfWindow_setFramerateLimit(sfWindow* window, unsigned int limit)
 {
     assert(window);
-    window->This.setFramerateLimit(limit);
+    window->setFramerateLimit(limit);
 }
 
 
@@ -279,7 +275,7 @@ void sfWindow_setFramerateLimit(sfWindow* window, unsigned int limit)
 void sfWindow_setJoystickThreshold(sfWindow* window, float threshold)
 {
     assert(window);
-    window->This.setJoystickThreshold(threshold);
+    window->setJoystickThreshold(threshold);
 }
 
 
@@ -287,7 +283,7 @@ void sfWindow_setJoystickThreshold(sfWindow* window, float threshold)
 sfWindowHandle sfWindow_getNativeHandle(const sfWindow* window)
 {
     assert(window);
-    return static_cast<sfWindowHandle>(window->This.getNativeHandle());
+    return static_cast<sfWindowHandle>(window->getNativeHandle());
 }
 
 
@@ -300,5 +296,5 @@ bool sfWindow_createVulkanSurface(sfWindow*                    window,
     assert(window);
     assert(instance);
     assert(surface);
-    return window->This.createVulkanSurface(*instance, *surface, allocator);
+    return window->createVulkanSurface(*instance, *surface, allocator);
 }

src/CSFML/Window/WindowBase.cpp

@@ -40,7 +40,7 @@ sfWindowBase* sfWindowBase_create(sfVideoMode mode, const char* title, uint32_t
 {
     // Create the window
     auto* windowBase = new sfWindowBase;
-    windowBase->This.create(convertVideoMode(mode), title, style, static_cast<sf::State>(state));
+    windowBase->create(convertVideoMode(mode), title, style, static_cast<sf::State>(state));
 
     return windowBase;
 }
@@ -51,8 +51,7 @@ sfWindowBase* sfWindowBase_createUnicode(sfVideoMode mode, const sfChar32* title
 {
     // Create the window
     auto* windowBase = new sfWindowBase;
-    windowBase->This
-        .create(convertVideoMode(mode), reinterpret_cast<const char32_t*>(title), style, static_cast<sf::State>(state));
+    windowBase->create(convertVideoMode(mode), reinterpret_cast<const char32_t*>(title), style, static_cast<sf::State>(state));
 
     return windowBase;
 }
@@ -63,7 +62,7 @@ sfWindowBase* sfWindowBase_createFromHandle(sfWindowHandle handle)
 {
     // Create the window
     auto* windowBase = new sfWindowBase;
-    windowBase->This.create(handle);
+    windowBase->create(handle);
 
     return windowBase;
 }
@@ -80,7 +79,7 @@ void sfWindowBase_destroy(const sfWindowBase* windowBase)
 void sfWindowBase_close(sfWindowBase* windowBase)
 {
     assert(windowBase);
-    windowBase->This.close();
+    windowBase->close();
 }
 
 
@@ -88,7 +87,7 @@ void sfWindowBase_close(sfWindowBase* windowBase)
 bool sfWindowBase_isOpen(const sfWindowBase* windowBase)
 {
     assert(windowBase);
-    return windowBase->This.isOpen();
+    return windowBase->isOpen();
 }
 
 
@@ -97,7 +96,7 @@ bool sfWindowBase_pollEvent(sfWindowBase* windowBase, sfEvent* event)
 {
     assert(windowBase);
     assert(event);
-    return convertEvent(windowBase->This.pollEvent(), event);
+    return convertEvent(windowBase->pollEvent(), event);
 }
 
 
@@ -106,7 +105,7 @@ bool sfWindowBase_waitEvent(sfWindowBase* windowBase, sfTime timeout, sfEvent* e
 {
     assert(windowBase);
     assert(event);
-    return convertEvent(windowBase->This.waitEvent(sf::microseconds(timeout.microseconds)), event);
+    return convertEvent(windowBase->waitEvent(sf::microseconds(timeout.microseconds)), event);
 }
 
 
@@ -114,7 +113,7 @@ bool sfWindowBase_waitEvent(sfWindowBase* windowBase, sfTime timeout, sfEvent* e
 sfVector2i sfWindowBase_getPosition(const sfWindowBase* windowBase)
 {
     assert(windowBase);
-    return convertVector2(windowBase->This.getPosition());
+    return convertVector2(windowBase->getPosition());
 }
 
 
@@ -122,7 +121,7 @@ sfVector2i sfWindowBase_getPosition(const sfWindowBase* windowBase)
 void sfWindowBase_setPosition(sfWindowBase* windowBase, sfVector2i position)
 {
     assert(windowBase);
-    windowBase->This.setPosition(convertVector2(position));
+    windowBase->setPosition(convertVector2(position));
 }
 
 
@@ -130,7 +129,7 @@ void sfWindowBase_setPosition(sfWindowBase* windowBase, sfVector2i position)
 sfVector2u sfWindowBase_getSize(const sfWindowBase* windowBase)
 {
     assert(windowBase);
-    return convertVector2(windowBase->This.getSize());
+    return convertVector2(windowBase->getSize());
 }
 
 
@@ -138,7 +137,7 @@ sfVector2u sfWindowBase_getSize(const sfWindowBase* windowBase)
 void sfWindowBase_setSize(sfWindowBase* windowBase, sfVector2u size)
 {
     assert(windowBase);
-    windowBase->This.setSize(convertVector2(size));
+    windowBase->setSize(convertVector2(size));
 }
 
 
@@ -146,7 +145,7 @@ void sfWindowBase_setSize(sfWindowBase* windowBase, sfVector2u size)
 void sfWindowBase_setTitle(sfWindowBase* windowBase, const char* title)
 {
     assert(windowBase);
-    windowBase->This.setTitle(title);
+    windowBase->setTitle(title);
 }
 
 
@@ -154,7 +153,7 @@ void sfWindowBase_setTitle(sfWindowBase* windowBase, const char* title)
 void sfWindowBase_setUnicodeTitle(sfWindowBase* windowBase, const sfChar32* title)
 {
     assert(windowBase);
-    windowBase->This.setTitle(reinterpret_cast<const char32_t*>(title));
+    windowBase->setTitle(reinterpret_cast<const char32_t*>(title));
 }
 
 
@@ -162,7 +161,7 @@ void sfWindowBase_setUnicodeTitle(sfWindowBase* windowBase, const sfChar32* titl
 void sfWindowBase_setIcon(sfWindowBase* windowBase, sfVector2u size, const uint8_t* pixels)
 {
     assert(windowBase);
-    windowBase->This.setIcon(convertVector2(size), pixels);
+    windowBase->setIcon(convertVector2(size), pixels);
 }
 
 
@@ -170,7 +169,7 @@ void sfWindowBase_setIcon(sfWindowBase* windowBase, sfVector2u size, const uint8
 void sfWindowBase_setVisible(sfWindowBase* windowBase, bool visible)
 {
     assert(windowBase);
-    windowBase->This.setVisible(visible);
+    windowBase->setVisible(visible);
 }
 
 
@@ -178,7 +177,7 @@ void sfWindowBase_setVisible(sfWindowBase* windowBase, bool visible)
 void sfWindowBase_setMouseCursorVisible(sfWindowBase* windowBase, bool visible)
 {
     assert(windowBase);
-    windowBase->This.setMouseCursorVisible(visible);
+    windowBase->setMouseCursorVisible(visible);
 }
 
 
@@ -186,7 +185,7 @@ void sfWindowBase_setMouseCursorVisible(sfWindowBase* windowBase, bool visible)
 void sfWindowBase_setMouseCursorGrabbed(sfWindowBase* windowBase, bool grabbed)
 {
     assert(windowBase);
-    windowBase->This.setMouseCursorGrabbed(grabbed);
+    windowBase->setMouseCursorGrabbed(grabbed);
 }
 
 
@@ -195,7 +194,7 @@ void sfWindowBase_setMouseCursor(sfWindowBase* windowBase, const sfCursor* curso
 {
     assert(windowBase);
     assert(cursor);
-    windowBase->This.setMouseCursor(cursor->This);
+    windowBase->setMouseCursor(*cursor);
 }
 
 
@@ -203,7 +202,7 @@ void sfWindowBase_setMouseCursor(sfWindowBase* windowBase, const sfCursor* curso
 void sfWindowBase_setKeyRepeatEnabled(sfWindowBase* windowBase, bool enabled)
 {
     assert(windowBase);
-    windowBase->This.setKeyRepeatEnabled(enabled);
+    windowBase->setKeyRepeatEnabled(enabled);
 }
 
 
@@ -211,7 +210,7 @@ void sfWindowBase_setKeyRepeatEnabled(sfWindowBase* windowBase, bool enabled)
 void sfWindowBase_setJoystickThreshold(sfWindowBase* windowBase, float threshold)
 {
     assert(windowBase);
-    windowBase->This.setJoystickThreshold(threshold);
+    windowBase->setJoystickThreshold(threshold);
 }
 
 
@@ -219,7 +218,7 @@ void sfWindowBase_setJoystickThreshold(sfWindowBase* windowBase, float threshold
 void sfWindowBase_requestFocus(sfWindowBase* windowBase)
 {
     assert(windowBase);
-    windowBase->This.requestFocus();
+    windowBase->requestFocus();
 }
 
 
@@ -227,7 +226,7 @@ void sfWindowBase_requestFocus(sfWindowBase* windowBase)
 bool sfWindowBase_hasFocus(const sfWindowBase* windowBase)
 {
     assert(windowBase);
-    return windowBase->This.hasFocus();
+    return windowBase->hasFocus();
 }
 
 
@@ -235,7 +234,7 @@ bool sfWindowBase_hasFocus(const sfWindowBase* windowBase)
 sfWindowHandle sfWindowBase_getNativeHandle(const sfWindowBase* windowBase)
 {
     assert(windowBase);
-    return static_cast<sfWindowHandle>(windowBase->This.getNativeHandle());
+    return static_cast<sfWindowHandle>(windowBase->getNativeHandle());
 }
 
 ////////////////////////////////////////////////////////////
@@ -247,5 +246,5 @@ bool sfWindowBase_createVulkanSurface(sfWindowBase*                windowBase,
     assert(windowBase);
     assert(instance);
     assert(surface);
-    return windowBase->This.createVulkanSurface(*instance, *surface, allocator);
+    return windowBase->createVulkanSurface(*instance, *surface, allocator);
 }

src/CSFML/Window/WindowBaseStruct.hpp

@@ -33,7 +33,6 @@
 ////////////////////////////////////////////////////////////
 // Internal structure of sfWindowBase
 ////////////////////////////////////////////////////////////
-struct sfWindowBase
+struct sfWindowBase : sf::WindowBase
 {
-    sf::WindowBase This;
 };

src/CSFML/Window/WindowStruct.hpp

@@ -33,7 +33,6 @@
 ////////////////////////////////////////////////////////////
 // Internal structure of sfWindow
 ////////////////////////////////////////////////////////////
-struct sfWindow
+struct sfWindow : sf::Window
 {
-    sf::Window This;
 };