Remove the rest of the Tweak look hack.
diff --git a/controls/edit.c b/controls/edit.c
index 36a19ae..b206821 100644
--- a/controls/edit.c
+++ b/controls/edit.c
@@ -4374,13 +4374,8 @@
es->style |= ES_AUTOVSCROLL;
} else {
es->buffer_limit = BUFLIMIT_SINGLE;
- if ( WIN95_LOOK == TWEAK_WineLook) {
- es->style &= ~ES_CENTER;
- es->style &= ~ES_RIGHT;
- } else {
- if (es->style & ES_RIGHT)
- es->style &= ~ES_CENTER;
- }
+ es->style &= ~ES_CENTER;
+ es->style &= ~ES_RIGHT;
es->style &= ~WS_HSCROLL;
es->style &= ~WS_VSCROLL;
es->style &= ~ES_AUTOVSCROLL;
diff --git a/controls/menu.c b/controls/menu.c
index f46fe8d..93889bf 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -831,15 +831,9 @@
/* handle fontsize > bitmap_height */
top = (h>bm.bmHeight) ? rect->top+(h-bm.bmHeight)/2 : rect->top;
left=rect->left;
- if (TWEAK_WineLook == WIN95_LOOK) {
- rop=((lpitem->fState & MF_HILITE) && !IS_MAGIC_ITEM(lpitem->text)) ? NOTSRCCOPY : SRCCOPY;
- if ((lpitem->fState & MF_HILITE) && IS_BITMAP_ITEM(lpitem->fType))
- SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT));
- } else {
- left++;
- w-=2;
- rop=((lpitem->fState & MF_HILITE) && !IS_MAGIC_ITEM(lpitem->text) && (!menuBar)) ? MERGEPAINT : SRCCOPY;
- }
+ rop=((lpitem->fState & MF_HILITE) && !IS_MAGIC_ITEM(lpitem->text)) ? NOTSRCCOPY : SRCCOPY;
+ if ((lpitem->fState & MF_HILITE) && IS_BITMAP_ITEM(lpitem->fType))
+ SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT));
BitBlt( hdc, left, top, w, h, hdcMem, bmp_xoffset, 0, rop );
DeleteDC( hdcMem );
}
@@ -921,12 +915,9 @@
MENU_GetBitmapItemSize( (int)lpitem->text, lpitem->dwItemData, &size );
lpitem->rect.right += size.cx;
lpitem->rect.bottom += size.cy;
- if (TWEAK_WineLook == WIN98_LOOK)
- {
- /* Leave space for the sunken border */
- lpitem->rect.right += 2;
- lpitem->rect.bottom += 2;
- }
+ /* Leave space for the sunken border */
+ lpitem->rect.right += 2;
+ lpitem->rect.bottom += 2;
}
@@ -1170,18 +1161,10 @@
{
if (lpitem->fState & MF_HILITE)
{
- if(TWEAK_WineLook == WIN98_LOOK)
- {
- if(menuBar)
- DrawEdge(hdc, &rect, BDR_SUNKENOUTER, BF_RECT);
- else
- FillRect(hdc, &rect, GetSysColorBrush(COLOR_HIGHLIGHT));
- }
- else /* Not Win98 Look */
- {
- if(!IS_BITMAP_ITEM(lpitem->fType))
- FillRect(hdc, &rect, GetSysColorBrush(COLOR_HIGHLIGHT));
- }
+ if(menuBar)
+ DrawEdge(hdc, &rect, BDR_SUNKENOUTER, BF_RECT);
+ else
+ FillRect(hdc, &rect, GetSysColorBrush(COLOR_HIGHLIGHT));
}
else
FillRect( hdc, &rect, GetSysColorBrush(COLOR_MENU) );
@@ -1216,24 +1199,15 @@
if (lpitem->fState & MF_HILITE)
{
- if(TWEAK_WineLook == WIN98_LOOK)
- {
- if(menuBar) {
- SetTextColor(hdc, GetSysColor(COLOR_MENUTEXT));
- SetBkColor(hdc, GetSysColor(COLOR_MENU));
- } else {
- if(lpitem->fState & MF_GRAYED)
- SetTextColor(hdc, GetSysColor(COLOR_GRAYTEXT));
- else
- SetTextColor(hdc, GetSysColor(COLOR_HIGHLIGHTTEXT));
- SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT));
- }
- }
- else /* Not Win98 Look */
- {
- SetTextColor(hdc, GetSysColor(COLOR_HIGHLIGHTTEXT));
- if(!IS_BITMAP_ITEM(lpitem->fType))
- SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT));
+ if(menuBar) {
+ SetTextColor(hdc, GetSysColor(COLOR_MENUTEXT));
+ SetBkColor(hdc, GetSysColor(COLOR_MENU));
+ } else {
+ if(lpitem->fState & MF_GRAYED)
+ SetTextColor(hdc, GetSysColor(COLOR_GRAYTEXT));
+ else
+ SetTextColor(hdc, GetSysColor(COLOR_HIGHLIGHTTEXT));
+ SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT));
}
}
else
@@ -3186,23 +3160,22 @@
oldflags = item->fState & (MF_GRAYED | MF_DISABLED);
item->fState ^= (oldflags ^ wFlags) & (MF_GRAYED | MF_DISABLED);
- /* In win95 if the close item in the system menu change update the close button */
- if (TWEAK_WineLook == WIN95_LOOK)
- if((item->wID == SC_CLOSE) && (oldflags != wFlags))
+ /* If the close item in the system menu change update the close button */
+ if((item->wID == SC_CLOSE) && (oldflags != wFlags))
+ {
+ if (menu->hSysMenuOwner != 0)
{
- if (menu->hSysMenuOwner != 0)
- {
- POPUPMENU* parentMenu;
+ POPUPMENU* parentMenu;
- /* Get the parent menu to access*/
- if (!(parentMenu = MENU_GetMenu(menu->hSysMenuOwner)))
- return (UINT)-1;
+ /* Get the parent menu to access*/
+ if (!(parentMenu = MENU_GetMenu(menu->hSysMenuOwner)))
+ return (UINT)-1;
- /* Refresh the frame to reflect the change*/
- SetWindowPos(parentMenu->hWnd, 0, 0, 0, 0, 0,
- SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER);
- }
+ /* Refresh the frame to reflect the change*/
+ SetWindowPos(parentMenu->hWnd, 0, 0, 0, 0, 0,
+ SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER);
}
+ }
return oldflags;
}
diff --git a/controls/uitools.c b/controls/uitools.c
index 6b626a4..fe08e07 100644
--- a/controls/uitools.c
+++ b/controls/uitools.c
@@ -466,15 +466,7 @@
LTInnerI = RBInnerI = LTRBInnerFlat[uType & (BDR_INNER|BDR_OUTER)];
LTOuterI = RBOuterI = LTRBOuterFlat[uType & (BDR_INNER|BDR_OUTER)];
- /* Bertho Stultiens states above that this function exactly matches win95
- * In win98 BF_FLAT rectangles have an inner border same color as the
- * middle (COLOR_BTNFACE). I believe it's the same for win95 but since
- * I don't know I go with Bertho and just sets it for win98 until proven
- * otherwise.
- * Dennis Björklund, 10 June, 99
- */
- if( TWEAK_WineLook == WIN98_LOOK && LTInnerI != -1 )
- LTInnerI = RBInnerI = COLOR_BTNFACE;
+ if( LTInnerI != -1 ) LTInnerI = RBInnerI = COLOR_BTNFACE;
}
else if(uFlags & BF_SOFT)
{
