Changeset 213:37c3b9aefbb8

Timestamp:

04/06/08 16:21:28 (5 months ago)

Author:

Frank Benoit <benoit@tionex.de>

branch:

default

Message:

Fix: segv on table columns with alignment

Files:

• dwt/internal/gtk/OS.d (modified) (2 diffs)
• dwt/widgets/Table.d (modified) (1 diff)

dwt/internal/gtk/OS.d

@@ -528 +528 @@
-    g_object_get( obj, firstPropertyName, res, null );
-}
+
-private void g_object_set1( void* obj, char* firstPropertyName, int value ){
+    g_object_set( obj, firstPropertyName, value, null );
+}
+
+private void g_object_set1_float( void* obj, char* firstPropertyName, float value ){
-    g_object_set( obj, firstPropertyName, value, null );
-}
@@ -1260 +1265 @@
-    mixin ForwardGtkOsCFunc!(.g_object_ref);
-    mixin ForwardGtkOsCFunc!(.g_object_set1);
+    mixin ForwardGtkOsCFunc!(.g_object_set1_float);
-    mixin ForwardGtkOsCFunc!(.g_object_set_qdata);
-    mixin ForwardGtkOsCFunc!(.g_object_unref);

dwt/widgets/Table.d

@@ -809 +809 @@
-    /* Set alignment */
-    if ((columnStyle & DWT.RIGHT) !is 0) {
-(textRenderer, OS.xalign.ptr, cast(int)cast(void*)1f
+_float(textRenderer, OS.xalign.ptr, 1.0f 
-        OS.gtk_tree_view_column_pack_end (columnHandle, textRenderer, true);
-        OS.gtk_tree_view_column_pack_end (columnHandle, pixbufRenderer, false);
-        OS.gtk_tree_view_column_set_alignment (columnHandle, 1f);
-    } else if ((columnStyle & DWT.CENTER) !is 0) {
-(textRenderer, OS.xalign.ptr, cast(int)cast(void*)0.5f
+_float(textRenderer, OS.xalign.ptr, 0.5f 
-        OS.gtk_tree_view_column_pack_start (columnHandle, pixbufRenderer, false);
-        OS.gtk_tree_view_column_pack_end (columnHandle, textRenderer, true);