Clean up sizetip patch: remove separate header file and // comments

[originally from svn r278]

putty.h

@@ -262,6 +262,12 @@ void safefree(void *);
  */
 extern char ver[];
 
+/*
+ * Exports from sizetip.c.
+ */
+void UpdateSizeTip(HWND src, int cx, int cy);
+void EnableSizeTip(int bEnable);
+
 /*
  * Exports from xlat.c.
  */

sizetip.c

@@ -1,4 +1,3 @@
-
 #include <windows.h>
 #include <winreg.h>
 #include <tchar.h>
@@ -98,7 +97,7 @@ void UpdateSizeTip(HWND src, int cx, int cy)
     if (!tip_wnd) {
         NONCLIENTMETRICS nci;
 
-        // First make sure the window class is registered
+        /* First make sure the window class is registered */
 
         if (!tip_class) {
             WNDCLASS wc;
@@ -116,13 +115,15 @@ void UpdateSizeTip(HWND src, int cx, int cy)
             tip_class = RegisterClass(&wc);
         }
 
-//        // Default values based on Windows Standard color scheme
-//
-//        tip_font = GetStockObject(SYSTEM_FONT);
-//        tip_bg = RGB(255, 255, 225);
-//        tip_text = RGB(0, 0, 0);
+#if 0
+        /* Default values based on Windows Standard color scheme */
 
-        // Prepare other GDI objects and drawing info
+        tip_font = GetStockObject(SYSTEM_FONT);
+        tip_bg = RGB(255, 255, 225);
+        tip_text = RGB(0, 0, 0);
+#endif
+
+        /* Prepare other GDI objects and drawing info */
 
         tip_bg = GetSysColor(COLOR_INFOBK);
         tip_text = GetSysColor(COLOR_INFOTEXT);
@@ -133,7 +134,7 @@ void UpdateSizeTip(HWND src, int cx, int cy)
         tip_font = CreateFontIndirect(&nci.lfStatusFont);
     }
 
-    // Generate the tip text
+    /* Generate the tip text */
 
     _sntprintf(str, 16, "%dx%d", cx, cy);
 
@@ -144,7 +145,7 @@ void UpdateSizeTip(HWND src, int cx, int cy)
         RECT wr;
         int ix, iy;
 
-        // calculate the tip's size
+        /* calculate the tip's size */
 
         hdc = CreateCompatibleDC(NULL);
         GetTextExtentPoint32(hdc, str, _tcslen(str), &sz);
@@ -158,7 +159,7 @@ void UpdateSizeTip(HWND src, int cx, int cy)
         iy = wr.top - sz.cy;
         if (iy<16) iy = 16;
 
-        // Create the tip window
+        /* Create the tip window */
 
         tip_wnd = CreateWindowEx(WS_EX_TOOLWINDOW|WS_EX_TOPMOST, MAKEINTRESOURCE(tip_class), str, WS_POPUP,
 				 ix, iy, sz.cx, sz.cy,
@@ -168,7 +169,7 @@ void UpdateSizeTip(HWND src, int cx, int cy)
 
     } else {
 
-        // Tip already exists, just set the text
+        /* Tip already exists, just set the text */
 
         SetWindowText(tip_wnd, str);
     }

sizetip.h

@@ -1,2 +0,0 @@
-void UpdateSizeTip(HWND src, int cx, int cy);
-void EnableSizeTip(int bEnable);

window.c

@@ -7,7 +7,6 @@
 #define PUTTY_DO_GLOBALS		       /* actually _define_ globals */
 #include "putty.h"
 #include "win_res.h"
-#include "sizetip.h"
 
 #define IDM_SHOWLOG   0x0010
 #define IDM_NEWSESS   0x0020