X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Flibaxwin4.so_src%2Fwindow_drawing.cpp;h=e6a4448ce4cab82dc2165e919e093c7cef458576;hb=ba78deafcc3016555469ed263d7a0370fa99db4b;hp=a515d299a6ed0b629487d5382e5c01d4270b9691;hpb=10949658e20bd7b35f9ebe1d9354119d993e115b;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/libaxwin4.so_src/window_drawing.cpp b/Usermode/Libraries/libaxwin4.so_src/window_drawing.cpp
index a515d299..e6a4448c 100644
--- a/Usermode/Libraries/libaxwin4.so_src/window_drawing.cpp
+++ b/Usermode/Libraries/libaxwin4.so_src/window_drawing.cpp
@@ -45,9 +45,10 @@ extern "C" void AxWin4_DrawBitmap(tAxWin4_Window *Window, int X, int Y, unsigned
 	}
 }
 
-extern "C" void AxWin4_DrawControl(tAxWin4_Window *Window, int X, int Y, unsigned int W, unsigned int H, uint16_t ID)
+extern "C" void AxWin4_DrawControl(tAxWin4_Window *Window, int X, int Y, unsigned int W, unsigned int H, uint16_t ID, unsigned int Frame)
 {
 	CSerialiser	message;
+	//_SysDebug("AxWin4_DrawControl: (Window->ID=%i, (%i,%i) %ix%i %i 0x%06x", Window->m_id, X, Y, W, H, ID, Frame);
 	message.WriteU8(IPCMSG_DRAWCTL);
 	message.WriteU16(Window->m_id);
 	message.WriteU16(X);
@@ -55,6 +56,34 @@ extern "C" void AxWin4_DrawControl(tAxWin4_Window *Window, int X, int Y, unsigne
 	message.WriteU16(W);
 	message.WriteU16(H);
 	message.WriteU16(ID);
+	message.WriteU16(Frame);
+	::AxWin::SendMessage(message);
+}
+
+extern "C" void AxWin4_FillRect(tAxWin4_Window *Window, int X, int Y, unsigned int W, unsigned int H, uint32_t Colour)
+{	
+	CSerialiser	message;
+	message.WriteU8(IPCMSG_FILLRECT);
+	message.WriteU16(Window->m_id);
+	message.WriteU16(X);
+	message.WriteU16(Y);
+	message.WriteU16(W);
+	message.WriteU16(H);
+	message.WriteU32(Colour);
+	::AxWin::SendMessage(message);
+}
+
+extern "C" void AxWin4_DrawText(tAxWin4_Window *Window, int X, int Y, unsigned int W, unsigned int H, uint16_t FontID, const char *String)
+{
+	CSerialiser	message;
+	message.WriteU8(IPCMSG_DRAWTEXT);
+	message.WriteU16(Window->m_id);
+	message.WriteU16(X);
+	message.WriteU16(Y);
+	message.WriteU16(W);
+	message.WriteU16(H);
+	message.WriteU16(FontID);
+	message.WriteString(String);
 	::AxWin::SendMessage(message);
 }