Remove the rest of the Tweak look hack.

controls/edit.c

@@ -4374,13 +4374,8 @@ static LRESULT EDIT_WM_NCCreate(HWND hwnd, LPCREATESTRUCTW lpcs, BOOL unicode)
 		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;

controls/menu.c

@@ -831,15 +831,9 @@ static void MENU_DrawBitmapItem( HDC hdc, MENUITEM *lpitem, const RECT *rect, BO
     /* 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 @@ static void MENU_CalcItemSize( HDC hdc, MENUITEM *lpitem, HWND hwndOwner,
         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 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc,
     {
 	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 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc,
 
     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 @@ UINT WINAPI EnableMenuItem( HMENU hMenu, UINT wItemID, UINT wFlags )
     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;
 }

controls/uitools.c

@@ -466,15 +466,7 @@ static BOOL UITOOLS95_DrawRectEdge(HDC hdc, LPRECT rc,
         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 Bjrklund, 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)
     {

dlls/user/user_main.c

@@ -39,8 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(graphics);
 
 USER_DRIVER USER_Driver;
 
-WINE_LOOK TWEAK_WineLook = WIN95_LOOK;
-
 WORD USER_HeapSel = 0;  /* USER heap selector */
 HMODULE user32_module = 0;
 
@@ -151,37 +149,6 @@ static void palette_init(void)
 
 
 /***********************************************************************
- *           tweak_init
- */
-static void tweak_init(void)
-{
-    static const char *OS = "Win95";
-    char buffer[80];
-    HKEY hkey;
-    DWORD type, count = sizeof(buffer);
-
-    if (RegOpenKeyA( HKEY_LOCAL_MACHINE, "Software\\Wine\\Wine\\Config\\Tweak.Layout", &hkey ))
-        return;
-    if (RegQueryValueExA( hkey, "WineLook", 0, &type, buffer, &count ))
-        strcpy( buffer, "Win95" );  /* default value */
-    RegCloseKey( hkey );
-
-    /* WIN31_LOOK is default */
-    if (!strncasecmp( buffer, "Win95", 5 ))
-    {
-        TWEAK_WineLook = WIN95_LOOK;
-        OS = "Win95";
-    }
-    else if (!strncasecmp( buffer, "Win98", 5 ))
-    {
-        TWEAK_WineLook = WIN98_LOOK;
-        OS = "Win98";
-    }
-    TRACE("Using %s look and feel.\n", OS);
-}
-
-
-/***********************************************************************
  *           USER initialisation routine
  */
 static BOOL process_attach(void)
@@ -197,7 +164,6 @@ static BOOL process_attach(void)
     }
 
     /* Load the graphics driver */
-    tweak_init();
     if (!load_driver()) return FALSE;
 
     /* Initialize system colors and metrics */

documentation/PACKAGING

@@ -546,9 +546,6 @@ currently lacking. We need:
 	; get the stuff from the readonly installation and can write to our own.
 	Temp=t:\			(the TEMP directory)
 
-    * [Tweak.Layout]
-	WineLook=win95                (just the coolest look ;)
-
     * Possibly modify the [spooler], [serialports] and [parallelports] sections.
       FIXME: possibly more, including printer stuff.
 

documentation/configuring.sgml

@@ -362,11 +362,6 @@
                 <entry>Specifies locations of windows registry files</entry>
               </row>
               <row>
-                <entry>[tweak.layout]</entry>
-                <entry>recmd</entry>
-                <entry>Appearance of Wine</entry>
-              </row>
-              <row>
                 <entry>[programs]</entry>
                 <entry>no</entry>
                 <entry>Programs to be run automatically</entry>
@@ -660,7 +655,7 @@
         </sect3>
 
         <sect3 id="config-debug-etc">
-          <title>The [Debug], [Registry], [tweak.layout], and [programs] Sections</title>
+          <title>The [Debug], [Registry], and [programs] Sections</title>
           <para>
             [Debug] is used to include or exclude debug messages, and to
             output them to a file. The latter is rarely used. <emphasis>These
@@ -716,16 +711,6 @@
             The location of your old <filename>user.reg</filename> file.
           </para>
           <para>
-            [tweak.layout] is devoted to wine's look. There is only
-            one setting for it.
-          </para>
-          <para>
-            <programlisting>"WineLook" = "win31|win95|win98"</programlisting>
-            Will change the look of wine from Windows 3.1 to Windows 95.
-            The <literal>win98</literal> setting behaves
-            just like <literal>win95</literal> most of the time.
-          </para>
-          <para>
             [programs] can be used to say what programs run under
             special conditions.
           </para>
@@ -2616,39 +2601,6 @@ the [Version] section.
 &fonts;
 &printing;
 
-<sect1 id="config-win95look">
-<title>Win95/98 Look And Feel</title>
-<para>
-Instead of compiling Wine for Win3.1 vs. Win95 using
-<constant>#define</constant> switches, the code now looks in a
-special [Tweak.Layout] section of
-<filename>~/.wine/config</filename> for a
-<literal>"WineLook" = "Win95"</literal> or
-<literal>"WineLook" = "Win98"</literal> entry.
-</para>
-<para>
-A few new sections and a number of entries have been added to
-the <filename>~/.wine/config</filename> file -- these are for
-debugging the Win95 tweaks only and may be removed in a future
-release!  These entries/sections are:
-</para>
-<programlisting>
-[Tweak.Fonts]
-"System.Height" = "&lt;point size>"    # Sets the height of the system typeface
-"System.Bold" = "[true|false]"      # Whether the system font should be boldfaced
-"System.Italic" = "[true|false]"    # Whether the system font should be italicized
-"System.Underline" = "[true|false]" # Whether the system font should be underlined
-"System.StrikeOut" = "[true|false]" # Whether the system font should be struck out
-"OEMFixed.xxx"                  # Same parameters for the OEM fixed typeface
-"AnsiFixed.xxx"                 # Same parameters for the Ansi fixed typeface
-"AnsiVar.xxx"                   # Same parameters for the Ansi variable typeface
-"SystemFixed.xxx"               # Same parameters for the System fixed typeface
-
-[Tweak.Layout]
-"WineLook" = "[Win31|Win95|Win98]"  # Changes Wine's look and feel
-</programlisting>
-</sect1>
-
     <sect1 id="config-scsi-support">
       <title>SCSI Support</title>
       <para>

documentation/samples/config

@@ -196,12 +196,6 @@ WINE REGISTRY Version 2
 ; Save only modified keys
 "SaveOnlyUpdatedKeys" = "Y"
 
-[Tweak.Layout]
-;; supported styles are 'Win95'(default), 'Win98'
-;; this has *nothing* to do with the windows version Wine returns:
-;; set the "Windows" value in the [Version] section if you want that.
-"WineLook" = "Win95"
-
 [Clipboard]
 "ClearAllSelections" = "0"
 "PersistentSelection" = "1"

documentation/wine.conf.man

@@ -264,14 +264,6 @@ Used to specify which functions will be included in the snoop debug log.
 For Relay and Snoop <dllname>.* includes or excludes the whole dll. Exclude
 entries have priority over Include entries.
 .PP
-.B [Tweak.Layout]
-.br
-.I format: """WineLook""=""<Win31|Win95|Win98>"""
-.br
-default: "Win31"
-.br
-Use Win95-like window displays or Win3.1-like window displays.
-.PP
 .B [Registry]
 .br
 .I format: """LoadGlobalRegistryFiles""=""<boolean>"""

include/user.h

@@ -136,16 +136,6 @@ extern void USER_CheckNotLock(void);
 
 extern BOOL USER_IsExitingThread( DWORD tid );
 
-/* Wine look */
-
-typedef enum
-{
-    WIN95_LOOK,
-    WIN98_LOOK
-} WINE_LOOK;
-
-extern WINE_LOOK TWEAK_WineLook;
-
 /* gray brush cache */
 extern HBRUSH CACHE_GetPattern55AABrush(void);
 

programs/winecfg/En.rc

@@ -52,7 +52,6 @@ BEGIN
     LTEXT           "Windows Look:",IDC_STATIC,17,229,58,8
     COMBOBOX        IDC_WINVER,83,190,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_DOSVER,83,208,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_WINELOOK,83,226,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
 IDD_X11DRVCFG DIALOG DISCARDABLE  0, 0, 260, 250

programs/winecfg/Es.rc

@@ -28,7 +28,6 @@ FONT 8, "MS Sans Serif"
 BEGIN
     COMBOBOX        IDC_WINVER,83,153,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_DOSVER,83,172,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_WINELOOK,83,190,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Versin de Wine:",IDC_STATIC,119,17,45,8
     LTEXT           "CVS",IDC_WINEVER,169,17,56,8
     LTEXT           "Versin de Windows:",IDC_STATIC,17,155,58,8

programs/winecfg/Pt.rc

@@ -28,7 +28,6 @@ FONT 8, "MS Sans Serif"
 BEGIN
     COMBOBOX        IDC_WINVER,83,153,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_DOSVER,83,172,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_WINELOOK,83,190,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Verso do Wine:",IDC_STATIC,119,17,45,8
     LTEXT           "CVS",IDC_WINEVER,169,17,56,8
     LTEXT           "Verso do Windows:",IDC_STATIC,17,155,58,8

programs/winecfg/Ru.rc

@@ -38,7 +38,6 @@ FONT 8, "MS Sans Serif"
 BEGIN
     COMBOBOX        IDC_WINVER,83,153,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_DOSVER,83,172,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_WINELOOK,83,190,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           " Wine:",IDC_STATIC,119,17,45,8
     LTEXT           "CVS",IDC_WINEVER,169,17,56,8
     LTEXT           " Windows:",IDC_STATIC,17,155,58,8

programs/winecfg/Si.rc

@@ -28,7 +28,6 @@ FONT 8, "MS Sans Serif"
 BEGIN
     COMBOBOX        IDC_WINVER,83,153,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_DOSVER,83,172,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_WINELOOK,83,190,158,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Wine Version:",IDC_STATIC,119,17,45,8
     LTEXT           "CVS",IDC_WINEVER,169,17,56,8
     LTEXT           "Windows Version:",IDC_STATIC,17,155,58,8

programs/winecfg/properties.c

@@ -46,14 +46,6 @@ static VERSION_DESC sDOSVersions[] = {
     {"", ""}
 };
 
-static VERSION_DESC sWineLook[] = {
-    {"", "Use default(Global setting)"},
-    {"win31", "Windows 3.1"},
-    {"win95", "Windows 95"},
-    {"win98", "Windows 98"},
-    {"", ""}
-};
-
 #if 0
 static VERSION_DESC sWineDrivers[] = {
     {"x11drv", "X11 Interface"},
@@ -111,14 +103,6 @@ VERSION_DESC* getDOSVersions(void)
 
 /*****************************************************************************
  */
-VERSION_DESC* getWinelook(void)
-{
-    return sWineLook;
-}
-
-
-/*****************************************************************************
- */
 DLL_DESC* getDLLDefaults(void)
 {
     return sDLLType;

programs/winecfg/properties.h

@@ -89,7 +89,6 @@ typedef struct
 
 VERSION_DESC *getWinVersions(void);
 VERSION_DESC *getDOSVersions(void);
-VERSION_DESC *getWinelook(void);
 DLL_DESC *getDLLDefaults(void);
 AUDIO_DRIVER *getAudioDrivers(void);
 char* getVersionFromDescription(VERSION_DESC *pVer, char *desc);

programs/winecfg/resource.h

@@ -41,7 +41,6 @@
 #define IDC_APPLYBTN                    1002
 #define IDC_WINEVER                     1011
 #define IDC_WINVER                      1012
-#define IDC_WINELOOK                    1013
 #define IDC_DOSVER                      1014
 #define IDC_SYSCOLORS                   1017
 #define IDC_PRIVATEMAP                  1018

programs/winecfg/winecfg.c

@@ -34,7 +34,6 @@
  *   - Make the desktop size UI a combo box, with a Custom option, so it's more obvious what you might want to choose here
  *
  * BUGS:
- *   - WineLook default fallback doesn't work
  *   - x11drv page triggers key writes on entry
  *
  */