Wed, 21 Jan 2015 20:38:21 +0100
fixed memory allocation bug
/* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright 2014 Olaf Wintermann. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ #include <stdio.h> #include <stdlib.h> #include "button.h" #include "container.h" #include "../../ucx/mempool.h" #include "../common/context.h" #include "../common/object.h" UIWIDGET ui_button(UiObject *obj, char *label, ui_callback f, void *data) { GtkWidget *button = gtk_button_new_with_label(label); if(f) { //UiEventData *event = ucx_mempool_malloc( // obj->ctx->mempool, // sizeof(UiEventData)); UiEventData *event = malloc(sizeof(UiEventData)); event->obj = obj; event->userdata = data; event->callback = f; event->value = 0; g_signal_connect( button, "clicked", G_CALLBACK(ui_button_clicked), event); g_signal_connect( button, "destroy", G_CALLBACK(ui_destroy_userdata), event); } UiContainer *ct = uic_get_current_container(obj); ct->add(ct, button, FALSE); return button; } void ui_button_clicked(GtkWidget *widget, UiEventData *event) { UiEvent e; e.obj = event->obj; e.window = event->obj->window; e.document = event->obj->ctx->document; e.eventdata = NULL; e.intval = event->value; event->callback(&e, event->userdata); } void ui_button_toggled(GtkToggleToolButton *widget, UiEventData *event) { UiEvent e; e.obj = event->obj; e.window = event->obj->window; e.document = event->obj->ctx->document; e.eventdata = NULL; e.intval = gtk_toggle_tool_button_get_active(widget); event->callback(&e, event->userdata); }