GtkDialog

4 files changed, 130 insertions, 56 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/library/structs.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/library/structs.c
index db094ff932..ef5f8815f6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/library/structs.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/library/structs.c
@@ -43,6 +43,7 @@ GtkMenuShell_FID_CACHE GtkMenuShellFc;
 GtkMenuItem_FID_CACHE GtkMenuItemFc;
 GtkCheckMenuItem_FID_CACHE GtkCheckMenuItemFc;
 GtkWindow_FID_CACHE GtkWindowFc;
+GtkDialog_FID_CACHE GtkDialogFc;
 GtkColorSelectionDialog_FID_CACHE GtkColorSelectionDialogFc;\
 GtkBox_FID_CACHE GtkBoxFc;
 GtkHBox_FID_CACHE GtkHBoxFc;
@@ -884,6 +885,19 @@ void cacheGtkWindowFids(JNIEnv *env, jobject lpGtkWindow, PGtkWindow_FID_CACHE l
 	lpCache->cached = 1;
 };
 
+void cacheGtkDialogFids(JNIEnv *env, jobject lpGtkDialog, PGtkDialog_FID_CACHE lpCache)
+{
+	DECL_GLOB(pGlob)
+	if (lpCache->cached) return;
+
+	lpCache->GtkDialogClass = (*env)->GetObjectClass(env, lpGtkDialog);
+	cacheGtkWindowFids(env, lpGtkDialog, &PGLOB(GtkWindowFc));
+	lpCache->vbox = (*env)->GetFieldID(env, lpCache->GtkDialogClass, "vbox", "I");
+	lpCache->action_area = (*env)->GetFieldID(env, lpCache->GtkDialogClass, "action_area", "I");
+
+	lpCache->cached = 1;
+};
+
 void cacheGtkCheckMenuItemFids(JNIEnv *env, jobject lpGtkCheckMenuItem, PGtkCheckMenuItem_FID_CACHE lpCache)
 {
 	DECL_GLOB(pGlob)
@@ -2416,6 +2430,22 @@ void setGtkWindowFields(JNIEnv *env, jobject lpObject, GtkWindow *lpGtkWindow, G
 	(*env)->SetIntField(env, lpObject, lpGtkWindowFc->modal, (jint)lpGtkWindow->modal);
 }
 
+void getGtkDialogFields(JNIEnv *env, jobject lpObject, GtkDialog *lpGtkDialog, GtkDialog_FID_CACHE *lpGtkDialogFc)
+{
+	DECL_GLOB(pGlob)
+	getGtkWindowFields(env, lpObject, &lpGtkDialog->window, &PGLOB(GtkWindowFc));
+	lpGtkDialog->vbox =        (*env)->GetIntField(env, lpObject, lpGtkDialogFc->vbox);
+	lpGtkDialog->action_area = (*env)->GetIntField(env, lpObject, lpGtkDialogFc->action_area);
+}
+
+void setGtkDialogFields(JNIEnv *env, jobject lpObject, GtkDialog *lpGtkDialog, GtkDialog_FID_CACHE *lpGtkDialogFc)
+{
+	DECL_GLOB(pGlob)
+	setGtkWindowFields(env, lpObject, &lpGtkDialog->window, &PGLOB(GtkWindowFc));
+	(*env)->SetIntField(env, lpObject, lpGtkDialogFc->vbox, (jint)lpGtkDialog->vbox);
+	(*env)->SetIntField(env, lpObject, lpGtkDialogFc->action_area, (jint)lpGtkDialog->action_area);
+}
+
 void getGtkMenuFields(JNIEnv *env, jobject lpObject, GtkMenu *lpGtkMenu, GtkMenu_FID_CACHE *lpGtkMenuFc)
 {
 	DECL_GLOB(pGlob)
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/library/structs.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/library/structs.h
index 605c117fc0..c746b0d630 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/library/structs.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/library/structs.h
@@ -38,7 +38,7 @@
 /* ----------- fid cache structures  ----------- */
 
 typedef struct GdkColor_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GdkColorClass;
 	jfieldID pixel, red, green, blue;
 } GdkColor_FID_CACHE;
@@ -46,7 +46,7 @@ typedef struct GdkColor_FID_CACHE {
 typedef GdkColor_FID_CACHE *PGdkColor_FID_CACHE;
 
 typedef struct GdkEventKey_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GdkEventKeyClass;
 	jfieldID type, window, send_event, time, state, keyval, length, string;
 } GdkEventKey_FID_CACHE;
@@ -54,7 +54,7 @@ typedef struct GdkEventKey_FID_CACHE {
 typedef GdkEventKey_FID_CACHE *PGdkEventKey_FID_CACHE;
 
 typedef struct GdkEventButton_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GdkEventButtonClass;
 	jfieldID type, window, send_event, time, x, y, pressure, xtilt, ytilt, state, button, source, deviceid, x_root, y_root;
 } GdkEventButton_FID_CACHE;
@@ -62,7 +62,7 @@ typedef struct GdkEventButton_FID_CACHE {
 typedef GdkEventButton_FID_CACHE *PGdkEventButton_FID_CACHE;
 
 typedef struct GdkEventMotion_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GdkEventMotionClass;
 	jfieldID type, window, send_event, time, x, y, pressure, xtilt, ytilt, state, is_hint, source, deviceid, x_root, y_root;
 } GdkEventMotion_FID_CACHE;
@@ -70,7 +70,7 @@ typedef struct GdkEventMotion_FID_CACHE {
 typedef GdkEventMotion_FID_CACHE *PGdkEventMotion_FID_CACHE;
 
 typedef struct GdkEventExpose_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GdkEventExposeClass;
 	jfieldID type, window, send_event, x, y, width, height, count;
 } GdkEventExpose_FID_CACHE;
@@ -78,7 +78,7 @@ typedef struct GdkEventExpose_FID_CACHE {
 typedef GdkEventExpose_FID_CACHE *PGdkEventExpose_FID_CACHE;
 
 typedef struct GdkFont_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GdkFontClass;
 	jfieldID type, ascent, descent;
 } GdkFont_FID_CACHE;
@@ -86,7 +86,7 @@ typedef struct GdkFont_FID_CACHE {
 typedef GdkFont_FID_CACHE *PGdkFont_FID_CACHE;
 
 typedef struct GdkGCValues_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GdkGCValuesClass;
 	jfieldID foreground_pixel, foreground_red, foreground_green, foreground_blue, background_pixel, background_red, background_green, background_blue, font, function, fill, tile, stipple, clip_mask, subwindow_mode, ts_x_origin, ts_y_origin, clip_x_origin, clip_y_origin, graphics_exposures, line_width, line_style, cap_style, join_style;
 } GdkGCValues_FID_CACHE;
@@ -94,7 +94,7 @@ typedef struct GdkGCValues_FID_CACHE {
 typedef GdkGCValues_FID_CACHE *PGdkGCValues_FID_CACHE;
 
 typedef struct GdkImage_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GdkImageClass;
 	jfieldID type, visual, byte_order, width, height, depth, bpp, bpl, mem;
 } GdkImage_FID_CACHE;
@@ -102,7 +102,7 @@ typedef struct GdkImage_FID_CACHE {
 typedef GdkImage_FID_CACHE *PGdkImage_FID_CACHE;
 
 typedef struct GdkPoint_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GdkPointClass;
 	jfieldID x, y;
 } GdkPoint_FID_CACHE;
@@ -110,7 +110,7 @@ typedef struct GdkPoint_FID_CACHE {
 typedef GdkPoint_FID_CACHE *PGdkPoint_FID_CACHE;
 
 typedef struct GdkRectangle_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GdkRectangleClass;
 	jfieldID x, y, width, height;
 } GdkRectangle_FID_CACHE;
@@ -118,7 +118,7 @@ typedef struct GdkRectangle_FID_CACHE {
 typedef GdkRectangle_FID_CACHE *PGdkRectangle_FID_CACHE;
 
 typedef struct GdkVisual_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GdkVisualClass;
 	jfieldID type, depth, byte_order, colormap_size, bits_per_rgb, red_mask, red_shift, red_prec, green_mask, green_shift, green_prec, blue_mask, blue_shift, blue_prec;
 } GdkVisual_FID_CACHE;
@@ -126,7 +126,7 @@ typedef struct GdkVisual_FID_CACHE {
 typedef GdkVisual_FID_CACHE *PGdkVisual_FID_CACHE;
 
 typedef struct GtkObject_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GtkObjectClass;
 	jfieldID klass, flags, ref_count, object_data;
 } GtkObject_FID_CACHE;
@@ -134,14 +134,14 @@ typedef struct GtkObject_FID_CACHE {
 typedef GtkObject_FID_CACHE *PGtkObject_FID_CACHE;
 
 typedef struct GtkData_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GtkDataClass;
 } GtkData_FID_CACHE;
 
 typedef GtkData_FID_CACHE *PGtkData_FID_CACHE;
 
 typedef struct GtkAdjustment_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GtkAdjustmentClass;
 	jfieldID lower, upper, value, step_increment, page_increment, page_size;
 } GtkAdjustment_FID_CACHE;
@@ -149,7 +149,7 @@ typedef struct GtkAdjustment_FID_CACHE {
 typedef GtkAdjustment_FID_CACHE *PGtkAdjustment_FID_CACHE;
 
 typedef struct GtkAllocation_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GtkAllocationClass;
 	jfieldID x, y, width, height;
 } GtkAllocation_FID_CACHE;
@@ -157,7 +157,7 @@ typedef struct GtkAllocation_FID_CACHE {
 typedef GtkAllocation_FID_CACHE *PGtkAllocation_FID_CACHE;
 
 typedef struct GtkWidget_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GtkWidgetClass;
 	jfieldID private_flags, state, saved_state, name, style, req_width, req_height, alloc_x, alloc_y, alloc_width, alloc_height, window, parent;
 } GtkWidget_FID_CACHE;
@@ -165,7 +165,7 @@ typedef struct GtkWidget_FID_CACHE {
 typedef GtkWidget_FID_CACHE *PGtkWidget_FID_CACHE;
 
 typedef struct GtkContainer_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GtkContainerClass;
 	jfieldID focus_child, border_width, need_resize, resize_mode, resize_widgets;
 } GtkContainer_FID_CACHE;
@@ -173,7 +173,7 @@ typedef struct GtkContainer_FID_CACHE {
 typedef GtkContainer_FID_CACHE *PGtkContainer_FID_CACHE;
 
 typedef struct GtkBin_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GtkBinClass;
 	jfieldID child;
 } GtkBin_FID_CACHE;
@@ -181,7 +181,7 @@ typedef struct GtkBin_FID_CACHE {
 typedef GtkBin_FID_CACHE *PGtkBin_FID_CACHE;
 
 typedef struct GtkFrame_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GtkFrameClass;
 	jfieldID label, shadow_type, 
 	         label_width, label_height,
@@ -207,14 +207,14 @@ typedef struct GtkMenuShell_FID_CACHE {
 typedef GtkMenuShell_FID_CACHE *PGtkMenuShell_FID_CACHE;
 
 typedef struct GtkItem_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GtkItemClass;
 } GtkItem_FID_CACHE;
 
 typedef GtkItem_FID_CACHE *PGtkItem_FID_CACHE;
 
 typedef struct GtkMenuItem_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GtkMenuItemClass;
 	jfieldID submenu, accelerator_signal, toggle_size, accelerator_width, show_toggle_indicator, show_submenu_indicator, submenu_placement, submenu_direction, right_justify, timer;
 } GtkMenuItem_FID_CACHE;
@@ -222,7 +222,7 @@ typedef struct GtkMenuItem_FID_CACHE {
 typedef GtkMenuItem_FID_CACHE *PGtkMenuItem_FID_CACHE;
 
 typedef struct GtkCheckMenuItem_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GtkCheckMenuItemClass;
 	jfieldID active, always_show_toggle;
 } GtkCheckMenuItem_FID_CACHE;
@@ -230,15 +230,23 @@ typedef struct GtkCheckMenuItem_FID_CACHE {
 typedef GtkCheckMenuItem_FID_CACHE *PGtkCheckMenuItem_FID_CACHE;
 
 typedef struct GtkWindow_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GtkWindowClass;
 	jfieldID title, wmclass_name, wmclass_class, type, focus_widget, default_widget, transient_parent, resize_count, allow_shrink, allow_grow, auto_shrink, handling_resize, position, use_uposition, modal;
 } GtkWindow_FID_CACHE;
 
 typedef GtkWindow_FID_CACHE *PGtkWindow_FID_CACHE;
 
+typedef struct GtkDialog_FID_CACHE {
+	int cached;
+	jclass GtkDialogClass;
+	jfieldID title, wmclass_name, wmclass_class, type, focus_widget, default_widget, transient_parent, resize_count, allow_shrink, allow_grow, auto_shrink, handling_resize, position, use_uposition, modal, vbox, action_area;
+} GtkDialog_FID_CACHE;
+
+typedef GtkDialog_FID_CACHE *PGtkDialog_FID_CACHE;
+
 typedef struct GtkColorSelectionDialog_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GtkColorSelectionDialogClass;
 	jfieldID colorsel, main_vbox, ok_button, reset_button, cancel_button, help_button;
 } GtkColorSelectionDialog_FID_CACHE;
@@ -246,7 +254,7 @@ typedef struct GtkColorSelectionDialog_FID_CACHE {
 typedef GtkColorSelectionDialog_FID_CACHE *PGtkColorSelectionDialog_FID_CACHE;
 
 typedef struct GtkBox_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GtkBoxClass;
 	jfieldID children, spacing, homogeneous;
 } GtkBox_FID_CACHE;
@@ -254,14 +262,14 @@ typedef struct GtkBox_FID_CACHE {
 typedef GtkBox_FID_CACHE *PGtkBox_FID_CACHE;
 
 typedef struct GtkHBox_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GtkHBoxClass;
 } GtkHBox_FID_CACHE;
 
 typedef GtkHBox_FID_CACHE *PGtkHBox_FID_CACHE;
 
 typedef struct GtkCombo_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GtkComboClass;
 	jfieldID entry, button, popup, popwin, list, entry_change_id, list_change_id, value_in_list, ok_if_empty, case_sensitive, use_arrows, use_arrows_always, current_button, activate_id;
 } GtkCombo_FID_CACHE;
@@ -269,7 +277,7 @@ typedef struct GtkCombo_FID_CACHE {
 typedef GtkCombo_FID_CACHE *PGtkCombo_FID_CACHE;
 
 typedef struct GtkFileSelection_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GtkFileSelectionClass;
 	jfieldID dir_list, file_list, selection_entry, selection_text, main_vbox, ok_button, cancel_button, help_button, history_pulldown, history_menu, history_list, fileop_dialog, fileop_entry, fileop_file, cmpl_state, fileop_c_dir, fileop_del_file, fileop_ren_file, button_area, action_area;
 } GtkFileSelection_FID_CACHE;
@@ -277,7 +285,7 @@ typedef struct GtkFileSelection_FID_CACHE {
 typedef GtkFileSelection_FID_CACHE *PGtkFileSelection_FID_CACHE;
 
 typedef struct GtkFontSelectionDialog_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GtkFontSelectionDialogClass;
 	jfieldID fontsel, main_vbox, action_area, ok_button, apply_button, cancel_button, dialog_width, auto_resize;
 } GtkFontSelectionDialog_FID_CACHE;
@@ -285,7 +293,7 @@ typedef struct GtkFontSelectionDialog_FID_CACHE {
 typedef GtkFontSelectionDialog_FID_CACHE *PGtkFontSelectionDialog_FID_CACHE;
 
 typedef struct GtkCList_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GtkCListClass;
 	jfieldID clist_flags, row_mem_chunk, cell_mem_chunk, freeze_count, internal_allocation_x, internal_allocation_y, internal_allocation_width, internal_allocation_height, rows, row_center_offset, row_height, row_list, row_list_end, columns, column_title_area_x, column_title_area_y, column_title_area_width, column_title_area_height, title_window, column, clist_window, clist_window_width, clist_window_height, hoffset, voffset, shadow_type, selection_mode, selection, selection_end, undo_selection, undo_unselection, undo_anchor, button_actions0, button_actions1, button_actions2, button_actions3, button_actions4, drag_button, click_cell_row, click_cell_column, hadjustment, vadjustment, xor_gc, fg_gc, bg_gc, cursor_drag, x_drag, focus_row, anchor, anchor_state, drag_pos, htimer, vtimer, sort_type, compare, sort_column;
 } GtkCList_FID_CACHE;
@@ -293,7 +301,7 @@ typedef struct GtkCList_FID_CACHE {
 typedef GtkCList_FID_CACHE *PGtkCList_FID_CACHE;
 
 typedef struct GtkEditable_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GtkEditableClass;
 	jfieldID current_pos, selection_start_pos, selection_end_pos, has_selection, editable, visible, ic, ic_attr, clipboard_text;
 } GtkEditable_FID_CACHE;
@@ -309,7 +317,7 @@ typedef struct GtkText_FID_CACHE {
 typedef GtkText_FID_CACHE *PGtkText_FID_CACHE;
 
 typedef struct GtkProgress_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GtkProgressClass;
 	jfieldID adjustment, offscreen_pixmap, format, x_align, y_align, show_text, activity_mode;
 } GtkProgress_FID_CACHE;
@@ -317,7 +325,7 @@ typedef struct GtkProgress_FID_CACHE {
 typedef GtkProgress_FID_CACHE *PGtkProgress_FID_CACHE;
 
 typedef struct GtkProgressBar_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GtkProgressBarClass;
 	jfieldID bar_style, orientation, blocks, in_block, activity_pos, activity_step, activity_blocks, activity_dir;
 } GtkProgressBar_FID_CACHE;
@@ -325,7 +333,7 @@ typedef struct GtkProgressBar_FID_CACHE {
 typedef GtkProgressBar_FID_CACHE *PGtkProgressBar_FID_CACHE;
 
 typedef struct GtkArg_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GtkArgClass;
 	jfieldID type, name, d0, d1, d2, d3, d4, d5, d6, d7, d8, d9, d10, d11;
 } GtkArg_FID_CACHE;
@@ -333,7 +341,7 @@ typedef struct GtkArg_FID_CACHE {
 typedef GtkArg_FID_CACHE *PGtkArg_FID_CACHE;
 
 typedef struct GtkRequisition_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GtkRequisitionClass;
 	jfieldID width, height;
 } GtkRequisition_FID_CACHE;
@@ -341,7 +349,7 @@ typedef struct GtkRequisition_FID_CACHE {
 typedef GtkRequisition_FID_CACHE *PGtkRequisition_FID_CACHE;
 
 typedef struct GtkStyle_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GtkStyleClazz;
 	jfieldID klass, fg0_pixel, fg0_red, fg0_green, fg0_blue, fg1_pixel, fg1_red, fg1_green, fg1_blue, fg2_pixel, fg2_red, fg2_green, fg2_blue, fg3_pixel, fg3_red, fg3_green, fg3_blue, fg4_pixel, fg4_red, fg4_green, fg4_blue, bg0_pixel, bg0_red, bg0_green, bg0_blue, bg1_pixel, bg1_red, bg1_green, bg1_blue, bg2_pixel, bg2_red, bg2_green, bg2_blue, bg3_pixel, bg3_red, bg3_green, bg3_blue, bg4_pixel, bg4_red, bg4_green, bg4_blue, light0_pixel, light0_red, light0_green, light0_blue, light1_pixel, light1_red, light1_green, light1_blue, light2_pixel, light2_red, light2_green, light2_blue, light3_pixel, light3_red, light3_green, light3_blue, light4_pixel, light4_red, light4_green, light4_blue, dark0_pixel, dark0_red, dark0_green, dark0_blue, dark1_pixel, dark1_red, dark1_green, dark1_blue, dark2_pixel, dark2_red, dark2_green, dark2_blue, dark3_pixel, dark3_red, dark3_green, dark3_blue, dark4_pixel, dark4_red, dark4_green, dark4_blue, mid0_pixel, mid0_red, mid0_green, mid0_blue, mid1_pixel, mid1_red, mid1_green, mid1_blue, mid2_pixel, mid2_red, mid2_green, mid2_blue, mid3_pixel, mid3_red, mid3_green, mid3_blue, mid4_pixel, mid4_red, mid4_green, mid4_blue, text0_pixel, text0_red, text0_green, text0_blue, text1_pixel, text1_red, text1_green, text1_blue, text2_pixel, text2_red, text2_green, text2_blue, text3_pixel, text3_red, text3_green, text3_blue, text4_pixel, text4_red, text4_green, text4_blue, base0_pixel, base0_red, base0_green, base0_blue, base1_pixel, base1_red, base1_green, base1_blue, base2_pixel, base2_red, base2_green, base2_blue, base3_pixel, base3_red, base3_green, base3_blue, base4_pixel, base4_red, base4_green, base4_blue, black_pixel, black_red, black_green, black_blue, white_pixel, white_red, white_green, white_blue, font, fg_gc0, fg_gc1, fg_gc2, fg_gc3, fg_gc4, bg_gc0, bg_gc1, bg_gc2, bg_gc3, bg_gc4, light_gc0, light_gc1, light_gc2, light_gc3, light_gc4, dark_gc0, dark_gc1, dark_gc2, dark_gc3, dark_gc4, mid_gc0, mid_gc1, mid_gc2, mid_gc3, mid_gc4, text_gc0, text_gc1, text_gc2, text_gc3, text_gc4, base_gc0, base_gc1, base_gc2, base_gc3, base_gc4, black_gc, white_gc, bg_pixmap0, bg_pixmap1, bg_pixmap2, bg_pixmap3, bg_pixmap4, bg_pixmap5;
 	jfieldID ref_count, attach_count, depth, colormap, engine, engine_data, rc_style, styles;
@@ -350,7 +358,7 @@ typedef struct GtkStyle_FID_CACHE {
 typedef GtkStyle_FID_CACHE *PGtkStyle_FID_CACHE;
 
 typedef struct GtkStyleClass_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GtkStyleClassClazz;
 	jfieldID xthickness, ythickness;
 } GtkStyleClass_FID_CACHE;
@@ -358,7 +366,7 @@ typedef struct GtkStyleClass_FID_CACHE {
 typedef GtkStyleClass_FID_CACHE *PGtkStyleClass_FID_CACHE;
 
 typedef struct GtkCListRow_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GtkCListRowClass;
 	jfieldID cell, state, foreground_red, foreground_green, foreground_blue, foreground_pixel, background_red, background_green, background_blue, background_pixel, style, data, destroy, fg_set, bg_set, selectable;
 } GtkCListRow_FID_CACHE;
@@ -366,7 +374,7 @@ typedef struct GtkCListRow_FID_CACHE {
 typedef GtkCListRow_FID_CACHE *PGtkCListRow_FID_CACHE;
 
 typedef struct GtkCListColumn_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GtkCListColumnClass;
 	jfieldID title, area_x, area_y, area_width, area_height, button, window, width, min_width, max_width, justification, visible, width_set, resizeable, auto_resize, button_passive;
 } GtkCListColumn_FID_CACHE;
@@ -374,7 +382,7 @@ typedef struct GtkCListColumn_FID_CACHE {
 typedef GtkCListColumn_FID_CACHE *PGtkCListColumn_FID_CACHE;
 
 typedef struct GtkCTreeRow_FID_CACHE {
-	int cached;

+	int cached;
 	jclass GtkCTreeRowClass;
 	jfieldID parent, sibling, children, pixmap_closed, mask_closed, pixmap_opened, mask_opened, level, is_leaf, expanded;
 } GtkCTreeRow_FID_CACHE;
@@ -416,6 +424,7 @@ void cacheGtkItemFids(JNIEnv *env, jobject lpGtkItem, PGtkItem_FID_CACHE lpCache
 void cacheGtkMenuItemFids(JNIEnv *env, jobject lpGtkMenuItem, PGtkMenuItem_FID_CACHE lpCache);
 void cacheGtkCheckMenuItemFids(JNIEnv *env, jobject lpGtkCheckMenuItem, PGtkCheckMenuItem_FID_CACHE lpCache);
 void cacheGtkWindowFids(JNIEnv *env, jobject lpGtkWindow, PGtkWindow_FID_CACHE lpCache);
+void cacheGtkDialogFids(JNIEnv *env, jobject lpGtkDialog, PGtkDialog_FID_CACHE lpCache);
 void cacheGtkColorSelectionDialogFids(JNIEnv *env, jobject lpGtkColorSelectionDialog, PGtkColorSelectionDialog_FID_CACHE lpCache);
 void cacheGtkFileSelectionFids(JNIEnv *env, jobject lpGtkFileSelection, PGtkFileSelection_FID_CACHE lpCache);
 void cacheGtkFontSelectionDialogFids(JNIEnv *env, jobject lpGtkFontSelectionDialog, PGtkFontSelectionDialog_FID_CACHE lpCache);
@@ -515,6 +524,8 @@ void getGtkWidgetFields(JNIEnv *env, jobject lpObject, GtkWidget *lpGtkWidget, G
 void setGtkWidgetFields(JNIEnv *env, jobject lpObject, GtkWidget *lpGtkWidget, GtkWidget_FID_CACHE *lpGtkWidgetFc);
 void getGtkWindowFields(JNIEnv *env, jobject lpObject, GtkWindow *lpGtkWindow, GtkWindow_FID_CACHE *lpGtkWindowFc);
 void setGtkWindowFields(JNIEnv *env, jobject lpObject, GtkWindow *lpGtkWindow, GtkWindow_FID_CACHE *lpGtkWindowFc);
+void getGtkDialogFields(JNIEnv *env, jobject lpObject, GtkDialog *lpGtkDialog, GtkDialog_FID_CACHE *lpGtkDialogFc);
+void setGtkDialogFields(JNIEnv *env, jobject lpObject, GtkDialog *lpGtkDialog, GtkDialog_FID_CACHE *lpGtkDialogFc);
 void getGtkCheckMenuItemFields(JNIEnv *env, jobject lpObject, GtkCheckMenuItem *lpGtkCheckMenuItem, GtkCheckMenuItem_FID_CACHE *lpGtkCheckMenuItemFc);
 void setGtkCheckMenuItemFields(JNIEnv *env, jobject lpObject, GtkCheckMenuItem *lpGtkCheckMenuItem, GtkCheckMenuItem_FID_CACHE *lpGtkCheckMenuItemFc);
 void getGtkAdjustmentFields(JNIEnv *env, jobject lpObject, GtkAdjustment *lpGtkAdjustment, GtkAdjustment_FID_CACHE *lpGtkAdjustmentFc);
@@ -543,28 +554,34 @@ extern GdkImage_FID_CACHE GdkImageFc;
 extern GdkPoint_FID_CACHE GdkPointFc;
 extern GdkRectangle_FID_CACHE GdkRectangleFc;
 extern GdkVisual_FID_CACHE GdkVisualFc;
-extern GtkObject_FID_CACHE GtkObjectFc;
-extern GtkData_FID_CACHE GtkDataFc;
+
 extern GtkAdjustment_FID_CACHE GtkAdjustmentFc;
 extern GtkAllocation_FID_CACHE GtkAllocationFc;
-extern GtkWidget_FID_CACHE GtkWidgetFc;
-extern GtkContainer_FID_CACHE GtkContainerFc;
 extern GtkBin_FID_CACHE GtkBinFc;
-extern GtkMenu_FID_CACHE GtkMenuFc;
+extern GtkCheckMenuItem_FID_CACHE GtkCheckMenuItemFc;
+extern GtkContainer_FID_CACHE GtkContainerFc;
+extern GtkCListRow_FID_CACHE GtkCListRowFc;
+extern GtkCListColumn_FID_CACHE GtkCListColumnFc;
+extern GtkCTreeRow_FID_CACHE GtkCTreeRowFc;
+extern GtkCTree_FID_CACHE GtkCTreeFc;
+extern GtkColorSelectionDialog_FID_CACHE GtkColorSelectionDialogFc;\
+extern GtkCList_FID_CACHE GtkCListFc;
+extern GtkData_FID_CACHE GtkDataFc;
+extern GtkEditable_FID_CACHE GtkEditableFc;
 extern GtkItem_FID_CACHE GtkItemFc;
+extern GtkMenu_FID_CACHE GtkMenuFc;
 extern GtkMenuShell_FID_CACHE GtkMenuShellFc;
 extern GtkMenuItem_FID_CACHE GtkMenuItemFc;
-extern GtkCheckMenuItem_FID_CACHE GtkCheckMenuItemFc;
+extern GtkObject_FID_CACHE GtkObjectFc;
+extern GtkWidget_FID_CACHE GtkWidgetFc;
 extern GtkWindow_FID_CACHE GtkWindowFc;
-extern GtkColorSelectionDialog_FID_CACHE GtkColorSelectionDialogFc;\
+extern GtkDialog_FID_CACHE GtkDialogFc;
 extern GtkBox_FID_CACHE GtkBoxFc;
 extern GtkHBox_FID_CACHE GtkHBoxFc;
 extern GtkCombo_FID_CACHE GtkComboFc;
 extern GtkFileSelection_FID_CACHE GtkFileSelectionFc;
 extern GtkFrame_FID_CACHE GtkFrameFc;
 extern GtkFontSelectionDialog_FID_CACHE GtkFontSelectionDialogFc;
-extern GtkCList_FID_CACHE GtkCListFc;
-extern GtkEditable_FID_CACHE GtkEditableFc;
 extern GtkText_FID_CACHE GtkTextFc;
 extern GtkProgress_FID_CACHE GtkProgressFc;
 extern GtkProgressBar_FID_CACHE GtkProgressBarFc;
@@ -572,9 +589,5 @@ extern GtkArg_FID_CACHE GtkArgFc;
 extern GtkRequisition_FID_CACHE GtkRequisitionFc;
 extern GtkStyle_FID_CACHE GtkStyleFc;
 extern GtkStyleClass_FID_CACHE GtkStyleClassFc;
-extern GtkCListRow_FID_CACHE GtkCListRowFc;
-extern GtkCListColumn_FID_CACHE GtkCListColumnFc;
-extern GtkCTreeRow_FID_CACHE GtkCTreeRowFc;
-extern GtkCTree_FID_CACHE GtkCTreeFc;
 
 #endif // INC_structs_H
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/library/swt.c b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/library/swt.c
index a45e933093..25640c0341 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/library/swt.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/library/swt.c
@@ -1101,7 +1101,8 @@ JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_gtk_OS_gtk_1dialog_1new
 	fprintf(stderr, "gtk_dialog_new");
 #endif
 
-	return (jint)gtk_dialog_new();
+	GtkDialog* dialog = (GtkDialog*)gtk_dialog_new();
+	return (jint)dialog;
 }
 
 /*
@@ -3155,6 +3156,16 @@ JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_gtk_OS_gtk_1widget_1show_1n
 	gtk_widget_show_now((GtkWidget*)widget);
 }
 
+JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_gtk_OS_gtk_1widget_1show_1all
+  (JNIEnv *env, jclass that, jint widget)
+{
+#ifdef DEBUG_CALL_PRINTS
+	fprintf(stderr, "gtk_widget_show_all");
+#endif
+
+	gtk_widget_show_all((GtkWidget*)widget);
+}
+
 /*
  * Class:	org_eclipse_swt_internal_gtk_OS
  * Method:	gtk_widget_hide
@@ -5850,6 +5861,23 @@ JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_gtk_OS_memmove__Lorg_eclips
 	}
 }
 
+JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_gtk_OS_memmove__Lorg_eclipse_swt_internal_gtk_GtkDialog_2II
+  (JNIEnv *env, jclass that, jobject dest, jint src, jint count)
+{
+	DECL_GLOB(pGlob)
+	GtkDialog dest_struct={0}, *dest1 = NULL;
+#ifdef DEBUG_CALL_PRINTS
+	fprintf(stderr, "memmove__Lorg_eclipse_swt_internal_gtk_GtkDialog_2II\n");
+#endif
+
+	memmove((void*)&dest_struct, (void*)src, count);
+	if (dest) {
+		dest1 = &dest_struct;
+		cacheGtkDialogFids(env, dest, &PGLOB(GtkDialogFc));
+		setGtkDialogFields(env, dest, dest1, &PGLOB(GtkDialogFc));
+	}
+}
+
 JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_gtk_OS_memmove__Lorg_eclipse_swt_internal_gtk_GtkStyleClass_2II
   (JNIEnv *env, jclass that, jobject dest, jint src, jint count)
 {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/org/eclipse/swt/internal/gtk/OS.java
index 518fcc05b6..e7f88fd64d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/org/eclipse/swt/internal/gtk/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk1x/org/eclipse/swt/internal/gtk/OS.java
@@ -552,6 +552,8 @@ static int malloc(String name) {
 	}
 	return OS.g_strdup (buffer);
 }
+
+public static final native void gtk_widget_show_all(int widget);
 public static final native void gtk_widget_show_now(int widget);
 public static final native void gtk_widget_queue_draw(int widget);
 public static final native void gtk_widget_set_style(int widget, int style);
@@ -595,8 +597,9 @@ public static final native void memmove(GtkCombo dest, int src, int size);
 public static final native void memmove(GtkContainer dest, int src, int size);
 public static final native void memmove(GtkCTreeRow dest, int src, int size);
 public static final native void memmove(GtkEditable dest, int src, int size);
-public static final native void memmove(GtkObject dest, int src, int size);
-public static final native void memmove(GtkWidget dest, int src, int size);
+public static final native void memmove(GtkDialog dest,   int src, int size);
+public static final native void memmove(GtkObject dest,   int src, int size);
+public static final native void memmove(GtkWidget dest,   int src, int size);
 public static final native void memmove(int dest, GtkAdjustment src, int size);
 public static final native void memmove(int dest, GtkBin src, int size);
 public static final native void memmove(int dest, GtkCListColumn src, int size);