diff options
| author | Richard M. Stallman | 1994-01-30 03:17:32 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1994-01-30 03:17:32 +0000 |
| commit | 01492d1b7c916d117bce7d634243f2132437f270 (patch) | |
| tree | 9ee380741008da3893978a0b7de6a13c9822a39d /src | |
| parent | cdee26965a38e6ae869655ee5dd76524586f4c24 (diff) | |
| download | emacs-01492d1b7c916d117bce7d634243f2132437f270.tar.gz emacs-01492d1b7c916d117bce7d634243f2132437f270.zip | |
*** empty log message ***
Diffstat (limited to 'src')
| -rw-r--r-- | src/widget.c | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/src/widget.c b/src/widget.c index e5092b1eb73..e93fbaf5c6b 100644 --- a/src/widget.c +++ b/src/widget.c | |||
| @@ -58,14 +58,14 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ | |||
| 58 | #define DEFAULT_FACE_FONT "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*" | 58 | #define DEFAULT_FACE_FONT "-*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*" |
| 59 | 59 | ||
| 60 | 60 | ||
| 61 | static void EmacsFrameInitialize (Widget, Widget, ArgList, Cardinal *); | 61 | static void EmacsFrameInitialize (/*Widget, Widget, ArgList, Cardinal * */); |
| 62 | static void EmacsFrameDestroy (Widget); | 62 | static void EmacsFrameDestroy (/* Widget */); |
| 63 | static void EmacsFrameRealize (Widget, XtValueMask*, XSetWindowAttributes*); | 63 | static void EmacsFrameRealize (/* Widget, XtValueMask*, XSetWindowAttributes* */); |
| 64 | void EmacsFrameResize (Widget widget); | 64 | void EmacsFrameResize (/* Widget widget */); |
| 65 | static Boolean EmacsFrameSetValues (Widget, Widget, Widget, | 65 | static Boolean EmacsFrameSetValues (/* Widget, Widget, Widget, |
| 66 | ArgList, Cardinal *); | 66 | ArgList, Cardinal * */); |
| 67 | static XtGeometryResult EmacsFrameQueryGeometry (Widget, XtWidgetGeometry*, | 67 | static XtGeometryResult EmacsFrameQueryGeometry (/* Widget, XtWidgetGeometry*, |
| 68 | XtWidgetGeometry*); | 68 | XtWidgetGeometry* */); |
| 69 | 69 | ||
| 70 | 70 | ||
| 71 | #undef XtOffset | 71 | #undef XtOffset |
| @@ -162,8 +162,10 @@ EmacsFrameClassRec emacsFrameClassRec = { | |||
| 162 | WidgetClass emacsFrameClass = (WidgetClass) &emacsFrameClassRec; | 162 | WidgetClass emacsFrameClass = (WidgetClass) &emacsFrameClassRec; |
| 163 | 163 | ||
| 164 | static void | 164 | static void |
| 165 | get_default_char_pixel_size (EmacsFrame ew, int* pixel_width, | 165 | get_default_char_pixel_size (ew, pixel_width, pixel_height) |
| 166 | int* pixel_height) | 166 | EmacsFrame ew; |
| 167 | int* pixel_width; | ||
| 168 | int* pixel_height; | ||
| 167 | { | 169 | { |
| 168 | /* | 170 | /* |
| 169 | *pixel_width = XTextWidth (ew->emacs_frame.font, "n", 1); | 171 | *pixel_width = XTextWidth (ew->emacs_frame.font, "n", 1); |
| @@ -176,9 +178,12 @@ get_default_char_pixel_size (EmacsFrame ew, int* pixel_width, | |||
| 176 | } | 178 | } |
| 177 | 179 | ||
| 178 | static void | 180 | static void |
| 179 | pixel_to_char_size (EmacsFrame ew, | 181 | pixel_to_char_size (ew, pixel_width, pixel_height, char_width, char_height) |
| 180 | Dimension pixel_width, Dimension pixel_height, | 182 | EmacsFrame ew; |
| 181 | int* char_width, int* char_height) | 183 | Dimension pixel_width; |
| 184 | Dimension pixel_height; | ||
| 185 | int* char_width; | ||
| 186 | int* char_height; | ||
| 182 | { | 187 | { |
| 183 | struct frame* f = ew->emacs_frame.frame; | 188 | struct frame* f = ew->emacs_frame.frame; |
| 184 | *char_width = PIXEL_TO_CHAR_WIDTH (f, pixel_width); | 189 | *char_width = PIXEL_TO_CHAR_WIDTH (f, pixel_width); |