// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
+
#include "setup.h"
#include "screen/screen.h"
#include "screen/drawing_context.h"
if(mw != -1 || mh != -1)
{
- icon.push_back(new Surface(filename,USE_ALPHA));
+ icon.push_back(new Surface(filename,true));
icon.back()->resize(mw,mh);
}
else
- icon.push_back(new Surface(filename,USE_ALPHA));
+ icon.push_back(new Surface(filename,true));
}
char str[80];
int i = -32;
- if(0 > rect.x - (int)strlen(info.c_str()) * white_small_text->w)
- i = rect.w + strlen(info.c_str()) * white_small_text->w;
+ if(0 > rect.x - white_small_text->get_text_width(info))
+ i = rect.w + (int)white_small_text->get_text_width(info);
if(!info.empty())
- context.draw_text(white_small_text, info.c_str(), Vector(i + rect.x - strlen(info.c_str()) * white_small_text->w, rect.y), LAYER_GUI);
+ context.draw_text(white_small_text, info, Vector(i + rect.x - white_small_text->get_text_width(info), rect.y), LAYER_GUI);
sprintf(str,"(%s)", SDL_GetKeyName(shortcut));
- context.draw_text(white_small_text, str, Vector(i + rect.x - strlen(str) * white_small_text->w, rect.y + white_small_text->h+2), LAYER_GUI);
+ context.draw_text(white_small_text, str, Vector(i + rect.x - white_small_text->get_text_width(str), rect.y + white_small_text->get_height()+2), LAYER_GUI);
}
if(state == BUTTON_PRESSED || state == BUTTON_DEACTIVE)
fillrect(rect.x,rect.y,rect.w,rect.h,75,75,75,200);