Michel2/Adafruit-GFX-Library
1
0 Fork 0
mirror of https://github.com/adafruit/Adafruit-GFX-Library.git synced 2026-10-26 22:10:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #302 from kinafu/master

Browse Source 
Add const specifier for strings
This commit is contained in:
Mikey Sklar authored and GitHub committed 2026-10-23 19:28:03 -07:00
2 parents 55a94acea3 f59fb924a8
commit d850c892d6
2 files changed
+8 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Adafruit_GFX.cpp
+4 -4
View File
@@ -1834,7 +1834,7 @@ Adafruit_GFX_Button::Adafruit_GFX_Button(void) {
void Adafruit_GFX_Button::initButton(Adafruit_GFX *gfx, int16_t x, int16_t y, void Adafruit_GFX_Button::initButton(Adafruit_GFX *gfx, int16_t x, int16_t y,
uint16_t w, uint16_t h, uint16_t outline, uint16_t w, uint16_t h, uint16_t outline,
uint16_t fill, uint16_t textcolor, uint16_t fill, uint16_t textcolor,
char *label, uint8_t textsize) { const char *label, uint8_t textsize) {
// Tweak arguments and pass to the newer initButtonUL() function... // Tweak arguments and pass to the newer initButtonUL() function...
initButtonUL(gfx, x - (w / 2), y - (h / 2), w, h, outline, fill, textcolor, initButtonUL(gfx, x - (w / 2), y - (h / 2), w, h, outline, fill, textcolor,
label, textsize); label, textsize);
@@ -1860,7 +1860,7 @@ void Adafruit_GFX_Button::initButton(Adafruit_GFX *gfx, int16_t x, int16_t y,
void Adafruit_GFX_Button::initButton(Adafruit_GFX *gfx, int16_t x, int16_t y, void Adafruit_GFX_Button::initButton(Adafruit_GFX *gfx, int16_t x, int16_t y,
uint16_t w, uint16_t h, uint16_t outline, uint16_t w, uint16_t h, uint16_t outline,
uint16_t fill, uint16_t textcolor, uint16_t fill, uint16_t textcolor,
char *label, uint8_t textsize_x, const char *label, uint8_t textsize_x,
uint8_t textsize_y) { uint8_t textsize_y) {
// Tweak arguments and pass to the newer initButtonUL() function... // Tweak arguments and pass to the newer initButtonUL() function...
initButtonUL(gfx, x - (w / 2), y - (h / 2), w, h, outline, fill, textcolor, initButtonUL(gfx, x - (w / 2), y - (h / 2), w, h, outline, fill, textcolor,
@@ -1886,7 +1886,7 @@ void Adafruit_GFX_Button::initButton(Adafruit_GFX *gfx, int16_t x, int16_t y,
void Adafruit_GFX_Button::initButtonUL(Adafruit_GFX *gfx, int16_t x1, void Adafruit_GFX_Button::initButtonUL(Adafruit_GFX *gfx, int16_t x1,
int16_t y1, uint16_t w, uint16_t h, int16_t y1, uint16_t w, uint16_t h,
uint16_t outline, uint16_t fill, uint16_t outline, uint16_t fill,
uint16_t textcolor, char *label, uint16_t textcolor, const char *label,
uint8_t textsize) { uint8_t textsize) {
initButtonUL(gfx, x1, y1, w, h, outline, fill, textcolor, label, textsize, initButtonUL(gfx, x1, y1, w, h, outline, fill, textcolor, label, textsize,
textsize); textsize);
@@ -1912,7 +1912,7 @@ void Adafruit_GFX_Button::initButtonUL(Adafruit_GFX *gfx, int16_t x1,
void Adafruit_GFX_Button::initButtonUL(Adafruit_GFX *gfx, int16_t x1, void Adafruit_GFX_Button::initButtonUL(Adafruit_GFX *gfx, int16_t x1,
int16_t y1, uint16_t w, uint16_t h, int16_t y1, uint16_t w, uint16_t h,
uint16_t outline, uint16_t fill, uint16_t outline, uint16_t fill,
uint16_t textcolor, char *label, uint16_t textcolor, const char *label,
uint8_t textsize_x, uint8_t textsize_y) { uint8_t textsize_x, uint8_t textsize_y) {
_x1 = x1; _x1 = x1;
_y1 = y1; _y1 = y1;
Adafruit_GFX.h
+4 -4
View File
@@ -270,18 +270,18 @@ public:
// "Classic" initButton() uses center & size // "Classic" initButton() uses center & size
void initButton(Adafruit_GFX *gfx, int16_t x, int16_t y, uint16_t w, void initButton(Adafruit_GFX *gfx, int16_t x, int16_t y, uint16_t w,
uint16_t h, uint16_t outline, uint16_t fill, uint16_t h, uint16_t outline, uint16_t fill,
uint16_t textcolor, char *label, uint8_t textsize); uint16_t textcolor, const char *label, uint8_t textsize);
void initButton(Adafruit_GFX *gfx, int16_t x, int16_t y, uint16_t w, void initButton(Adafruit_GFX *gfx, int16_t x, int16_t y, uint16_t w,
uint16_t h, uint16_t outline, uint16_t fill, uint16_t h, uint16_t outline, uint16_t fill,
uint16_t textcolor, char *label, uint8_t textsize_x, uint16_t textcolor, const char *label, uint8_t textsize_x,
uint8_t textsize_y); uint8_t textsize_y);
// New/alt initButton() uses upper-left corner & size // New/alt initButton() uses upper-left corner & size
void initButtonUL(Adafruit_GFX *gfx, int16_t x1, int16_t y1, uint16_t w, void initButtonUL(Adafruit_GFX *gfx, int16_t x1, int16_t y1, uint16_t w,
uint16_t h, uint16_t outline, uint16_t fill, uint16_t h, uint16_t outline, uint16_t fill,
uint16_t textcolor, char *label, uint8_t textsize); uint16_t textcolor, const char *label, uint8_t textsize);
void initButtonUL(Adafruit_GFX *gfx, int16_t x1, int16_t y1, uint16_t w, void initButtonUL(Adafruit_GFX *gfx, int16_t x1, int16_t y1, uint16_t w,
uint16_t h, uint16_t outline, uint16_t fill, uint16_t h, uint16_t outline, uint16_t fill,
uint16_t textcolor, char *label, uint8_t textsize_x, uint16_t textcolor, const char *label, uint8_t textsize_x,
uint8_t textsize_y); uint8_t textsize_y);
void drawButton(bool inverted = false); void drawButton(bool inverted = false);
bool contains(int16_t x, int16_t y); bool contains(int16_t x, int16_t y);