6 files changed, 62 insertions, 16 deletions

diff --git a/src/libui_sdl/libui/ui.h b/src/libui_sdl/libui/ui.h
index e5a866d..1af8f59 100644
--- a/src/libui_sdl/libui/ui.h
+++ b/src/libui_sdl/libui/ui.h
@@ -76,6 +76,8 @@ struct uiControl {
 	void (*SetMinSize)(uiControl*, int, int);
 
 	int MinWidth, MinHeight;
+
+	void* UserData;
 };
 // TOOD add argument names to all arguments
 #define uiControl(this) ((uiControl *) (this))
diff --git a/src/libui_sdl/libui/unix/area.c b/src/libui_sdl/libui/unix/area.c
index ea31676..2da9bab 100644
--- a/src/libui_sdl/libui/unix/area.c
+++ b/src/libui_sdl/libui/unix/area.c
@@ -77,6 +77,10 @@ static void areaWidget_init(areaWidget *aw)
 
 static void areaWidget_dispose(GObject *obj)
 {
+    // remove any draw order that might still be pending
+    areaWidget *aw = areaWidget(obj);
+	while (g_idle_remove_by_data(aw->a));
+    
 	G_OBJECT_CLASS(areaWidget_parent_class)->dispose(obj);
 }
 
@@ -519,16 +523,26 @@ char* uiKeyName(int scancode)
 {
     scancode = scancode_normal2unix(scancode);
     
+    char* ret;
     guint* keyvals; int num;
-    GdkKeymap* keymap = gdk_keymap_get_default();
-    gdk_keymap_get_entries_for_keycode(keymap, scancode, NULL, &keyvals, &num);
-    
-    // TODO: pick smarter??
-    int keyval = keyvals[0];
-    
-    g_free(keyvals);
+    GdkKeymap* keymap = gdk_keymap_get_for_display(gdk_display_get_default());
+    if (gdk_keymap_get_entries_for_keycode(keymap, scancode, NULL, &keyvals, &num))
+    {
+        // TODO: pick smarter??
+        int keyval = keyvals[0];
+        
+        g_free(keyvals);
+        
+        ret = gdk_keyval_name(keyval);
+    }
+    else
+    {
+        char tmp[16];
+        sprintf(tmp, "#%03X", scancode);
+        ret = tmp;
+    }
     
-    return uiUnixStrdupText(gdk_keyval_name(keyval));
+    return uiUnixStrdupText(ret);
 }
 
 enum {
diff --git a/src/libui_sdl/libui/unix/menu.c b/src/libui_sdl/libui/unix/menu.c
index d6aa398..d641426 100644
--- a/src/libui_sdl/libui/unix/menu.c
+++ b/src/libui_sdl/libui/unix/menu.c
@@ -305,13 +305,13 @@ static void appendMenuItem(GtkMenuShell *submenu, uiMenuItem *item, uiWindow *w)
 	{
 	    int j;
 	    uiMenu* m;
-	    GtkWidget *submenu;
+	    GtkWidget *c_submenu;
 	    
 	    m = item->popupchild;
-		submenu = gtk_menu_new();
-		gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu);
+		c_submenu = gtk_menu_new();
+		gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), c_submenu);
 		for (j = 0; j < m->items->len; j++)
-			appendMenuItem(GTK_MENU_SHELL(submenu), g_array_index(m->items, uiMenuItem *, j), w);
+			appendMenuItem(GTK_MENU_SHELL(c_submenu), g_array_index(m->items, uiMenuItem *, j), w);
 	}
 }
 
@@ -347,6 +347,7 @@ GtkWidget *makeMenubar(uiWindow *w)
 struct freeMenuItemData {
 	GArray *items;
 	guint i;
+	guint* parent_i;
 };
 
 static void freeMenu(GtkWidget *widget, gpointer data);
@@ -359,7 +360,7 @@ static void freeMenuItem(GtkWidget *widget, gpointer data)
 
 	item = g_array_index(fmi->items, uiMenuItem *, fmi->i);
 	if (item->popupchild != NULL)
-	    freeMenu(widget, &item->popupchild->id);
+	    freeMenu(widget, fmi->parent_i);//&item->popupchild->id);
 	w = (struct menuItemWindow *) g_hash_table_lookup(item->windows, widget);
 	if (g_hash_table_remove(item->windows, widget) == FALSE)
 		implbug("GtkMenuItem %p not in menu item's item/window map", widget);
@@ -374,14 +375,16 @@ static void freeMenu(GtkWidget *widget, gpointer data)
 	GtkMenuItem *item;
 	GtkWidget *submenu;
 	struct freeMenuItemData fmi;
-
+    
 	m = g_array_index(menus, uiMenu *, *i);
 	item = GTK_MENU_ITEM(widget);
 	submenu = gtk_menu_item_get_submenu(item);
 	fmi.items = m->items;
 	fmi.i = 0;
-	gtk_container_foreach(GTK_CONTAINER(submenu), freeMenuItem, &fmi);
 	(*i)++;
+	fmi.parent_i = i;
+	gtk_container_foreach(GTK_CONTAINER(submenu), freeMenuItem, &fmi);
+	//(*i)++;
 }
 
 void freeMenubar(GtkWidget *mb)
diff --git a/src/libui_sdl/libui/unix/stddialogs.c b/src/libui_sdl/libui/unix/stddialogs.c
index b793d06..d2b89b9 100644
--- a/src/libui_sdl/libui/unix/stddialogs.c
+++ b/src/libui_sdl/libui/unix/stddialogs.c
@@ -70,6 +70,9 @@ static char *filedialog(GtkWindow *parent, GtkFileChooserAction mode, const gcha
 	gtk_file_chooser_set_show_hidden(fc, TRUE);
 	gtk_file_chooser_set_do_overwrite_confirmation(fc, TRUE);
 	gtk_file_chooser_set_create_folders(fc, TRUE);
+	if (initpath && strlen(initpath)>0) 
+	    gtk_file_chooser_set_current_folder(fc, initpath);
+	
 	response = gtk_dialog_run(GTK_DIALOG(fcd));
 	if (response != GTK_RESPONSE_ACCEPT) {
 		gtk_widget_destroy(fcd);
diff --git a/src/libui_sdl/libui/unix/window.c b/src/libui_sdl/libui/unix/window.c
index a3dde76..04630bc 100644
--- a/src/libui_sdl/libui/unix/window.c
+++ b/src/libui_sdl/libui/unix/window.c
@@ -145,11 +145,16 @@ static void uiWindowShow(uiControl *c)
 	gtk_window_resize(w->window, width, height);
 }
 
+static void uiWindowSetFocus(uiControl* c)
+{
+    gtk_window_present(GTK_WINDOW(uiWindow(c)->widget));
+}
+
 uiUnixControlDefaultHide(uiWindow)
 uiUnixControlDefaultEnabled(uiWindow)
 uiUnixControlDefaultEnable(uiWindow)
 uiUnixControlDefaultDisable(uiWindow)
-uiUnixControlDefaultSetFocus(uiWindow)
+//uiUnixControlDefaultSetFocus(uiWindow)
 uiUnixControlDefaultSetMinSize(uiWindow)
 // TODO?
 uiUnixControlDefaultSetContainer(uiWindow)
diff --git a/src/libui_sdl/libui/windows/button.cpp b/src/libui_sdl/libui/windows/button.cpp
index b83d6ec..aa34bfc 100644
--- a/src/libui_sdl/libui/windows/button.cpp
+++ b/src/libui_sdl/libui/windows/button.cpp
@@ -6,6 +6,9 @@ struct uiButton {
 	HWND hwnd;
 	void (*onClicked)(uiButton *, void *);
 	void *onClickedData;
+
+	SIZE idealSize;
+	int idealSizeCached;
 };
 
 static BOOL onWM_COMMAND(uiControl *c, HWND hwnd, WORD code, LRESULT *lResult)
@@ -41,6 +44,13 @@ static void uiButtonMinimumSize(uiWindowsControl *c, int *width, int *height)
 	uiWindowsSizing sizing;
 	int y;
 
+	if (b->idealSizeCached)
+    {
+        *width = b->idealSize.cx;
+        *height = b->idealSize.cy;
+        return;
+    }
+
 	// try the comctl32 version 6 way
 	size.cx = 0;		// explicitly ask for ideal size
 	size.cy = 0;
@@ -48,6 +58,9 @@ static void uiButtonMinimumSize(uiWindowsControl *c, int *width, int *height)
 		*width = size.cx;
 		if (*width < buttonMinWidth) *width = buttonMinWidth;
 		*height = size.cy;
+		b->idealSize.cx = *width;
+		b->idealSize.cy = *height;
+		b->idealSizeCached = true;
 		return;
 	}
 
@@ -60,6 +73,9 @@ static void uiButtonMinimumSize(uiWindowsControl *c, int *width, int *height)
 	uiWindowsGetSizing(b->hwnd, &sizing);
 	uiWindowsSizingDlgUnitsToPixels(&sizing, NULL, &y);
 	*height = y;
+	b->idealSize.cx = *width;
+    b->idealSize.cy = *height;
+    b->idealSizeCached = true;
 }
 
 static void defaultOnClicked(uiButton *b, void *data)
@@ -75,6 +91,7 @@ char *uiButtonText(uiButton *b)
 void uiButtonSetText(uiButton *b, const char *text)
 {
 	uiWindowsSetWindowText(b->hwnd, text);
+	b->idealSizeCached = 0;
 	// changing the text might necessitate a change in the button's size
 	uiWindowsControlMinimumSizeChanged(uiWindowsControl(b));
 }
@@ -103,5 +120,7 @@ uiButton *uiNewButton(const char *text)
 	uiWindowsRegisterWM_COMMANDHandler(b->hwnd, onWM_COMMAND, uiControl(b));
 	uiButtonOnClicked(b, defaultOnClicked, NULL);
 
+	b->idealSizeCached = 0;
+
 	return b;
 }