all repos — mgba @ 797441c379af788b89968964fcddf219afa42487

mGBA Game Boy Advance Emulator

GUI: Fix some types
Jeffrey Pfau jeffrey@endrift.com
Wed, 26 Aug 2015 20:11:51 -0700
commit

797441c379af788b89968964fcddf219afa42487

parent

af24a98de42005c94c87d436a972118e3fb27f29

M src/platform/3ds/gui-font.csrc/platform/3ds/gui-font.c

@@ -35,7 +35,7 @@ sf2d_free_texture(font->tex);

free(font); } -int GUIFontHeight(const struct GUIFont* font) { +unsigned GUIFontHeight(const struct GUIFont* font) { UNUSED(font); return GLYPH_HEIGHT; }
M src/platform/psp2/gui-font.csrc/platform/psp2/gui-font.c

@@ -31,7 +31,7 @@ vita2d_free_texture(font->tex);

free(font); } -int GUIFontHeight(const struct GUIFont* font) { +unsigned GUIFontHeight(const struct GUIFont* font) { UNUSED(font); return GLYPH_HEIGHT; }
M src/platform/wii/gui-font.csrc/platform/wii/gui-font.c

@@ -39,7 +39,7 @@ TPL_CloseTPLFile(&font->tdf);

free(font); } -int GUIFontHeight(const struct GUIFont* font) { +unsigned GUIFontHeight(const struct GUIFont* font) { UNUSED(font); return GLYPH_HEIGHT; }
M src/util/gui.hsrc/util/gui.h

@@ -25,8 +25,8 @@ GUI_INPUT_MAX

}; struct GUIParams { - int width; - int height; + unsigned width; + unsigned height; const struct GUIFont* font; void (*drawStart)(void);
M src/util/gui/file-select.csrc/util/gui/file-select.c

@@ -168,7 +168,7 @@ fileIndex = 0;

} params->drawStart(); - int y = GUIFontHeight(params->font); + unsigned y = GUIFontHeight(params->font); GUIFontPrintf(params->font, 0, y, GUI_TEXT_LEFT, 0xFFFFFFFF, "%s", currentPath); y += 2 * GUIFontHeight(params->font); size_t i;
M src/util/gui/font.hsrc/util/gui/font.h

@@ -29,7 +29,7 @@ int left;

} padding; }; -int GUIFontHeight(const struct GUIFont*); +unsigned GUIFontHeight(const struct GUIFont*); void GUIFontPrintf(const struct GUIFont*, int x, int y, enum GUITextAlignment, uint32_t color, const char* text, ...);