--- a/dwtx/draw2d/SWTGraphics.d	Sun Aug 03 03:07:30 2008 +0200
+++ b/dwtx/draw2d/SWTGraphics.d	Sun Aug 03 17:01:51 2008 +0200
@@ -211,55 +211,31 @@
     }
 }
 
-static const int AA_MASK;
-static const int AA_SHIFT;
+static const int AA_MASK = 3 << AA_SHIFT;
+static const int AA_SHIFT = 8;
 static const int AA_WHOLE_NUMBER = 1;
-static const int ADVANCED_GRAPHICS_MASK;
-static const int ADVANCED_HINTS_DEFAULTS;
-static const int ADVANCED_HINTS_MASK;
-static const int ADVANCED_SHIFT;
-static const int CAP_MASK;
-static const int CAP_SHIFT;
-static const int FILL_RULE_MASK;
-static const int FILL_RULE_SHIFT;
-static const int FILL_RULE_WHOLE_NUMBER = -1;
-static const int INTERPOLATION_MASK;
-static const int INTERPOLATION_SHIFT;
-static const int INTERPOLATION_WHOLE_NUMBER = 1;
-static const int JOIN_MASK;
-static const int JOIN_SHIFT;
-static const int LINE_STYLE_MASK;
-
-static const int TEXT_AA_MASK;
-static const int TEXT_AA_SHIFT;
-static const int XOR_MASK;
-static const int XOR_SHIFT;
-
-static this() {
-    XOR_SHIFT = 3;
-    CAP_SHIFT = 4;
-    JOIN_SHIFT = 6;
-    AA_SHIFT = 8;
-    TEXT_AA_SHIFT = 10;
-    INTERPOLATION_SHIFT = 12;
-    FILL_RULE_SHIFT = 14;
-    ADVANCED_SHIFT = 15;
-
-    LINE_STYLE_MASK = 7;
-    AA_MASK = 3 << AA_SHIFT;
-    CAP_MASK = 3 << CAP_SHIFT;
-    FILL_RULE_MASK = 1 << FILL_RULE_SHIFT;
-    INTERPOLATION_MASK = 3 << INTERPOLATION_SHIFT;
-    JOIN_MASK = 3 << JOIN_SHIFT;
-    TEXT_AA_MASK = 3 << TEXT_AA_SHIFT;
-    XOR_MASK = 1 << XOR_SHIFT;
-    ADVANCED_GRAPHICS_MASK = 1 << ADVANCED_SHIFT;
-
-    ADVANCED_HINTS_MASK = TEXT_AA_MASK | AA_MASK | INTERPOLATION_MASK;
-    ADVANCED_HINTS_DEFAULTS = ((DWT.DEFAULT + AA_WHOLE_NUMBER) << TEXT_AA_SHIFT)
+static const int ADVANCED_GRAPHICS_MASK = 1 << ADVANCED_SHIFT;
+static const int ADVANCED_HINTS_DEFAULTS = ((DWT.DEFAULT + AA_WHOLE_NUMBER) << TEXT_AA_SHIFT)
             | ((DWT.DEFAULT + AA_WHOLE_NUMBER) << AA_SHIFT)
             | ((DWT.DEFAULT + INTERPOLATION_WHOLE_NUMBER) << INTERPOLATION_SHIFT);
-}
+static const int ADVANCED_HINTS_MASK = TEXT_AA_MASK | AA_MASK | INTERPOLATION_MASK;
+static const int ADVANCED_SHIFT = 15;
+static const int CAP_MASK = 3 << CAP_SHIFT;
+static const int CAP_SHIFT = 4;
+static const int FILL_RULE_MASK = 1 << FILL_RULE_SHIFT;
+static const int FILL_RULE_SHIFT = 14;
+static const int FILL_RULE_WHOLE_NUMBER = -1;
+static const int INTERPOLATION_MASK = 3 << INTERPOLATION_SHIFT;
+static const int INTERPOLATION_SHIFT = 12;
+static const int INTERPOLATION_WHOLE_NUMBER = 1;
+static const int JOIN_MASK = 3 << JOIN_SHIFT;
+static const int JOIN_SHIFT = 6;
+static const int LINE_STYLE_MASK = 7;
+
+static const int TEXT_AA_MASK = 3 << TEXT_AA_SHIFT;
+static const int TEXT_AA_SHIFT = 10;
+static const int XOR_MASK = 1 << XOR_SHIFT;
+static const int XOR_SHIFT = 3;
 
 private const LazyState appliedState;
 private const State currentState;