Remove some dodgy forward declarations from betawidget.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5721 4a71c877-e1ca-e34f-864e-861f7616d084
master
Freddie Witherden 2008-08-01 09:15:43 +00:00
parent 7aef59ad0d
commit b854f5bcb0
4 changed files with 12 additions and 21 deletions

View File

@ -9,17 +9,15 @@
typedef struct _hBox hBox; typedef struct _hBox hBox;
typedef struct _hBoxVtbl hBoxVtbl; typedef struct _hBoxVtbl hBoxVtbl;
typedef enum _vAlign vAlign;
/* /*
* The possible vertical sides a child can be aligned to * The possible vertical sides a child can be aligned to
*/ */
enum _vAlign typedef enum
{ {
TOP, TOP,
MIDDLE, MIDDLE,
BOTTOM BOTTOM
}; } vAlign;
struct _hBoxVtbl struct _hBoxVtbl
{ {

View File

@ -1,12 +1,10 @@
#ifndef KEYCODE_H_ #ifndef KEYCODE_H_
#define KEYCODE_H_ #define KEYCODE_H_
/* /**
* Forward declarations * Contains the list of known keycodes for keyboard input.
*/ */
typedef enum _eventKeycode eventKeycode; typedef enum
enum _eventKeycode
{ {
// `Control' keys // `Control' keys
EVT_KEYCODE_BACKSPACE, EVT_KEYCODE_BACKSPACE,
@ -31,6 +29,6 @@ enum _eventKeycode
// Unknown // Unknown
EVT_KEYCODE_UNKNOWN EVT_KEYCODE_UNKNOWN
}; } eventKeycode;
#endif /*KEYCODE_H_*/ #endif /*KEYCODE_H_*/

View File

@ -9,16 +9,14 @@
typedef struct _spacer spacer; typedef struct _spacer spacer;
typedef struct _spacerVtbl spacerVtbl; typedef struct _spacerVtbl spacerVtbl;
typedef enum _spacerDirection spacerDirection;
/* /*
* The directions a spacer can act in * The directions a spacer can act in
*/ */
enum _spacerDirection typedef enum
{ {
SPACER_DIRECTION_HORIZONTAL, SPACER_DIRECTION_HORIZONTAL,
SPACER_DIRECTION_VERTICAL SPACER_DIRECTION_VERTICAL
}; } spacerDirection;
struct _spacerVtbl struct _spacerVtbl
{ {

View File

@ -29,9 +29,6 @@ typedef struct _classInfo classInfo;
typedef struct _widget widget; typedef struct _widget widget;
typedef struct _widgetVtbl widgetVtbl; typedef struct _widgetVtbl widgetVtbl;
typedef enum _eventType eventType;
typedef enum _mouseButton mouseButton;
typedef struct _event event; typedef struct _event event;
typedef struct _eventMouse eventMouse; typedef struct _eventMouse eventMouse;
typedef struct _eventMouseBtn eventMouseBtn; typedef struct _eventMouseBtn eventMouseBtn;
@ -57,7 +54,7 @@ struct _classInfo
/* /*
* The valid event types * The valid event types
*/ */
enum _eventType typedef enum
{ {
// Mouse events // Mouse events
EVT_MOUSE_DOWN, EVT_MOUSE_DOWN,
@ -83,19 +80,19 @@ enum _eventType
// Misc // Misc
EVT_FOCUS, EVT_FOCUS,
EVT_BLUR EVT_BLUR
}; } eventType;
/* /*
* The possible mouse states as understood by the events system * The possible mouse states as understood by the events system
*/ */
enum _mouseButton typedef enum
{ {
BUTTON_LEFT, BUTTON_LEFT,
BUTTON_RIGHT, BUTTON_RIGHT,
BUTTON_WHEEL_UP, BUTTON_WHEEL_UP,
BUTTON_WHEEL_DOWN, BUTTON_WHEEL_DOWN,
BUTTON_OTHER BUTTON_OTHER
}; } mouseButton;
/* /*
* Event structures * Event structures