From c5fa717c7d977f55c48b121829d5c995b95f6362 Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Sun, 14 Jun 2015 19:58:00 -0400
Subject: [PATCH] Some compilation fixes.

---
 redo/stubs/checkbox.c   |  1 -
 redo/unix/GNUmakeinc.mk | 12 +++++++++---
 redo/unix/checkbox.c    |  1 -
 redo/unix/combobox.c    |  6 +++---
 redo/unix/uipriv_unix.h |  2 +-
 redo/unix/window.c      |  8 ++++----
 6 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/redo/stubs/checkbox.c b/redo/stubs/checkbox.c
index ee02ccf6..6e912a19 100644
--- a/redo/stubs/checkbox.c
+++ b/redo/stubs/checkbox.c
@@ -63,7 +63,6 @@ static void checkboxSetChecked(uiCheckbox *cc, int checked)
 uiCheckbox *uiNewCheckbox(const char *text)
 {
 	struct checkbox *c;
-	WCHAR *wtext;
 
 	c = (struct checkbox *) MAKE_CONTROL_INSTANCE(uiTypeCheckbox());
 
diff --git a/redo/unix/GNUmakeinc.mk b/redo/unix/GNUmakeinc.mk
index 06e3f4df..727a1478 100644
--- a/redo/unix/GNUmakeinc.mk
+++ b/redo/unix/GNUmakeinc.mk
@@ -2,15 +2,21 @@
 
 osCFILES = \
 	unix/alloc.c \
-	unix/bin.c \
 	unix/button.c \
 	unix/checkbox.c \
-	unix/container.c \
+	unix/combobox.c \
+	unix/control.c \
+	unix/datetimepicker.c \
 	unix/entry.c \
+	unix/group.c \
 	unix/label.c \
 	unix/main.c \
 	unix/menu.c \
-	unix/newcontrol.c \
+	unix/progressbar.c \
+	unix/radiobuttons.c \
+	unix/separator.c \
+	unix/slider.c \
+	unix/spinbox.c \
 	unix/tab.c \
 	unix/text.c \
 	unix/util.c \
diff --git a/redo/unix/checkbox.c b/redo/unix/checkbox.c
index 35636f50..edd86230 100644
--- a/redo/unix/checkbox.c
+++ b/redo/unix/checkbox.c
@@ -63,7 +63,6 @@ static void checkboxSetChecked(uiCheckbox *cc, int checked)
 uiCheckbox *uiNewCheckbox(const char *text)
 {
 	struct checkbox *c;
-	WCHAR *wtext;
 
 	c = (struct checkbox *) MAKE_CONTROL_INSTANCE(uiTypeCheckbox());
 
diff --git a/redo/unix/combobox.c b/redo/unix/combobox.c
index e7999b23..f2a7defc 100644
--- a/redo/unix/combobox.c
+++ b/redo/unix/combobox.c
@@ -22,7 +22,7 @@ static void comboboxAppend(uiCombobox *cc, const char *text)
 	PUT_CODE_HERE;
 }
 
-static uiCombobox *finishNewCombobox(OSTHING OSARG)
+static uiCombobox *finishNewCombobox(GtkWidget (*newfunc)(void))
 {
 	struct combobox *c;
 
@@ -39,10 +39,10 @@ static uiCombobox *finishNewCombobox(OSTHING OSARG)
 
 uiCombobox *uiNewCombobox(void)
 {
-	return finishNewCombobox(OSARGNONEDITABLE);
+	return finishNewCombobox(gtk_combo_box_text_new);
 }
 
 uiCombobox *uiNewEditableCombobox(void)
 {
-	return finishNewCombobox(OSARGEDITABLE);
+	return finishNewCombobox(gtk_combo_box_text_new_with_entry);
 }
diff --git a/redo/unix/uipriv_unix.h b/redo/unix/uipriv_unix.h
index 2241374a..c2f90c4b 100644
--- a/redo/unix/uipriv_unix.h
+++ b/redo/unix/uipriv_unix.h
@@ -4,7 +4,7 @@
 #define GDK_VERSION_MIN_REQUIRED GDK_VERSION_3_4
 #define GDK_VERSION_MAX_ALLOWED GDK_VERSION_3_4
 #include <gtk/gtk.h>
-#include "../ui.h"
+#include "../out/ui.h"
 #include "../ui_unix.h"
 #include "../uipriv.h"
 
diff --git a/redo/unix/window.c b/redo/unix/window.c
index c88083eb..d2600a62 100644
--- a/redo/unix/window.c
+++ b/redo/unix/window.c
@@ -49,8 +49,8 @@ static void windowCommitDestroy(uiControl *c)
 	gtk_widget_hide(w->widget);
 	// now destroy the bin
 	// we need to remove the bin from its parent first
-	uiBinRemoveOSParent(w->bin);
-	uiControlDestroy(uiControl(w->bin));
+//TODO	uiBinRemoveOSParent(w->bin);
+//TODO	uiControlDestroy(uiControl(w->bin));
 	// now destroy the menus, if any
 	if (w->menubar != NULL)
 		freeMenubar(w->menubar);
@@ -171,14 +171,14 @@ uiWindow *uiNewWindow(const char *title, int width, int height, int hasMenubar)
 		gtk_container_add(w->vboxContainer, w->menubar);
 	}
 
-	w->bin = newBin();
+/*TODO	w->bin = newBin();
 	binWidget = GTK_WIDGET(uiControlHandle(uiControl(w->bin)));
 	gtk_widget_set_hexpand(binWidget, TRUE);
 	gtk_widget_set_halign(binWidget, GTK_ALIGN_FILL);
 	gtk_widget_set_vexpand(binWidget, TRUE);
 	gtk_widget_set_valign(binWidget, GTK_ALIGN_FILL);
 	uiBinSetOSParent(w->bin, (uintptr_t) (w->vboxContainer));
-
+*/
 	// show everything in the vbox, but not the GtkWindow itself
 	gtk_widget_show_all(w->vboxWidget);