From: John Hodge <tpg@mutabah.net>
Date: Thu, 17 Nov 2011 07:51:35 +0000 (+0800)
Subject: Usermode/AxWin3 - Fixed some silly bugs
X-Git-Tag: rel0.14~101
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=fc0af40cd5affc1bd946fca84b641436dfc9592a;p=tpg%2Facess2.git

Usermode/AxWin3 - Fixed some silly bugs
---

diff --git a/Usermode/Applications/axwin3_src/Interface/main.c b/Usermode/Applications/axwin3_src/Interface/main.c
index f8e35273..61ba4ac3 100644
--- a/Usermode/Applications/axwin3_src/Interface/main.c
+++ b/Usermode/Applications/axwin3_src/Interface/main.c
@@ -135,13 +135,13 @@ tAxWin3_Widget *make_textbutton(tAxWin3_Widget *Parent, const char *Label, tAxWi
 	ret = AxWin3_Widget_AddWidget(Parent, ELETYPE_BUTTON, ELEFLAG_NOSTRETCH, "_btn");
 	AxWin3_Widget_SetFireHandler(ret, handler);
 	txt = AxWin3_Widget_AddWidget(ret, ELETYPE_TEXT, 0, "_txt");
-	AxWin3_Widget_SetText(ret, Label);
+	AxWin3_Widget_SetText(txt, Label);
 	return ret;
 }
 
 void create_run_dialog(void)
 {
-	tAxWin3_Widget	*root, *box, *ele;
+	tAxWin3_Widget	*root, *box;
 	
 	gRunDialog = AxWin3_Widget_CreateWindow(NULL, RUN_WIDTH, RUN_HEIGHT, ELEFLAG_VERTICAL);
 	AxWin3_SetWindowTitle(gRunDialog, "Run Program...");
@@ -153,7 +153,7 @@ void create_run_dialog(void)
 	AxWin3_Widget_SetFireHandler(gRunInput, run_dorun);
 	
 	box = AxWin3_Widget_AddWidget(root, ELETYPE_BOX, ELEFLAG_ALIGN_CENTER|ELEFLAG_NOSTRETCH, "Button Area");
-	ele = make_textbutton(box, "Ok", run_dorun);
-	ele = make_textbutton(box, "Cancel", run_close);
+	make_textbutton(box, "Ok", run_dorun);
+	make_textbutton(box, "Cancel", run_close);
 }
 
diff --git a/Usermode/Applications/axwin3_src/WM/image.c b/Usermode/Applications/axwin3_src/WM/image.c
index a0b86e9b..49a074d9 100644
--- a/Usermode/Applications/axwin3_src/WM/image.c
+++ b/Usermode/Applications/axwin3_src/WM/image.c
@@ -58,6 +58,9 @@ tImage *Image_Load(const char *URI)
 		}
 		
 		tmp = fread(buf, 1, filesize, fp);
+		if(tmp != filesize) {
+			_SysDebug("Image_Load: fread() failed - %i != filesize (%i)", tmp, filesize);
+		}
 		fclose(fp);
 	}
 	else if( strcmp(uri->Proto, "base64") == 0 )