X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin4_src%2FServer%2Fdraw_control.cpp;h=59ea0bc922c0185360ae47da522560330e09e384;hb=327dc4547b437dca7e6e839119a1ca1481b8a40a;hp=264165f36d2b537be448417b9059d3c4a774ac1b;hpb=cb37616a62753de8a1b8d28e3c4ec3ad9891de1b;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin4_src/Server/draw_control.cpp b/Usermode/Applications/axwin4_src/Server/draw_control.cpp
index 264165f3..59ea0bc9 100644
--- a/Usermode/Applications/axwin4_src/Server/draw_control.cpp
+++ b/Usermode/Applications/axwin4_src/Server/draw_control.cpp
@@ -8,6 +8,7 @@
  * Handles drawing of resizable controls defined by a bitmap and four region sizes
  */
 #include <draw_control.hpp>
+#include <axwin4/definitions.h>
 
 // === CODE ===
 namespace AxWin {
@@ -129,6 +130,15 @@ CControl StdButton(2, 1, 0, 2, 1, 0, ::std::vector<uint32_t> {
 	0xC0C0C0, 0xC0C0C0, 0xC0C0C0, 0xC0C0C0, 0xC0C0C0,
 	});
 
+// Toolbar
+CControl StdToolbar(2, 1, 0, 2, 1, 0, ::std::vector<uint32_t> {
+	0x000000, 0x000000, 0x000000, 0x000000, 0x000000,
+	0x000000, 0xA0A0A0, 0x0A0000, 0xA0A0A0, 0x000000,
+	0x000000, 0xA0A0A0, 0xFFFFFF, 0xA0A0A0, 0x000000,
+	0x000000, 0xA0A0A0, 0x0A0000, 0xA0A0A0, 0x000000,
+	0x000000, 0x000000, 0x000000, 0x000000, 0x000000,
+	});
+
 // Text Area
 CControl StdText(2, 1, 0, 2, 1, 0, ::std::vector<uint32_t> {
 	0x000000, 0x000000, 0x000000, 0x000000, 0x000000,
@@ -152,8 +162,9 @@ const CControl* CControl::GetByID(uint16_t id)
 {
 	switch(id)
 	{
-	case 0x00:	return &StdButton;
-	case 0x01:	return &StdText;
+	case AXWIN4_CTL_BUTTON:	return &StdButton;
+	case AXWIN4_CTL_TOOLBAR:	return &StdToolbar;
+	case AXWIN4_CTL_TEXTBOX:	return &StdText;
 	default:	return nullptr;
 	}
 }