* win32.h: Remove the definitions for _UNION_NAME and _STRUCT_NAME.

	Must now include <windows.h> and not the pieces.
	* choose.cc (create_listview): Clean up type mismatch problems.
	* dialog.h (NEXT(id)): Ditto.
	* geturl.cc (dialog): Ditto.
	* install.cc (dialog): Ditto.
	* splash.cc (load_dialog): Ditto.

diff --git a/ChangeLog b/ChangeLog
index 23802a0126a10646d2d36a01c7a2423b46f05750..8039cb39aeb0f44a650fe6b47430ffd6e344231a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-04-18  Earnie Boyd  <earnie@users.sourceforge.net>
+
+       * win32.h: Remove the definitions for _UNION_NAME and _STRUCT_NAME.
+       Must now include <windows.h> and not the pieces.
+       * choose.cc (create_listview): Clean up type mismatch problems.
+       * dialog.h (NEXT(id)): Ditto.
+       * geturl.cc (dialog): Ditto.
+       * install.cc (dialog): Ditto.
+       * splash.cc (load_dialog): Ditto.
+
 Wed Apr 18 18:59:21 2001  Christopher Faylor <cgf@cygnus.com>
 
        * tar.cc (class gzbz): Define dummy virtual functions.

diff --git a/choose.cc b/choose.cc
index 258614c7ba44a8526326b8a13c3ee24272dd014f..5f2eeac2654f71e77c6a93d188b974e0aa8a1fb2 100644 (file)
--- a/choose.cc
+++ b/choose.cc
@@ -571,7 +571,7 @@ create_listview (HWND dlg, RECT *r)
                       r->left, r->top,
                       r->right-r->left+1, r->bottom-r->top+1,
                       dlg,
-                      MAKEINTRESOURCE(IDC_CHOOSE_LIST),
+                      (HMENU) MAKEINTRESOURCE(IDC_CHOOSE_LIST),
                       hinstance,
                       0);
   ShowWindow (lv, SW_SHOW);

diff --git a/dialog.h b/dialog.h
index 2de4cf55bdf6d48fc1f00aa7ad96b96cc1d1ef7c..44c6f9c3ab04a71f60a350b17be127399aad1ae8 100644 (file)
--- a/dialog.h
+++ b/dialog.h
@@ -44,7 +44,7 @@ D(do_splash);
 #undef D
 
 /* end this dialog and select the next.  Pass 0 to exit the program */
-#define NEXT(id) EndDialog(h, 0), next_dialog = id
+#define NEXT(id) EndDialog((HWND)h, 0), next_dialog = id
 
 /* Get the value of an EditText control.  Pass the previously stored
    value and it will free the memory if needed. */

diff --git a/geturl.cc b/geturl.cc
index f80a766f3638e682290b0117a57f8b1964d42c27..8e269a2003617c4a68e07952108e380cf1b89909 100644 (file)
--- a/geturl.cc
+++ b/geturl.cc
@@ -91,7 +91,7 @@ dialog (void *)
 {
   int rv = 0;
   MSG m;
-  HANDLE gw_dialog = CreateDialog (hinstance, MAKEINTRESOURCE (IDD_DLSTATUS),
+  HWND gw_dialog = CreateDialog (hinstance, MAKEINTRESOURCE (IDD_DLSTATUS),
                                   0, dialog_proc);
   ShowWindow (gw_dialog, SW_SHOWNORMAL);
   UpdateWindow (gw_dialog);

diff --git a/install.cc b/install.cc
index df10b25e1c705dc8c62077bdf1eef36970f76094..f81d10bd29172ef71fef6775d91591540d28dae0 100644 (file)
--- a/install.cc
+++ b/install.cc
@@ -99,7 +99,7 @@ dialog (void *)
 {
   int rv = 0;
   MSG m;
-  HANDLE ins_dialog = CreateDialog (hinstance, MAKEINTRESOURCE (IDD_INSTATUS),
+  HWND ins_dialog = CreateDialog (hinstance, MAKEINTRESOURCE (IDD_INSTATUS),
                                   0, dialog_proc);
   if (ins_dialog == 0)
     fatal ("create dialog");

diff --git a/splash.cc b/splash.cc
index d44d536dea119bb0f527c17a9b613ed902935c7f..2064271b0c4757ad9824e2a37fa4efbd67e56a1c 100644 (file)
--- a/splash.cc
+++ b/splash.cc
@@ -29,7 +29,7 @@ static void
 load_dialog (HWND h)
 {
   char buffer[100];
-  HANDLE v = GetDlgItem (h, IDC_VERSION);
+  HWND v = GetDlgItem (h, IDC_VERSION);
   sprintf (buffer, "Setup.exe version %s",
           version[0] ? version : "[unknown]");
   SetWindowText (v, buffer);

diff --git a/win32.h b/win32.h
index d6bd11ba819885b61633547cc570441b573abacb..323827c907bd73e10535d4aab971a27439d7bcc9 100644 (file)
--- a/win32.h
+++ b/win32.h
@@ -18,16 +18,12 @@
    so there's no point in parsing them all (even lean-n-mean).  Doing
    this cuts compile time in half. */
 
-#define _UNION_NAME(x)
-#define _STRUCT_NAME(x)
 #define NOCOMATTRIBUTE
 
 #include <stdarg.h>
-#include <windef.h>
-#include <basetyps.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <wininet.h>
 
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+#include <wininet.h>
 #include <windowsx.h>