diff options
| author | Stefan Monnier | 2012-03-25 16:37:21 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2012-03-25 16:37:21 -0400 |
| commit | 699c782b7668c44d0fa4446331b0590a6d5dac82 (patch) | |
| tree | 5dcce364741d0761920a3d274b0fc8aba4103d45 /oldXMenu/XMenu.h | |
| parent | 98fb480ee31bf74cf554044f60f21df16566dd7f (diff) | |
| parent | e99a9b8bdccadded1f6fae88ee7a2a93dfd4eacf (diff) | |
| download | emacs-pending.tar.gz emacs-pending.zip | |
Merge from trunkpending
Diffstat (limited to 'oldXMenu/XMenu.h')
| -rw-r--r-- | oldXMenu/XMenu.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/oldXMenu/XMenu.h b/oldXMenu/XMenu.h index bf1e77b5ff7..8e4292f5088 100644 --- a/oldXMenu/XMenu.h +++ b/oldXMenu/XMenu.h | |||
| @@ -152,8 +152,8 @@ typedef struct _xmselect { | |||
| 152 | * | 152 | * |
| 153 | */ | 153 | */ |
| 154 | typedef enum _xmstyle { | 154 | typedef enum _xmstyle { |
| 155 | LEFT, /* Left oriented obejct. */ | 155 | LEFT, /* Left oriented object. */ |
| 156 | RIGHT, /* Right oriented obejct. */ | 156 | RIGHT, /* Right oriented object. */ |
| 157 | CENTER /* Center oriented object. */ | 157 | CENTER /* Center oriented object. */ |
| 158 | } XMStyle; | 158 | } XMStyle; |
| 159 | 159 | ||
| @@ -185,7 +185,7 @@ typedef struct _xmenu { | |||
| 185 | Window parent; /* Menu's parent window. */ | 185 | Window parent; /* Menu's parent window. */ |
| 186 | int width; /* Overall menu width. */ | 186 | int width; /* Overall menu width. */ |
| 187 | int height; /* Overall menu height. */ | 187 | int height; /* Overall menu height. */ |
| 188 | int x_pos; /* Oveall menu origin. */ | 188 | int x_pos; /* Overall menu origin. */ |
| 189 | int y_pos; /* Overall menu origin. */ | 189 | int y_pos; /* Overall menu origin. */ |
| 190 | Cursor mouse_cursor; /* Mouse cursor raster. */ | 190 | Cursor mouse_cursor; /* Mouse cursor raster. */ |
| 191 | XAssocTable *assoc_tab; /* XMWindow association table. */ | 191 | XAssocTable *assoc_tab; /* XMWindow association table. */ |