Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More const-correctness for betawidget. 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5792 4a71c877-e1ca-e34f-864e-861f7616d084
master
Freddie Witherden 2008-08-11 10:27:11 +00:00
parent 421335008a
commit dd3944c26c
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/betawidget/widget.c
View File

@ -561,7 +561,7 @@ void widgetRemoveEventHandlerImpl(widget *self, int id)
} }
} }
bool widgetFireCallbacksImpl(widget *self, event *evt) bool widgetFireCallbacksImpl(widget *self, const event *evt)
{ {
int i; int i;
bool ret; bool ret;
@ -591,7 +591,7 @@ bool widgetFireCallbacksImpl(widget *self, event *evt)
return true; return true;
} }
bool widgetFireTimerCallbacksImpl(widget *self, event *evt) bool widgetFireTimerCallbacksImpl(widget *self, const event *evt)
{ {
int i; int i;
bool ret; bool ret;
@ -894,7 +894,7 @@ widget *widgetGetCurrentlyFocused(widget *self)
return self; return self;
} }
bool widgetHandleEventImpl(widget *self, event *evt) bool widgetHandleEventImpl(widget *self, const event *evt)
{ {
// If the event should be passed onto our children // If the event should be passed onto our children
bool relevant = true; bool relevant = true;
@ -1098,12 +1098,12 @@ void widgetRemoveEventHandler(widget *self, int id)
WIDGET_GET_VTBL(self)->removeEventHandler(self, id); WIDGET_GET_VTBL(self)->removeEventHandler(self, id);
} }
bool widgetFireCallbacks(widget *self, event *evt) bool widgetFireCallbacks(widget *self, const event *evt)
{ {
return WIDGET_GET_VTBL(self)->fireCallbacks(self, evt); return WIDGET_GET_VTBL(self)->fireCallbacks(self, evt);
} }
bool widgetFireTimerCallbacks(widget *self, event *evt) bool widgetFireTimerCallbacks(widget *self, const event *evt)
{ {
return WIDGET_GET_VTBL(self)->fireTimerCallbacks(self, evt); return WIDGET_GET_VTBL(self)->fireTimerCallbacks(self, evt);
} }
@ -1183,7 +1183,7 @@ bool widgetDoLayout(widget *self)
return WIDGET_GET_VTBL(self)->doLayout(self); return WIDGET_GET_VTBL(self)->doLayout(self);
} }
bool widgetHandleEvent(widget *self, event *evt) bool widgetHandleEvent(widget *self, const event *evt)
{ {
return WIDGET_GET_VTBL(self)->handleEvent(self, evt); return WIDGET_GET_VTBL(self)->handleEvent(self, evt);
} }

20
lib/betawidget/widget.h
View File

@ -37,7 +37,7 @@ typedef struct _eventText eventText;
typedef struct _eventTimer eventTimer; typedef struct _eventTimer eventTimer;
typedef struct _eventMisc eventMisc; typedef struct _eventMisc eventMisc;
typedef bool (*callback) (widget *widget, event *evt, int handlerId, typedef bool (*callback) (widget *widget, const event *evt, int handlerId,
void *userData); void *userData);
typedef struct _eventTableEntry eventTableEntry; typedef struct _eventTableEntry eventTableEntry;
@ -210,13 +210,13 @@ struct _eventTableEntry
*/ */
struct _widgetVtbl struct _widgetVtbl
{ {
bool (*handleEvent) (widget *self, event *evt); bool (*handleEvent) (widget *self, const event *evt);
bool (*addChild) (widget *self, widget *child); bool (*addChild) (widget *self, widget *child);
void (*removeChild) (widget *self, widget *child); void (*removeChild) (widget *self, widget *child);
bool (*fireCallbacks) (widget *self, event *evt); bool (*fireCallbacks) (widget *self, const event *evt);
bool (*fireTimerCallbacks) (widget *self, event *evt); bool (*fireTimerCallbacks) (widget *self, const event *evt);
int (*addEventHandler) (widget *self, eventType type, int (*addEventHandler) (widget *self, eventType type,
callback handler, void *userData); callback handler, void *userData);
@ -373,8 +373,8 @@ void widgetInit(widget *instance, const char *id);
void widgetDestroyImpl(widget *instance); void widgetDestroyImpl(widget *instance);
bool widgetAddChildImpl(widget *self, widget *child); bool widgetAddChildImpl(widget *self, widget *child);
void widgetRemoveChildImpl(widget *self, widget *child); void widgetRemoveChildImpl(widget *self, widget *child);
bool widgetFireCallbacksImpl(widget *self, event *evt); bool widgetFireCallbacksImpl(widget *self, const event *evt);
bool widgetFireTimerCallbacksImpl(widget *self, event *evt); bool widgetFireTimerCallbacksImpl(widget *self, const event *evt);
int widgetAddEventHandlerImpl(widget *self, eventType type, int widgetAddEventHandlerImpl(widget *self, eventType type,
callback handler, void *userData); callback handler, void *userData);
int widgetAddTimerEventHandlerImpl(widget *self, eventType type, int interval, int widgetAddTimerEventHandlerImpl(widget *self, eventType type, int interval,
@ -387,7 +387,7 @@ void widgetHideImpl(widget *self);
void widgetFocusImpl(widget *self); void widgetFocusImpl(widget *self);
void widgetBlurImpl(widget *self); void widgetBlurImpl(widget *self);
void widgetResizeImpl(widget *self, int w, int h); void widgetResizeImpl(widget *self, int w, int h);
bool widgetHandleEventImpl(widget *self, event *evt); bool widgetHandleEventImpl(widget *self, const event *evt);
void widgetCompositeImpl(widget *self); void widgetCompositeImpl(widget *self);
/* /*
@ -688,7 +688,7 @@ void widgetResize(widget *self, int w, int h);
* @param evt The event itself. * @param evt The event itself.
* @param True if the event was `handled', false otherwise. * @param True if the event was `handled', false otherwise.
*/ */
bool widgetHandleEvent(widget *self, event *evt); bool widgetHandleEvent(widget *self, const event *evt);
/* /*
* Protected methods * Protected methods
@ -729,12 +729,12 @@ bool widgetDoLayout(widget *self);
* @param self The widget to fire the callbacks on. * @param self The widget to fire the callbacks on.
* @param evt The event to fire the callbacks for. * @param evt The event to fire the callbacks for.
*/ */
bool widgetFireCallbacks(widget *self, event *evt); bool widgetFireCallbacks(widget *self, const event *evt);
/** /**
* *
*/ */
bool widgetFireTimerCallbacks(widget *self, event *evt); bool widgetFireTimerCallbacks(widget *self, const event *evt);
/** /**
* Checks to see if the point loc is masked or not by the widgets mouse-event * Checks to see if the point loc is masked or not by the widgets mouse-event