diff options
| author | Jason Rumney <jasonr@gnu.org> | 2007-06-02 22:06:44 +0000 |
|---|---|---|
| committer | Jason Rumney <jasonr@gnu.org> | 2007-06-02 22:06:44 +0000 |
| commit | 1445e9c6c6f9b643d316c402a2b9fcc4fe78d3c6 (patch) | |
| tree | dadda8594ce7172b1c3f6cf3e7bd1cad65efc61a /src/w32term.h | |
| parent | 88fce384f4873c6bd482fb96f3523623aa3abe6c (diff) | |
| download | emacs-1445e9c6c6f9b643d316c402a2b9fcc4fe78d3c6.tar.gz emacs-1445e9c6c6f9b643d316c402a2b9fcc4fe78d3c6.tar.bz2 emacs-1445e9c6c6f9b643d316c402a2b9fcc4fe78d3c6.zip | |
(FONT_WIDTH): Report max width, not average.
(FONT_MAX_WIDTH): Remove.
(FONT_AVG_WIDTH): New macro.
Diffstat (limited to 'src/w32term.h')
| -rw-r--r-- | src/w32term.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/w32term.h b/src/w32term.h index 52b6d9c9427..6eb7988b485 100644 --- a/src/w32term.h +++ b/src/w32term.h @@ -28,15 +28,15 @@ Boston, MA 02110-1301, USA. */ #define WHITE_PIX_DEFAULT(f) PALETTERGB(255,255,255) #define FONT_WIDTH(f) \ - ((f)->bdf ? (f)->bdf->width : (f)->tm.tmAveCharWidth) + ((f)->bdf ? (f)->bdf->width : (f)->tm.tmMaxCharWidth) #define FONT_HEIGHT(f) \ ((f)->bdf ? (f)->bdf->height : (f)->tm.tmHeight) #define FONT_BASE(f) \ ((f)->bdf ? (f)->bdf->ury : (f)->tm.tmAscent) #define FONT_DESCENT(f) \ ((f)->bdf ? -((f)->bdf->lly) : (f)->tm.tmDescent) -#define FONT_MAX_WIDTH(f) \ - ((f)->bdf ? (f)->bdf->width : (f)->tm.tmMaxCharWidth) +#define FONT_AVG_WIDTH(f) \ + ((f)->bdf ? (f)->bdf->width : (f)->tm.tmAveCharWidth) #define CP_DEFAULT 1004 /* Special pseudo-codepages. */ |