--- a/dwt/widgets/Button.d	Thu Feb 07 02:08:50 2008 +0100
+++ b/dwt/widgets/Button.d	Fri Feb 08 11:57:24 2008 +0100
@@ -360,7 +360,7 @@
 
 override LRESULT callWindowProc (HWND hwnd, int msg, int wParam, int lParam) {
     if (handle is null) return LRESULT.ZERO;
-    return cast(LRESULT) ButtonProc( hwnd, msg, wParam, lParam);
+    return cast(LRESULT) OS.CallWindowProc ( ButtonProc, hwnd, msg, wParam, lParam);
 }
 
 static int checkStyle (int style) {
@@ -401,7 +401,7 @@
         auto hDC = OS.GetDC (handle);
         HFONT newFont = cast(HFONT) OS.SendMessage (handle, OS.WM_GETFONT, 0, 0);
         if (newFont !is null) oldFont = OS.SelectObject (hDC, newFont);
-        TCHAR* buffer = StrToTCHARz(text);
+        TCHAR* buffer = StrToTCHARz( getCodePage (), text);
         RECT rect;
         int flags = OS.DT_CALCRECT | OS.DT_SINGLELINE;
         OS.DrawText (hDC, buffer, -1, &rect, flags);
@@ -477,7 +477,7 @@
                     height = Math.max (height, lptm.tmHeight);
                 } else {
                     extra = Math.max (MARGIN * 2, lptm.tmAveCharWidth);
-                    TCHAR* buffer = StrToTCHARz(text);
+                    TCHAR* buffer = StrToTCHARz( getCodePage (), text);
                     RECT rect;
                     int flags = OS.DT_CALCRECT | OS.DT_SINGLELINE;
                     OS.DrawText (hDC, buffer, -1, &rect, flags);
@@ -547,7 +547,7 @@
             bool hasImage = (bits & (OS.BS_BITMAP | OS.BS_ICON)) !is 0;
             if (!hasImage) {
                 char[] string = enabled ? text : " " ~ text ~ " ";
-                TCHAR* buffer = StrToTCHARz (string);
+                TCHAR* buffer = StrToTCHARz (getCodePage (), string);
                 OS.SetWindowText (handle, buffer);
             }
         }