--- a/dwt/widgets/Shell.d	Tue Feb 05 04:03:25 2008 +0100
+++ b/dwt/widgets/Shell.d	Tue Feb 05 14:31:31 2008 +0100
@@ -7,6 +7,8 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ * Port to the D programming language:
+ *     Frank Benoit <benoit@tionex.de>
  *******************************************************************************/
 module dwt.widgets.Shell;
 
@@ -583,7 +585,7 @@
         int flags = OS.SWP_DRAWFRAME | OS.SWP_NOMOVE | OS.SWP_NOSIZE | OS.SWP_NOZORDER | OS.SWP_NOACTIVATE;
         SetWindowPos (handle, null, 0, 0, 0, 0, flags);
         static if (OS.IsWinCE) _setMaximized (true);
-        static if (OS.IsPPC_) {
+        static if (OS.IsPPC) {
             psai = new SHACTIVATEINFO ();
             psai.cbSize = SHACTIVATEINFO.sizeof;
         }
@@ -1747,7 +1749,7 @@
 }
 
 override char[] windowClass () {
-    static if (OS.IsSP_) return DialogClass;
+    static if (OS.IsSP) return DialogClass;
     if ((style & DWT.TOOL) !is 0) {
         int trim = DWT.TITLE | DWT.CLOSE | DWT.MIN | DWT.MAX | DWT.BORDER | DWT.RESIZE;
         if ((style & trim) is 0) return TCHARzToStr( display.windowShadowClass );
@@ -1757,7 +1759,7 @@
 
 override int windowProc () {
     if (windowProc_ !is null) return cast(int) windowProc_;
-    static if (OS.IsSP_) return cast(int) DialogProc;
+    static if (OS.IsSP) return cast(int) DialogProc;
     if ((style & DWT.TOOL) !is 0) {
         int trim = DWT.TITLE | DWT.CLOSE | DWT.MIN | DWT.MAX | DWT.BORDER | DWT.RESIZE;
         if ((style & trim) is 0) super.windowProc ();
@@ -1831,7 +1833,7 @@
 }
 
 override LRESULT WM_ACTIVATE (int wParam, int lParam) {
-    static if (OS.IsPPC_) {
+    static if (OS.IsPPC) {
         /*
         * Note: this does not work when we get WM_ACTIVATE prior
         * to adding a listener.
@@ -1879,7 +1881,7 @@
 }
 
 override LRESULT WM_COMMAND (int wParam, int lParam) {
-    static if (OS.IsPPC_) {
+    static if (OS.IsPPC) {
         /*
         * Note in WinCE PPC:  Close the Shell when the "Done Button" has
         * been pressed. lParam is either 0 (PocketPC 2002) or the handle
@@ -1901,7 +1903,7 @@
     * of the WM_COMMAND and set lParam to zero to pretend that the message
     * came from a real Windows menu, not a tool bar.
     */
-    static if (OS.IsPPC_ || OS.IsSP_) {
+    static if (OS.IsPPC || OS.IsSP) {
         if (menuBar !is null) {
             auto hwndCB = menuBar.hwndCB;
             if (lParam !is 0 && hwndCB !is null) {
@@ -2212,7 +2214,7 @@
 override LRESULT WM_SETTINGCHANGE (int wParam, int lParam) {
     LRESULT result = super.WM_SETTINGCHANGE (wParam, lParam);
     if (result !is LRESULT.NULL) return result;
-    static if (OS.IsPPC_) {
+    static if (OS.IsPPC) {
         if (wParam is OS.SPI_SETSIPINFO) {
             /*
             * The SIP is in a new state.  Cache its new value.