Merge remote branch 'callum/master'

Conflicts:
	clients/window.h
This commit is contained in:
Kristian Høgsberg 2011-01-25 10:40:01 -05:00
commit 6ec41abf72
3 changed files with 91 additions and 12 deletions

View file

@ -136,9 +136,6 @@ window_create_transient(struct display *display, struct window *parent,
void
window_destroy(struct window *window);
void
window_set_title(struct window *window, const char *title);
void
window_move(struct window *window, struct input *input, uint32_t time);
@ -147,6 +144,7 @@ window_draw(struct window *window);
void
window_get_child_allocation(struct window *window,
struct rectangle *allocation);
void
window_set_child_size(struct window *window, int32_t width, int32_t height);
void
@ -212,6 +210,16 @@ void
window_set_keyboard_focus_handler(struct window *window,
window_keyboard_focus_handler_t handler);
void
window_set_frame_handler(struct window *window,
window_frame_handler_t handler);
void
window_set_title(struct window *window, const char *title);
const char *
window_get_title(struct window *window);
void
display_set_global_handler(struct display *display,
display_global_handler_t handler);