Mercurial > projects > dwt-linux
diff dwt/internal/gtk/OS.d @ 73:1f0d924801f4
GTK function arguments to void*, so much less casts will be needed and more lines will pass without edit
| author | Frank Benoit <benoit@tionex.de> |
|---|---|
| date | Tue, 15 Jan 2008 08:28:52 +0100 |
| parents | 295b29fc7d13 |
| children | d014d6f9eeab |
line wrap: on
line diff
--- a/dwt/internal/gtk/OS.d Tue Jan 15 07:20:20 2008 +0100 +++ b/dwt/internal/gtk/OS.d Tue Jan 15 08:28:52 2008 +0100 @@ -1,4 +1,4 @@ -/******************************************************************************* +/******************************************************************************* * Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved. * The contents of this file are made available under the terms * of the GNU Lesser General Public License (LGPL) Version 2.1 that @@ -211,15 +211,15 @@ g_signal_emit_by_name( instance, detailed_signal, value1, value2, value3 ); } -private void gtk_list_store_set1(GtkListStore * store , GtkTreeIter * iter, int column, void* value ){ - gtk_list_store_set( store, iter, column, value, -1 ); +private void gtk_list_store_set1(void* store , void* iter, int column, void* value ){ + gtk_list_store_set( cast(GtkListStore *)store, cast(GtkTreeIter *)iter, column, value, -1 ); } -private void gtk_tree_model_get1(GtkTreeModel * store , GtkTreeIter * iter, int column, void** value ){ - gtk_tree_model_get( store, iter, column, value, -1 ); +private void gtk_tree_model_get1(void* store , void* iter, int column, void** value ){ + gtk_tree_model_get( cast(GtkTreeModel*) store, cast(GtkTreeIter *)iter, column, value, -1 ); } -private void gtk_cell_layout_set_attributes1( GtkCellLayout *cell_layout, GtkCellRenderer *cell, void* key, void* value ){ - gtk_cell_layout_set_attributes( cell_layout, cell, key, value, null ); +private void gtk_cell_layout_set_attributes1( void *cell_layout, void* cell, void* key, void* value ){ + gtk_cell_layout_set_attributes( cast(GtkCellLayout *)cell_layout, cast(GtkCellRenderer*)cell, key, value, null ); } // for linux always true, the other possibility would be GDK_WINDOWING_WIN32 @@ -1841,46 +1841,46 @@ (cast(GtkScrolledWindowClass*) ((cast(GTypeInstance*) arg0).g_class)).scrollbar_spacing : 3) ; } - static int GTK_WIDGET_HEIGHT( GtkWidget* arg0 ) - { return arg0.allocation.height; } - static void GTK_WIDGET_SET_HEIGHT( GtkWidget* arg0, int arg1) - { arg0.allocation.height = arg1; } - static int GTK_WIDGET_WIDTH( GtkWidget* arg0) - { return arg0.allocation.width; } - static void GTK_WIDGET_SET_WIDTH( GtkWidget* arg0, int arg1) - { arg0.allocation.width = arg1; } - static GdkWindow* GTK_WIDGET_WINDOW( GtkWidget* arg0) - { return arg0.window; } - static int GTK_WIDGET_X( GtkWidget* arg0 ) - { return arg0.allocation.x; } - static void GTK_WIDGET_SET_X( GtkWidget* arg0, int arg1) - { arg0.allocation.x = arg1; } - static int GTK_WIDGET_Y( GtkWidget* arg0 ) - { return arg0.allocation.y; } - static void GTK_WIDGET_SET_Y( GtkWidget* arg0, int arg1) - { arg0.allocation.y = arg1; } - static int GTK_WIDGET_REQUISITION_WIDTH( GtkWidget* arg0 ) - { return arg0.requisition.width; } - static int GTK_WIDGET_REQUISITION_HEIGHT( GtkWidget* arg0 ) - { return arg0.requisition.height; } + static int GTK_WIDGET_HEIGHT( void* arg0 ) + { return (cast(GtkWidget*)arg0).allocation.height; } + static void GTK_WIDGET_SET_HEIGHT( void* arg0, int arg1) + { (cast(GtkWidget*)arg0).allocation.height = arg1; } + static int GTK_WIDGET_WIDTH( void* arg0) + { return (cast(GtkWidget*)arg0).allocation.width; } + static void GTK_WIDGET_SET_WIDTH( void* arg0, int arg1) + { (cast(GtkWidget*)arg0).allocation.width = arg1; } + static GdkWindow* GTK_WIDGET_WINDOW( void* arg0) + { return (cast(GtkWidget*)arg0).window; } + static int GTK_WIDGET_X( void* arg0 ) + { return (cast(GtkWidget*)arg0).allocation.x; } + static void GTK_WIDGET_SET_X( void* arg0, int arg1) + { (cast(GtkWidget*)arg0).allocation.x = arg1; } + static int GTK_WIDGET_Y( void* arg0 ) + { return (cast(GtkWidget*)arg0).allocation.y; } + static void GTK_WIDGET_SET_Y( void* arg0, int arg1) + { (cast(GtkWidget*)arg0).allocation.y = arg1; } + static int GTK_WIDGET_REQUISITION_WIDTH( void* arg0 ) + { return (cast(GtkWidget*)arg0).requisition.width; } + static int GTK_WIDGET_REQUISITION_HEIGHT( void* arg0 ) + { return (cast(GtkWidget*)arg0).requisition.height; } - static GtkIMContext* GTK_ENTRY_IM_CONTEXT( GtkEntry* arg0 ) - { return arg0.im_context; } + static GtkIMContext* GTK_ENTRY_IM_CONTEXT( void* arg0 ) + { return (cast(GtkEntry*)arg0).im_context; } - static GtkIMContext* GTK_TEXTVIEW_IM_CONTEXT( GtkTextView* arg0) - { return arg0.im_context; } + static GtkIMContext* GTK_TEXTVIEW_IM_CONTEXT( void* arg0) + { return (cast(GtkTextView*)arg0).im_context; } - static GtkWidget* GTK_TOOLTIPS_TIP_WINDOW( GtkTooltips* arg0) - { return arg0.tip_window; } - static void GTK_TOOLTIPS_SET_ACTIVE( GtkTooltips* arg0, GtkTooltipsData* arg1 ) - { arg0.active_tips_data = arg1; } + static GtkWidget* GTK_TOOLTIPS_TIP_WINDOW( void* arg0) + { return (cast(GtkTooltips*)arg0).tip_window; } + static void GTK_TOOLTIPS_SET_ACTIVE( void* arg0, void* arg1 ) + { (cast(GtkTooltips*)arg0).active_tips_data = cast(GtkTooltipsData*)arg1; } - static int GDK_EVENT_TYPE( GdkEvent* arg0 ) - { return arg0.type; } - static GdkWindow* GDK_EVENT_WINDOW( GdkEventAny* arg0 ) - { return arg0.window; } - static int X_EVENT_TYPE( XEvent* arg0 ) - { return arg0.type; } + static int GDK_EVENT_TYPE( void* arg0 ) + { return (cast(GdkEvent*)arg0).type; } + static GdkWindow* GDK_EVENT_WINDOW( void* arg0 ) + { return (cast(GdkEventAny*)arg0).window; } + static int X_EVENT_TYPE( void* arg0 ) + { return (cast(XEvent*)arg0).type; } //Window X_EVENT_WINDOW( XAnyEvent* arg0 ) // { return arg0.window; } @@ -2157,95 +2157,95 @@ return gtk_widget_get_type (); } - static uint GTK_WIDGET_FLAGS( GtkWidget* arg0 ) + static uint GTK_WIDGET_FLAGS( void* arg0 ) { lock.lock(); scope(exit) lock.unlock(); return (cast(GtkObject*) g_type_check_instance_cast (cast(GTypeInstance*) arg0, gtk_object_get_type ())).flags ; } - static ubyte GTK_WIDGET_STATE( GtkWidget* arg0 ) + static ubyte GTK_WIDGET_STATE( void* arg0 ) { lock.lock(); scope(exit) lock.unlock(); return ( cast(GtkWidget*) g_type_check_instance_cast (cast(GTypeInstance*)arg0, gtk_widget_get_type ())).state; } - static bool GTK_WIDGET_HAS_DEFAULT( GtkWidget* arg0 ) + static bool GTK_WIDGET_HAS_DEFAULT( void* arg0 ) { lock.lock(); scope(exit) lock.unlock(); return ( ( ( cast(GtkObject*) g_type_check_instance_cast (cast(GTypeInstance*)arg0, gtk_object_get_type () )).flags & GtkWidgetFlags.GTK_HAS_DEFAULT) != 0) ; } - static bool GTK_WIDGET_HAS_FOCUS( GtkWidget* arg0 ) + static bool GTK_WIDGET_HAS_FOCUS( void* arg0 ) { lock.lock(); scope(exit) lock.unlock(); return ( ( ( cast(GtkObject*) g_type_check_instance_cast (cast(GTypeInstance*)arg0, gtk_object_get_type () )).flags & GtkWidgetFlags.GTK_HAS_FOCUS) != 0) ; } - static bool GTK_WIDGET_IS_SENSITIVE( GtkWidget* arg0 ) + static bool GTK_WIDGET_IS_SENSITIVE( void* arg0 ) { lock.lock(); scope(exit) lock.unlock(); return ( ( ( cast (GtkObject*) g_type_check_instance_cast ( cast(GTypeInstance*)arg0, gtk_object_get_type ()) ).flags & GtkWidgetFlags.GTK_SENSITIVE) != 0) && ( ( ( cast(GtkObject*) g_type_check_instance_cast ( cast(GTypeInstance*)arg0, gtk_object_get_type ()) ).flags & GtkWidgetFlags.GTK_PARENT_SENSITIVE) != 0); } - static bool GTK_WIDGET_MAPPED( GtkWidget* arg0 ) + static bool GTK_WIDGET_MAPPED( void* arg0 ) { lock.lock(); scope(exit) lock.unlock(); return ( ( ( cast(GtkObject*) g_type_check_instance_cast (cast(GTypeInstance*)arg0, gtk_object_get_type () )).flags & GtkWidgetFlags.GTK_MAPPED) != 0) ; } - static bool GTK_WIDGET_SENSITIVE( GtkWidget* arg0 ) + static bool GTK_WIDGET_SENSITIVE( void* arg0 ) { lock.lock(); scope(exit) lock.unlock(); return ( ( ( cast(GtkObject*) g_type_check_instance_cast (cast(GTypeInstance*)arg0, gtk_object_get_type () )).flags & GTK_SENSITIVE) != 0) ; } - static void GTK_WIDGET_SET_FLAGS( GtkWidget* arg0, uint arg1 ) + static void GTK_WIDGET_SET_FLAGS( void* arg0, uint arg1 ) { lock.lock(); scope(exit) lock.unlock(); (cast(GtkObject*) g_type_check_instance_cast ( cast(GTypeInstance*)arg0, gtk_object_get_type () ) ).flags |= arg1; } - static void GTK_WIDGET_UNSET_FLAGS( GtkWidget* arg0, uint arg1 ) + static void GTK_WIDGET_UNSET_FLAGS( void* arg0, uint arg1 ) { lock.lock(); scope(exit) lock.unlock(); (cast(GtkObject*) g_type_check_instance_cast ( cast(GTypeInstance*)arg0, gtk_object_get_type () ) ).flags &= ~arg1; } - static bool GTK_WIDGET_VISIBLE( GtkWidget* arg0 ) + static bool GTK_WIDGET_VISIBLE( void* arg0 ) { lock.lock(); scope(exit) lock.unlock(); return ( ( ( cast(GtkObject*) g_type_check_instance_cast (cast(GTypeInstance*)arg0, gtk_object_get_type () )).flags & GTK_VISIBLE) != 0) ; } - static GObjectClass* G_OBJECT_CLASS( GTypeClass* arg0 ) + static GObjectClass* G_OBJECT_CLASS( void* arg0 ) { lock.lock(); scope(exit) lock.unlock(); - return (cast(GObjectClass*) g_type_check_class_cast ( arg0, cast(GType) (20 << 2) ) ) ; + return (cast(GObjectClass*) g_type_check_class_cast ( cast(GTypeClass*)arg0, cast(GType) (20 << 2) ) ) ; } - static GObjectClass* G_OBJECT_GET_CLASS( GTypeInstance* arg0 ) + static GObjectClass* G_OBJECT_GET_CLASS( void* arg0 ) { lock.lock(); scope(exit) lock.unlock(); - return (cast(GObjectClass*) arg0.g_class) ; + return (cast(GObjectClass*) (cast(GTypeInstance*)arg0).g_class) ; } - static gchar* G_OBJECT_TYPE_NAME( GTypeInstance* arg0 ) + static gchar* G_OBJECT_TYPE_NAME( void* arg0 ) { lock.lock(); scope(exit) lock.unlock(); - return g_type_name( (cast(GTypeClass*) arg0.g_class).g_type ) ; + return g_type_name( (cast(GTypeClass*) (cast(GTypeInstance*)arg0).g_class).g_type ) ; } static GType G_TYPE_BOOLEAN()