Bug 508033 - Win32: Toolbar ignores foreground color

added new datatype and return values for ToolBar custom drawing.

Change-Id: I9f1fa65416314ae794d36d298c7dc0159b8cc535
Signed-off-by: Conrad Groth <info@conrad-groth.de>

2 files changed, 59 insertions, 0 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTBCUSTOMDRAW.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTBCUSTOMDRAW.java
new file mode 100644
index 0000000000..75dfbc8291
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/NMTBCUSTOMDRAW.java
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2017, 2017 Conrad Groth and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Conrad Groth - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.internal.win32;
+
+public class NMTBCUSTOMDRAW extends NMCUSTOMDRAW {
+	public NMCUSTOMDRAW nmcd;
+	/** @field cast=(HBRUSH) */
+	public long /*int*/ hbrMonoDither;
+	/** @field cast=(HBRUSH) */
+	public long /*int*/ hbrLines;
+	/** @field cast=(HBRUSH) */
+	public long /*int*/ hpenLines;
+	public int clrText;
+	public int clrMark;
+	public int clrTextHighlight;
+	public int clrBtnFace;
+	public int clrBtnHighlight;
+	public int clrHighlightHotTrack;
+	// RECT rcText;
+	/** @field accessor=rcText.left */
+	public int rcText_left;
+	/** @field accessor=rcText.top */
+	public int rcText_top;
+	/** @field accessor=rcText.right */
+	public int rcText_right;
+	/** @field accessor=rcText.bottom */
+	public int rcText_bottom;
+	public int nStringBkMode;
+	public int nHLStringBkMode;
+	public int iListGap;
+	public static final int sizeof = OS.NMTBCUSTOMDRAW_sizeof ();
+}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
index 0ce818eb8e..48eda81350 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/org/eclipse/swt/internal/win32/OS.java
@@ -1656,6 +1656,14 @@ public class OS extends C {
 	public static final int TABP_TOPTABITEMBOTHEDGE = 8;
 	public static final int TABP_PANE = 9;
 	public static final int TABP_BODY = 10;
+	public static final int TBCDRF_BLENDICON = 0x200000;
+	public static final int TBCDRF_HILITEHOTTRACK = 0x20000;
+	public static final int TBCDRF_NOBACKGROUND = 0x400000;
+	public static final int TBCDRF_NOEDGES = 0x10000;
+	public static final int TBCDRF_NOETCHEDEFFECT = 0x100000;
+	public static final int TBCDRF_NOMARK = 0x80000;
+	public static final int TBCDRF_NOOFFSET = 0x40000;
+	public static final int TBCDRF_USECDCOLORS = 0x800000;
 	public static final int TBIF_COMMAND = 0x20;
 	public static final int TBIF_STATE = 0x4;
 	public static final int TBIF_IMAGE = 0x1;
@@ -2359,6 +2367,7 @@ public static final native int NMTOOLBAR_sizeof ();
 public static final native int NMTTDISPINFOA_sizeof ();
 public static final native int NMTTDISPINFOW_sizeof ();
 public static final native int NMTTCUSTOMDRAW_sizeof ();
+public static final native int NMTBCUSTOMDRAW_sizeof ();
 public static final native int NMTVCUSTOMDRAW_sizeof ();
 public static final native int NMTVDISPINFO_sizeof ();
 public static final native int NMTVITEMCHANGE_sizeof ();
@@ -5519,6 +5528,11 @@ public static final native void MoveMemory (NMLVCUSTOMDRAW Destination, long /*i
  * @param Destination cast=(PVOID),flags=no_in
  * @param Source cast=(CONST VOID *)
  */
+public static final native void MoveMemory (NMTBCUSTOMDRAW Destination, long /*int*/ Source, int Length);
+/**
+ * @param Destination cast=(PVOID),flags=no_in
+ * @param Source cast=(CONST VOID *)
+ */
 public static final native void MoveMemory (NMTBHOTITEM Destination, long /*int*/ Source, int Length);
 /**
  * @param Destination cast=(PVOID),flags=no_in
@@ -5549,6 +5563,11 @@ public static final native void MoveMemory (long /*int*/ Destination, NMLVCUSTOM
  * @param Destination cast=(PVOID)
  * @param Source cast=(CONST VOID *),flags=no_out
  */
+public static final native void MoveMemory (long /*int*/ Destination, NMTBCUSTOMDRAW Source, int Length);
+/**
+ * @param Destination cast=(PVOID)
+ * @param Source cast=(CONST VOID *),flags=no_out
+ */
 public static final native void MoveMemory (long /*int*/ Destination, NMTVCUSTOMDRAW Source, int Length);
 /**
  * @param Destination cast=(PVOID)