Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSilenio Quarti2006-04-26 15:27:18 +0000
committerSilenio Quarti2006-04-26 15:27:18 +0000
commitc270b603c7dfafdbba4594330199062a98e24cfe (patch)
treea8ac63a3431a6e4fb2ba2462c7bdb00171dd68b9 /bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse
parenta07aea37cba188968ae92680ce1fd50871a38b9c (diff)
downloadeclipse.platform.swt-c270b603c7dfafdbba4594330199062a98e24cfe.tar.gz
eclipse.platform.swt-c270b603c7dfafdbba4594330199062a98e24cfe.tar.xz
eclipse.platform.swt-c270b603c7dfafdbba4594330199062a98e24cfe.zip
check common controls 6
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ButtonDrawData.java1
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ToolItemDrawData.java1
2 files changed, 2 insertions, 0 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ButtonDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ButtonDrawData.java
index daad1145e8..bbc99a3b72 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ButtonDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ButtonDrawData.java
@@ -78,6 +78,7 @@ void draw(Theme theme, GC gc, Rectangle bounds) {
}
int hit(Theme theme, Point position, Rectangle bounds) {
+ if (!(OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ())) return DrawData.WIDGET_NOWHERE;
if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE;
int hTheme = OS.OpenThemeData(0, getClassId());
RECT rect = new RECT ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ToolItemDrawData.java b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ToolItemDrawData.java
index df555a9d42..e20a2cc139 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ToolItemDrawData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Theme/win32/org/eclipse/swt/internal/theme/ToolItemDrawData.java
@@ -125,6 +125,7 @@ int[] getPartId(int part) {
}
int hit(Theme theme, Point position, Rectangle bounds) {
+ if (!(OS.COMCTL32_MAJOR >= 6 && OS.IsAppThemed ())) return DrawData.WIDGET_NOWHERE;
if (!bounds.contains(position)) return DrawData.WIDGET_NOWHERE;
int hTheme = OS.OpenThemeData(0, getClassId());
try {

Back to the top