X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Fgui_ate_src%2Fmain.c;h=a3c452b4d3eb156145a40a835c34d630e6b62839;hb=536d7d5d3374c4d13afe7d5d099fd15a526d63fd;hp=3a929c2ab1fd31f265bb2aebf79621988ab398eb;hpb=6c5efc540fb5eafd45624e81a52bf9b0bf338946;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/gui_ate_src/main.c b/Usermode/Applications/gui_ate_src/main.c
index 3a929c2a..a3c452b4 100644
--- a/Usermode/Applications/gui_ate_src/main.c
+++ b/Usermode/Applications/gui_ate_src/main.c
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
 	// <testing>
 	AxWin3_RichText_SetLineCount(gMainWindow_TextArea, 3);
 	AxWin3_RichText_SendLine(gMainWindow_TextArea, 0, "First line!");
-	AxWin3_RichText_SendLine(gMainWindow_TextArea, 2, "Third line! \x01""ff0000A red");
+	AxWin3_RichText_SendLine(gMainWindow_TextArea, 2, "Third line! \x01""ff0000red\x01""00ff00green");
 	// </testing>
 
 	AxWin3_ShowWindow(gMainWindow_TextArea, 1);
@@ -108,9 +108,18 @@ int TextArea_MouseHandler(tHWND Window, int bPress, int Button, int Row, int Col
 void add_toolbar_button(tAxWin3_Widget *Toolbar, const char *Ident, tAxWin3_Widget_FireCb Callback)
 {
 	tAxWin3_Widget *btn = AxWin3_Widget_AddWidget(Toolbar, ELETYPE_BUTTON, ELEFLAG_NOSTRETCH, Ident);
-	tAxWin3_Widget *txt = AxWin3_Widget_AddWidget(btn, ELETYPE_TEXT, 0, Ident);
-	// TODO: Get image / text using `Ident` as a lookup key
-	AxWin3_Widget_SetText(txt, getstr(Ident));
+	const char *img = getimg(Ident);
+	if( img )
+	{
+		tAxWin3_Widget *txt = AxWin3_Widget_AddWidget(btn, ELETYPE_IMAGE, 0, Ident);
+		AxWin3_Widget_SetText(txt, img);
+		// TODO: tooltip?
+	}
+	else
+	{
+		tAxWin3_Widget *txt = AxWin3_Widget_AddWidget(btn, ELETYPE_TEXT, 0, Ident);
+		AxWin3_Widget_SetText(txt, getstr(Ident));
+	}
 	AxWin3_Widget_SetFireHandler(btn, Callback);
 }