Index: ToolbarPool.java
===================================================================
RCS file: /cvs/openide/loaders/src/org/openide/awt/ToolbarPool.java,v
retrieving revision 1.13
diff -u -r1.13 ToolbarPool.java
--- ToolbarPool.java	18 Jul 2004 04:10:32 -0000	1.13
+++ ToolbarPool.java	20 Sep 2004 15:07:52 -0000
@@ -18,6 +18,7 @@
 import java.awt.Color;
 import java.awt.Container;
 import java.awt.FlowLayout;
+import java.awt.Toolkit;
 import java.awt.event.*;
 import java.util.*;
 
@@ -117,14 +118,18 @@
         getAccessibleContext().setAccessibleDescription(instance.instanceName());
 
         if (UIManager.getLookAndFeel() instanceof com.sun.java.swing.plaf.windows.WindowsLookAndFeel) {
-            //Set up custom borders for XP
-            setBorder(BorderFactory.createCompoundBorder(
-                upperBorder, 
-                BorderFactory.createCompoundBorder(
-                    BorderFactory.createMatteBorder(0, 0, 1, 0, 
-                    fetchColor("controlShadow", Color.DARK_GRAY)),
-                    BorderFactory.createMatteBorder(0, 0, 1, 0, mid))
-            )); //NOI18N
+            if( isXPTheme() ) {
+                //Set up custom borders for XP
+                setBorder(BorderFactory.createCompoundBorder(
+                    upperBorder, 
+                    BorderFactory.createCompoundBorder(
+                        BorderFactory.createMatteBorder(0, 0, 1, 0, 
+                        fetchColor("controlShadow", Color.DARK_GRAY)),
+                        BorderFactory.createMatteBorder(0, 0, 1, 0, mid))
+                )); //NOI18N
+            } else {
+                setBorder( BorderFactory.createEtchedBorder() );
+            }
         }
     }
     
@@ -382,6 +387,19 @@
         }
         return accessibleContext;
     }
+
+    /** Recognizes if XP theme is set.
+     * @return true if XP theme is set, false otherwise
+     */
+    private static Boolean isXP = null;
+    private static boolean isXPTheme () {
+        if (isXP == null) {
+            Boolean xp = (Boolean)Toolkit.getDefaultToolkit().
+            getDesktopProperty("win.xpstyle.themeActive"); //NOI18N
+            isXP = Boolean.TRUE.equals(xp)? Boolean.TRUE : Boolean.FALSE;
+        }
+        return isXP.booleanValue();
+    }    
 
     /**
      * This class is used for delayed setting of configuration after instance


Index: Toolbar.java
===================================================================
RCS file: /cvs/openide/loaders/src/org/openide/awt/Toolbar.java,v
retrieving revision 1.17
diff -u -r1.17 Toolbar.java
--- Toolbar.java	18 Jul 2004 04:10:32 -0000	1.17
+++ Toolbar.java	20 Sep 2004 15:07:26 -0000
@@ -803,7 +803,7 @@
 
         /** Create new ToolbarGrip for default number of grip elements. */
         public ToolbarGrip () {
-            this (2);
+            this (1);
         }
 
         /** Create new ToolbarGrip for specific number of grip elements.