Skip to content

Commit

Permalink
Once again, avoid anything that conflicts with Win32 constants
Browse files Browse the repository at this point in the history
  • Loading branch information
joncampbell123 committed Jan 5, 2025
1 parent d965f51 commit 9e66c8b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/gui/sdl_gui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -353,9 +353,9 @@ namespace WLGUI {

struct Obj {
struct Flags {
static constexpr uint32_t ANTIALIASED = uint32_t(1u) << uint32_t(0u); /* make anti-aliased TrueType where possible */
static constexpr uint32_t TRUETYPE = uint32_t(1u) << uint32_t(1u); /* font is TrueType */
static constexpr uint32_t FIXED_PITCH = uint32_t(1u) << uint32_t(2u); /* font is fixed pitch */
static constexpr uint32_t Antialiased = uint32_t(1u) << uint32_t(0u); /* make anti-aliased TrueType where possible */
static constexpr uint32_t TrueType = uint32_t(1u) << uint32_t(1u); /* font is TrueType */
static constexpr uint32_t FixedPitch = uint32_t(1u) << uint32_t(2u); /* font is fixed pitch */
uint32_t v = 0;
};

Expand Down Expand Up @@ -651,7 +651,7 @@ namespace WLGUI {
/////////////////

ObjVGAFont::ObjVGAFont(const unsigned int height) : Obj(ObjType::VGAFont) {
Flags.v |= Flags::FIXED_PITCH;
Flags.v |= Flags::FixedPitch;
if (height >= 16) {
font = int10_font_16;
fontheight = 16;
Expand Down

0 comments on commit 9e66c8b

Please sign in to comment.