* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * $Id$
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
*/
#include "gtktipsquery.h"
#include "gtksignal.h"
SIGNAL_WIDGET_SELECTED,
SIGNAL_LAST
};
-typedef void (*SignalWidgetEntered) (GtkObject *object,
- GtkWidget *widget,
- const gchar *tip_text,
- const gchar *tip_private,
- gpointer func_data);
-typedef gint (*SignalWidgetSelected) (GtkObject *object,
- GtkWidget *widget,
- const gchar *tip_text,
- const gchar *tip_private,
- GdkEventButton *event,
- gpointer func_data);
-
/* --- prototypes --- */
static void gtk_tips_query_class_init (GtkTipsQueryClass *class);
static void gtk_tips_query_destroy (GtkObject *object);
static gint gtk_tips_query_event (GtkWidget *widget,
GdkEvent *event);
-static void gtk_tips_query_set_arg (GtkTipsQuery *tips_query,
+static void gtk_tips_query_set_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
-static void gtk_tips_query_get_arg (GtkTipsQuery *tips_query,
+static void gtk_tips_query_get_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void gtk_tips_query_real_start_query (GtkTipsQuery *tips_query);
if (!tips_query_type)
{
- GtkTypeInfo tips_query_info =
+ static const GtkTypeInfo tips_query_info =
{
"GtkTipsQuery",
sizeof (GtkTipsQuery),
sizeof (GtkTipsQueryClass),
(GtkClassInitFunc) gtk_tips_query_class_init,
(GtkObjectInitFunc) gtk_tips_query_init,
- (GtkArgSetFunc) gtk_tips_query_set_arg,
- (GtkArgGetFunc) gtk_tips_query_get_arg,
+ /* reserved_1 */ NULL,
+ /* reserved_2 */ NULL,
+ (GtkClassInitFunc) NULL,
};
tips_query_type = gtk_type_unique (gtk_label_get_type (), &tips_query_info);
return tips_query_type;
}
-static void
-gtk_tips_query_marshal_widget_entered (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- SignalWidgetEntered sfunc = (SignalWidgetEntered) func;
-
- (* sfunc) (object,
- (GtkWidget*) GTK_VALUE_OBJECT (args[0]),
- GTK_VALUE_STRING (args[1]),
- GTK_VALUE_STRING (args[2]),
- func_data);
-}
-
-static void
-gtk_tips_query_marshal_widget_selected (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- gint *return_val;
-
- SignalWidgetSelected sfunc = (SignalWidgetSelected) func;
- return_val = GTK_RETLOC_BOOL (args[4]);
-
- *return_val = (* sfunc) (object,
- (GtkWidget*) GTK_VALUE_OBJECT (args[0]),
- GTK_VALUE_STRING (args[1]),
- GTK_VALUE_STRING (args[2]),
- GTK_VALUE_BOXED (args[3]),
- func_data);
-}
-
static void
gtk_tips_query_class_init (GtkTipsQueryClass *class)
{
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkTipsQueryClass, start_query),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
tips_query_signals[SIGNAL_STOP_QUERY] =
gtk_signal_new ("stop_query",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkTipsQueryClass, stop_query),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
tips_query_signals[SIGNAL_WIDGET_ENTERED] =
gtk_signal_new ("widget_entered",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkTipsQueryClass, widget_entered),
- gtk_tips_query_marshal_widget_entered,
+ gtk_marshal_NONE__POINTER_STRING_STRING,
GTK_TYPE_NONE, 3,
GTK_TYPE_WIDGET,
GTK_TYPE_STRING,
GTK_TYPE_STRING);
tips_query_signals[SIGNAL_WIDGET_SELECTED] =
gtk_signal_new ("widget_selected",
- GTK_RUN_FIRST,
+ GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkTipsQueryClass, widget_selected),
- gtk_tips_query_marshal_widget_selected,
- GTK_TYPE_INT, 4,
+ gtk_marshal_BOOL__POINTER_STRING_STRING_POINTER,
+ GTK_TYPE_BOOL, 4,
GTK_TYPE_WIDGET,
GTK_TYPE_STRING,
GTK_TYPE_STRING,
- GTK_TYPE_BOXED);
+ GTK_TYPE_GDK_EVENT);
gtk_object_class_add_signals (object_class, tips_query_signals, SIGNAL_LAST);
+ object_class->set_arg = gtk_tips_query_set_arg;
+ object_class->get_arg = gtk_tips_query_get_arg;
object_class->destroy = gtk_tips_query_destroy;
+
widget_class->event = gtk_tips_query_event;
class->start_query = gtk_tips_query_real_start_query;
}
static void
-gtk_tips_query_set_arg (GtkTipsQuery *tips_query,
+gtk_tips_query_set_arg (GtkObject *object,
GtkArg *arg,
guint arg_id)
{
+ GtkTipsQuery *tips_query;
+
+ tips_query = GTK_TIPS_QUERY (object);
+
switch (arg_id)
{
case ARG_EMIT_ALWAYS:
gtk_tips_query_set_labels (tips_query, tips_query->label_inactive, GTK_VALUE_STRING (*arg));
break;
default:
- arg->type = GTK_TYPE_INVALID;
break;
}
}
static void
-gtk_tips_query_get_arg (GtkTipsQuery *tips_query,
- GtkArg *arg,
+gtk_tips_query_get_arg (GtkObject *object,
+ GtkArg *arg,
guint arg_id)
{
+ GtkTipsQuery *tips_query;
+
+ tips_query = GTK_TIPS_QUERY (object);
+
switch (arg_id)
{
case ARG_EMIT_ALWAYS:
projects / ~andy / gtk / blobdiff