--- a/dwt/widgets/Decorations.d	Tue Feb 05 04:03:25 2008 +0100
+++ b/dwt/widgets/Decorations.d	Tue Feb 05 14:31:31 2008 +0100
@@ -191,7 +191,7 @@
             RECT rect;
             OS.SystemParametersInfo (OS.SPI_GETWORKAREA, 0, &rect, 0);
             int width = rect.right - rect.left, height = rect.bottom - rect.top;
-            if (OS.IsPPC_) {
+            if (OS.IsPPC) {
                 /* Leave space for the menu bar */
                 if (menuBar !is null) {
                     auto hwndCB = menuBar.hwndCB;
@@ -395,10 +395,10 @@
     int maxAccel = 0;
     MenuItem [] items = display.items;
     if (menuBar is null || items is null) {
-        if (!OS.IsPPC_) return;
+        if (!OS.IsPPC) return;
         maxAccel = 1;
     } else {
-        maxAccel = OS.IsPPC_ ? items.length + 1 : items.length;
+        maxAccel = OS.IsPPC ? items.length + 1 : items.length;
     }
     ACCEL accel;
     byte [] buffer1 = new byte [ACCEL.sizeof];
@@ -423,7 +423,7 @@
             }
         }
     }
-    if (OS.IsPPC_) {
+    if (OS.IsPPC) {
         /*
         * Note on WinCE PPC.  Close the shell when user taps CTRL-Q.
         * IDOK represents the "Done Button" which also closes the shell.
@@ -1172,7 +1172,7 @@
                 }
             }
         } else {
-            if (OS.IsPPC_) {
+            if (OS.IsPPC) {
                 /*
                 * Note in WinCE PPC.  The menu bar is a separate popup window.
                 * If the shell is full screen, resize its window to leave
@@ -1554,7 +1554,7 @@
     int bits = super.widgetExtStyle () | OS.WS_EX_MDICHILD;
     bits &= ~OS.WS_EX_CLIENTEDGE;
     if ((style & DWT.NO_TRIM) !is 0) return bits;
-    if (OS.IsPPC_) {
+    if (OS.IsPPC) {
         if ((style & DWT.CLOSE) !is 0) bits |= OS.WS_EX_CAPTIONOKBTN;
     }
     if ((style & DWT.RESIZE) !is 0) return bits;
@@ -1591,13 +1591,13 @@
         * the Shell according to the state of the IME.
         * It does not set the WS_THICKFRAME style.
         */
-        if (!OS.IsPPC_) bits |= OS.WS_THICKFRAME;
+        if (!OS.IsPPC) bits |= OS.WS_THICKFRAME;
     } else {
         if ((style & DWT.BORDER) is 0) bits |= OS.WS_BORDER;
     }
 
     /* Set the system menu and close box bits */
-    if (!OS.IsPPC_ && !OS.IsSP_) {
+    if (!OS.IsPPC && !OS.IsSP) {
         if ((style & DWT.CLOSE) !is 0) bits |= OS.WS_SYSMENU;
     }
 
@@ -1686,7 +1686,7 @@
     LRESULT result = super.WM_HOTKEY (wParam, lParam);
     if (result !is LRESULT.NULL) return result;
     static if( OS.IsWinCE ){
-        if (OS.IsSP_) {
+        if (OS.IsSP) {
             /*
             * Feature on WinCE SP.  The Back key is either used to close
             * the foreground Dialog or used as a regular Back key in an EDIT