Mercurial > otakunoraifu

comparison window/widget.cc @ 47:5f548e5957a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* get rid of the "deprecated conversion from string constant to ‘char*’" warnings
author thib
date Wed, 15 Apr 2009 20:26:32 +0000
parents 8da1d92ac8f8
children 15a18fbe6f21
comparison
equal deleted inserted replaced
46:3aa3d244ad90 47:5f548e5957a8
35 void DSurfaceFill(Surface* src, const Rect& rect, int r, int g, int b, int a = 0xff); 35 void DSurfaceFill(Surface* src, const Rect& rect, int r, int g, int b, int a = 0xff);
36 void DSurfaceMove(Surface* src, const Rect& srcrect, Surface* dst_o, const Rect& dstrect); 36 void DSurfaceMove(Surface* src, const Rect& srcrect, Surface* dst_o, const Rect& dstrect);
37 37
38 //static char* wdefault_font_orig = "msgothic.ttc;times.ttf;"; 38 //static char* wdefault_font_orig = "msgothic.ttc;times.ttf;";
39 static std::map<int, XKFont::HorizLayout*> size_to_layout; 39 static std::map<int, XKFont::HorizLayout*> size_to_layout;
40 static char* wdefault_font_orig = "times.ttf;msgothic.ttc"; 40 static const char* wdefault_font_orig = "times.ttf;msgothic.ttc";
41 static std::string wdefault_font = wdefault_font_orig; 41 static std::string wdefault_font = wdefault_font_orig;
42 42
43 void SetFont(const char* font) { 43 void SetFont(const char* font) {
44 if (font == 0) return; 44 if (font == 0) return;
45 std::map<int,XKFont::HorizLayout*>::iterator it; 45 std::map<int,XKFont::HorizLayout*>::iterator it;