diff options
| -rw-r--r-- | alf/alf.cpp | 17 | ||||
| -rw-r--r-- | alf/alfcompat.cpp | 2 | ||||
| -rw-r--r-- | alf/alflabel.cpp | 2 | ||||
| -rw-r--r-- | widgetfactory.cpp | 2 |
4 files changed, 3 insertions, 20 deletions
diff --git a/alf/alf.cpp b/alf/alf.cpp index 9f68479..03c0fbf 100644 --- a/alf/alf.cpp +++ b/alf/alf.cpp @@ -571,23 +571,6 @@ ALF_DefWindowProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) return TRUE; } - if (msg == WM_CTLCOLORSTATIC) { - HDC hdcStatic = (HDC)wparam; - HWND hwndStatic = (HWND)lparam; - - // HACK! return correct label background for NT3.x and NT4/95 - // get rid of this once we fixed the label to draw on the parent control background - if (LOBYTE(LOWORD(GetVersion())) < 4) { - SetTextColor(hdcStatic, GetSysColor(IsWindowEnabled(hwndStatic) ? COLOR_WINDOWTEXT : COLOR_GRAYTEXT)); - SetBkColor(hdcStatic, GetSysColor(COLOR_WINDOW)); - return (LRESULT)GetSysColorBrush(COLOR_WINDOW); - } else { - SetTextColor(hdcStatic, GetSysColor(IsWindowEnabled(hwndStatic) ? COLOR_BTNTEXT : COLOR_GRAYTEXT)); - SetBkColor(hdcStatic, GetSysColor(COLOR_BTNFACE)); - return (LRESULT)GetSysColorBrush(COLOR_BTNFACE); - } - } - return DefWindowProc(hwnd, msg, wparam, lparam); } diff --git a/alf/alfcompat.cpp b/alf/alfcompat.cpp index 5486b19..9a36d4d 100644 --- a/alf/alfcompat.cpp +++ b/alf/alfcompat.cpp @@ -32,7 +32,7 @@ static int WINAPI fallbackGetSystemMetricsForDpi(int nIndex, UINT dpi) { (void)dpi; - if (LOBYTE(LOWORD(GetVersion)) < 4) { + if (LOBYTE(LOWORD(GetVersion())) < 4) { // old NT does not support several properties, so we fake them switch (nIndex) { case SM_CXEDGE: diff --git a/alf/alflabel.cpp b/alf/alflabel.cpp index a0dc138..108c8d5 100644 --- a/alf/alflabel.cpp +++ b/alf/alflabel.cpp @@ -9,7 +9,7 @@ int ALF__LabelTopPadding(HWND hwnd, ALFAPP app) // see also: alfedit.cpp return app->compatFn->GetSystemMetricsForDpi( SM_CYEDGE, ALF_CentipointsToPixels(GetParent(hwnd), 7200)) - + 1 /* internal padding in edit control */ + + ((LOBYTE(LOWORD(GetVersion())) < 4) ? 2 : 1) /* internal padding in edit control */ + 1 /* external padding around edit control */; } diff --git a/widgetfactory.cpp b/widgetfactory.cpp index 7956d5c..f3776f2 100644 --- a/widgetfactory.cpp +++ b/widgetfactory.cpp @@ -149,7 +149,7 @@ WinMain ALF_AddLabel(win, ID_LBL6, 0, 5, TEXT("[ComboBox2 value]")); ALF_RecalculateLayout(win); - ALF_SetDefaultButton(win, ID_B1); + ALF_SetDefaultButton(win, ID_B2); ALF_ComboBoxSetText(hwndCombo2, TEXT("Goodbye World!")); |