diff options
author | fluxgen <fluxgen> | 2002-04-03 23:00:10 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2002-04-03 23:00:10 (GMT) |
commit | 36dcc230a277e0bfeef05964d81e4ad56687551c (patch) | |
tree | ef3ab33dac427b4b58a6fc87cc3a69f0bed96ff4 | |
parent | 62490323a5396af4e77823687c4e6b6eb3e9c562 (diff) | |
download | fluxbox-36dcc230a277e0bfeef05964d81e4ad56687551c.zip fluxbox-36dcc230a277e0bfeef05964d81e4ad56687551c.tar.bz2 |
char * to const char *
-rw-r--r-- | src/DrawUtil.cc | 10 | ||||
-rw-r--r-- | src/DrawUtil.hh | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/DrawUtil.cc b/src/DrawUtil.cc index 1c29567..4b2115b 100644 --- a/src/DrawUtil.cc +++ b/src/DrawUtil.cc | |||
@@ -19,7 +19,7 @@ | |||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | // $Id: DrawUtil.cc,v 1.5 2002/03/22 11:51:46 fluxgen Exp $ | 22 | // $Id: DrawUtil.cc,v 1.6 2002/04/03 23:00:10 fluxgen Exp $ |
23 | 23 | ||
24 | #ifdef HAVE_CONFIG_H | 24 | #ifdef HAVE_CONFIG_H |
25 | # include "config.h" | 25 | # include "config.h" |
@@ -274,7 +274,7 @@ void XRotUnloadFont(Display *dpy, XRotFontStruct *rotfont) | |||
274 | //------- XRotTextWidth ------------------ | 274 | //------- XRotTextWidth ------------------ |
275 | // Returns the width of a rotated string | 275 | // Returns the width of a rotated string |
276 | //---------------------------------------- | 276 | //---------------------------------------- |
277 | unsigned int XRotTextWidth(XRotFontStruct *rotfont, char *str, int len) | 277 | unsigned int XRotTextWidth(XRotFontStruct *rotfont, const char *str, int len) |
278 | { | 278 | { |
279 | int i, width = 0, ichar; | 279 | int i, width = 0, ichar; |
280 | 280 | ||
@@ -300,7 +300,7 @@ unsigned int XRotTextWidth(XRotFontStruct *rotfont, char *str, int len) | |||
300 | // A front end to XRotDrawString : mimics XDrawString | 300 | // A front end to XRotDrawString : mimics XDrawString |
301 | //---------------------------------------- | 301 | //---------------------------------------- |
302 | void XRotDrawString(Display *dpy, XRotFontStruct *rotfont, Drawable drawable, | 302 | void XRotDrawString(Display *dpy, XRotFontStruct *rotfont, Drawable drawable, |
303 | GC gc, int x, int y, char *str, int len) | 303 | GC gc, int x, int y, const char *str, int len) |
304 | { | 304 | { |
305 | static GC my_gc = 0; | 305 | static GC my_gc = 0; |
306 | int i, xp, yp, dir, ichar; | 306 | int i, xp, yp, dir, ichar; |
@@ -368,7 +368,7 @@ void XRotDrawString(Display *dpy, XRotFontStruct *rotfont, Drawable drawable, | |||
368 | //Draw title string | 368 | //Draw title string |
369 | void DrawString(Display *display, Window w, GC gc, DrawUtil::Font *font, | 369 | void DrawString(Display *display, Window w, GC gc, DrawUtil::Font *font, |
370 | unsigned int text_w, unsigned int size_w, | 370 | unsigned int text_w, unsigned int size_w, |
371 | unsigned int bevel_w, char *text) { | 371 | unsigned int bevel_w, const char *text) { |
372 | 372 | ||
373 | assert(display); | 373 | assert(display); |
374 | assert(font); | 374 | assert(font); |
@@ -430,7 +430,7 @@ void DrawString(Display *display, Window w, GC gc, DrawUtil::Font *font, | |||
430 | void DrawRotString(Display *display, Window w, GC gc, XRotFontStruct *font, | 430 | void DrawRotString(Display *display, Window w, GC gc, XRotFontStruct *font, |
431 | unsigned int align, unsigned int text_w, | 431 | unsigned int align, unsigned int text_w, |
432 | unsigned int size_w, unsigned int size_h, | 432 | unsigned int size_w, unsigned int size_h, |
433 | unsigned int bevel_w, char *text) { | 433 | unsigned int bevel_w, const char *text) { |
434 | 434 | ||
435 | assert(display); | 435 | assert(display); |
436 | assert(font); | 436 | assert(font); |
diff --git a/src/DrawUtil.hh b/src/DrawUtil.hh index 3b3d32c..60056c9 100644 --- a/src/DrawUtil.hh +++ b/src/DrawUtil.hh | |||
@@ -19,7 +19,7 @@ | |||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | // $Id: DrawUtil.hh,v 1.4 2002/03/22 11:51:46 fluxgen Exp $ | 22 | // $Id: DrawUtil.hh,v 1.5 2002/04/03 23:00:10 fluxgen Exp $ |
23 | 23 | ||
24 | #ifndef DRAWUTIL_HH | 24 | #ifndef DRAWUTIL_HH |
25 | #define DRAWUTIL_HH | 25 | #define DRAWUTIL_HH |
@@ -40,7 +40,7 @@ namespace DrawUtil | |||
40 | 40 | ||
41 | void DrawString(Display *display, Window w, GC gc, DrawUtil::Font *font, | 41 | void DrawString(Display *display, Window w, GC gc, DrawUtil::Font *font, |
42 | unsigned int text_w, unsigned int size_w, | 42 | unsigned int text_w, unsigned int size_w, |
43 | unsigned int bevel_w, char *text); | 43 | unsigned int bevel_w, const char *text); |
44 | 44 | ||
45 | // ---------------------------------------------------------------------- | 45 | // ---------------------------------------------------------------------- |
46 | // xvertext, Copyright (c) 1992 Alan Richardson (mppa3@uk.ac.sussex.syma) | 46 | // xvertext, Copyright (c) 1992 Alan Richardson (mppa3@uk.ac.sussex.syma) |
@@ -78,14 +78,14 @@ void DrawString(Display *display, Window w, GC gc, DrawUtil::Font *font, | |||
78 | 78 | ||
79 | DrawUtil::XRotCharStruct per_char[95]; | 79 | DrawUtil::XRotCharStruct per_char[95]; |
80 | }; | 80 | }; |
81 | unsigned int XRotTextWidth(DrawUtil::XRotFontStruct *rotfont, char *str, int len); | 81 | unsigned int XRotTextWidth(DrawUtil::XRotFontStruct *rotfont, const char *str, int len); |
82 | void XRotDrawString(Display *dpy, DrawUtil::XRotFontStruct *rotfont, Drawable drawable, | 82 | void XRotDrawString(Display *dpy, DrawUtil::XRotFontStruct *rotfont, Drawable drawable, |
83 | GC gc, int x, int y, char *str, int len); | 83 | GC gc, int x, int y, const char *str, int len); |
84 | 84 | ||
85 | void DrawRotString(Display *display, Window w, GC gc, DrawUtil::XRotFontStruct *font, | 85 | void DrawRotString(Display *display, Window w, GC gc, DrawUtil::XRotFontStruct *font, |
86 | unsigned int align, unsigned int text_w, | 86 | unsigned int align, unsigned int text_w, |
87 | unsigned int size_w, unsigned int size_h, | 87 | unsigned int size_w, unsigned int size_h, |
88 | unsigned int bevel_w, char *text); | 88 | unsigned int bevel_w, const char *text); |
89 | 89 | ||
90 | DrawUtil::XRotFontStruct *XRotLoadFont(Display *dpy, char *fontname, float angle); | 90 | DrawUtil::XRotFontStruct *XRotLoadFont(Display *dpy, char *fontname, float angle); |
91 | void XRotUnloadFont(Display *dpy, DrawUtil::XRotFontStruct *rotfont); | 91 | void XRotUnloadFont(Display *dpy, DrawUtil::XRotFontStruct *rotfont); |