diff options
| author | Christophe Cornu <ccornu> | 2004-12-06 15:54:51 +0000 |
|---|---|---|
| committer | Christophe Cornu <ccornu> | 2004-12-06 15:54:51 +0000 |
| commit | ce197d7cdba08fc3f97648408c1b1c9bdbdd12c5 (patch) | |
| tree | 2d2039cf68a6e8186edacc64a5eb2bcbe5e17e1d | |
| parent | 88e5df65fba7738d92456a53fbe2932fc03179ea (diff) | |
| download | eclipse.platform.swt-ce197d7cdba08fc3f97648408c1b1c9bdbdd12c5.tar.gz eclipse.platform.swt-ce197d7cdba08fc3f97648408c1b1c9bdbdd12c5.tar.xz eclipse.platform.swt-ce197d7cdba08fc3f97648408c1b1c9bdbdd12c5.zip | |
24538
3 files changed, 7 insertions, 5 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolBar.java index 8d80a9f20b..39519f73cd 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolBar.java @@ -356,6 +356,10 @@ int getMargin (int index) { return margin; } +Control findThemeControl () { + return null; +} + /** * Returns the item that is currently displayed at the given, * zero-relative index. Throws an exception if the index is diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java index 53d49b4b09..ab03472669 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java @@ -303,9 +303,7 @@ void drawThemeBackground (int hDC, RECT rect) { } Control findThemeControl () { - // TEMPORARY CODE - return null; - //return background == -1 ? this : null; + return background == -1 ? this : null; } public Rectangle getClientArea () { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java index 47c7c03a14..1e40ae14a2 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java @@ -986,8 +986,8 @@ LRESULT wmNotifyChild (int wParam, int lParam) { child.postEvent (SWT.Selection, event); } break; - case OS.NM_CUSTOMDRAW: - if (background == -1) break; + case OS.NM_CUSTOMDRAW: + if (findThemeControl() == null && background == -1) break; NMCUSTOMDRAW nmcd = new NMCUSTOMDRAW (); OS.MoveMemory (nmcd, lParam, NMCUSTOMDRAW.sizeof); switch (nmcd.dwDrawStage) { |