--- a/dwt/widgets/ExpandItem.d	Mon May 12 15:36:37 2008 +0200
+++ b/dwt/widgets/ExpandItem.d	Mon May 12 19:13:01 2008 +0200
@@ -290,8 +290,7 @@
 public int getHeaderHeight () {
     checkWidget ();
     if (OS.GTK_VERSION >= OS.buildVERSION (2, 4, 0)) {
-        auto widget = OS.gtk_expander_get_label_widget (handle);
-        return OS.GTK_WIDGET_HEIGHT (widget);
+        return OS.GTK_WIDGET_HEIGHT (handle) - (expanded ? height : 0);
     }
     return Math.max (parent.getBandHeight (), imageHeight);
 }
@@ -596,6 +595,14 @@
     }
 }
 
+void setOrientation() {
+    super.setOrientation ();
+    if ((parent.style & DWT.RIGHT_TO_LEFT) !is 0) {
+        OS.gtk_widget_set_direction (handle, OS.GTK_TEXT_DIR_RTL);
+        display.doSetDirectionProc(handle, OS.GTK_TEXT_DIR_RTL);
+    }
+}
+
 public override void setText (String string) {
     super.setText (string);
     if (OS.GTK_VERSION >= OS.buildVERSION (2, 4, 0)) {