* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-2000 The LyX Team.
+ * Copyright 1995-2001 The LyX Team.
*
* ====================================================== */
static
int width(string const & s, LyXFont const & f) {
if (s.empty()) return 0;
- return width(s.c_str(), s.length(), f);
+ return width(s.data(), s.length(), f);
}
///
- static
- int width(char const * s, LyXFont const & f) {
- return width(s, strlen(s), f);
- }
+ //static
+ //int width(char const * s, LyXFont const & f) {
+ // return width(s, strlen(s), f);
+ //}
///
static
int signedWidth(string const & s, LyXFont const & f);
///
static
void XSetFont(Display * display, GC gc, LyXFont const & f);
+ // A couple of more high-level metrics
+ ///
+ static
+ void rectText(string const & str, LyXFont const & font,
+ int & width, int & ascent, int & descent);
+ ///
+ static
+ void buttonText(string const & str, LyXFont const & font,
+ int & width, int & ascent, int & descent);
};
//} // end of namespace font