[Perl-win32-gui-cvscommit] Win32-GUI CHANGELOG,1.76,1.77 DC.xs,1.12,1.13 GUI.xs,1.53,1.54 GUI_Helpers.cpp,1.17,1.18 GUI_Options.cpp,1.13,1.14 Makefile.PL,1.18,1.19 TYPEMAP,1.7,1.8 TreeView.xs,1.7,1.8

[Robert M. <rob...@us...>]

Update of /cvsroot/perl-win32-gui/Win32-GUI
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1621

Modified Files:
	CHANGELOG DC.xs GUI.xs GUI_Helpers.cpp GUI_Options.cpp 
	Makefile.PL TYPEMAP TreeView.xs 
Log Message:
Clean build under Cygwin

Index: GUI.xs
===================================================================
RCS file: /cvsroot/perl-win32-gui/Win32-GUI/GUI.xs,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** GUI.xs	12 Apr 2006 19:49:21 -0000	1.53
--- GUI.xs	13 Apr 2006 22:17:07 -0000	1.54
***************
*** 478,482 ****
              if(strcmp(option, "-instance") == 0) {
                  next_i = i + 1;
!                 hInstance = (HINSTANCE) SvIV(ST(next_i));
              }
              if(strcmp(option, "-data") == 0) {
--- 478,482 ----
              if(strcmp(option, "-instance") == 0) {
                  next_i = i + 1;
!                 hInstance = INT2PTR(HINSTANCE,SvIV(ST(next_i)));
              }
              if(strcmp(option, "-data") == 0) {
***************
*** 705,709 ****
                      t = hv_fetch_mg(NOTXSCALL perlcs.hvParent, "-tooltip", 8, 0);
                      if(t != NULL && SvOK( *t )) {
!                         perlcs.hTooltip = (HWND) SvIV(*t);
                      }
                  }
--- 705,709 ----
                      t = hv_fetch_mg(NOTXSCALL perlcs.hvParent, "-tooltip", 8, 0);
                      if(t != NULL && SvOK( *t )) {
!                         perlcs.hTooltip = INT2PTR(HWND,SvIV(*t));
                      }
                  }
***************
*** 1434,1440 ****
--- 1434,1443 ----
      bitmap = (HBITMAP) LoadImage((HINSTANCE) moduleHandle, filename, iType, iX, iY, LR_DEFAULTCOLOR);
      // Try OEM ressource
+     /* Can't use filename (a string pointer) as a resource id - should be able to use
+      * a filename like '#1' to get resource from EXE - TODO: test this
      if(bitmap == NULL) {
          bitmap = (HBITMAP) LoadImage((HINSTANCE) NULL, MAKEINTRESOURCE(filename), iType, iX, iY, LR_DEFAULTCOLOR);
      }
+     */
      if(bitmap == NULL) {
          // Ok, that failed. So attempt to load from file:
***************
*** 3695,3699 ****
          RETVAL = -1;
      } else {
!         hdc = (HDC) SvIV(*tmp);
          if(hmeta = GetEnhMetaFile(filename)) {
              GetClientRect(handle, &rect);
--- 3698,3702 ----
          RETVAL = -1;
      } else {
!         hdc = INT2PTR(HDC,SvIV(*tmp));
          if(hmeta = GetEnhMetaFile(filename)) {
              GetClientRect(handle, &rect);
***************
*** 3779,3783 ****
          RETVAL = 0;
      } else {
!         hdc = (HDC) SvIV(*tmp);
          iWidthMM = GetDeviceCaps(hdc, HORZSIZE);
          iHeightMM = GetDeviceCaps(hdc, VERTSIZE);
--- 3782,3786 ----
          RETVAL = 0;
      } else {
!         hdc = INT2PTR(HDC,SvIV(*tmp));
          iWidthMM = GetDeviceCaps(hdc, HORZSIZE);
          iHeightMM = GetDeviceCaps(hdc, VERTSIZE);
***************
*** 3921,3925 ****
          RETVAL = -1;
      } else {
!         hdc = (HDC) SvIV(*tmp);
          textlen = strlen(text);
          RETVAL = (long) TextOut(hdc, x, y, text, textlen);
--- 3924,3928 ----
          RETVAL = -1;
      } else {
!         hdc = INT2PTR(HDC,SvIV(*tmp));
          textlen = strlen(text);
          RETVAL = (long) TextOut(hdc, x, y, text, textlen);
***************
*** 3942,3946 ****
          RETVAL = -1;
      } else {
!         hdc = (HDC) SvIV(*tmp);
          RETVAL = SetTextColor(hdc, color);
      }
--- 3945,3949 ----
          RETVAL = -1;
      } else {
!         hdc = INT2PTR(HDC,SvIV(*tmp));
          RETVAL = SetTextColor(hdc, color);
      }
***************
*** 3961,3965 ****
          RETVAL = -1;
      } else {
!         hdc = (HDC) SvIV(*tmp);
          RETVAL = GetTextColor(hdc);
      }
--- 3964,3968 ----
          RETVAL = -1;
      } else {
!         hdc = INT2PTR(HDC,SvIV(*tmp));
          RETVAL = GetTextColor(hdc);
      }
***************
*** 3981,3985 ****
          RETVAL = -1;
      } else {
!         hdc = (HDC) SvIV(*tmp);
          RETVAL = (long) SetBkMode(hdc, mode);
      }
--- 3984,3988 ----
          RETVAL = -1;
      } else {
!         hdc = INT2PTR(HDC,SvIV(*tmp));
          RETVAL = (long) SetBkMode(hdc, mode);
      }
***************
*** 4000,4004 ****
          RETVAL = -1;
      } else {
!         hdc = (HDC) SvIV(*tmp);
          RETVAL = GetBkMode(hdc);
      }
--- 4003,4007 ----
          RETVAL = -1;
      } else {
!         hdc = INT2PTR(HDC,SvIV(*tmp));
          RETVAL = GetBkMode(hdc);
      }
***************
*** 4021,4025 ****
          RETVAL = -1;
      } else {
!         hdc = (HDC) SvIV(*tmp);
          RETVAL = MoveToEx(hdc, x, y, NULL);
      }
--- 4024,4028 ----
          RETVAL = -1;
      } else {
!         hdc = INT2PTR(HDC,SvIV(*tmp));
          RETVAL = MoveToEx(hdc, x, y, NULL);
      }
***************
*** 4044,4048 ****
          RETVAL = -1;
      } else {
!         hdc = (HDC) SvIV(*tmp);
          if(height == -1) {
              width *= 2;
--- 4047,4051 ----
          RETVAL = -1;
      } else {
!         hdc = INT2PTR(HDC,SvIV(*tmp));
          if(height == -1) {
              width *= 2;
***************
*** 4070,4074 ****
          RETVAL = -1;
      } else {
!         hdc = (HDC) SvIV(*tmp);
          RETVAL = LineTo(hdc, x, y);
      }
--- 4073,4077 ----
          RETVAL = -1;
      } else {
!         hdc = INT2PTR(HDC,SvIV(*tmp));
          RETVAL = LineTo(hdc, x, y);
      }
***************
*** 4108,4112 ****
      char tmprgb[16];
      self = (HV*) SvRV(ST(0));
!     hwnd = (HWND) SvIV(*hv_fetch(self, "-handle", 7, 0));
      if(hwnd) {
          if(hdc = BeginPaint(hwnd, &ps)) {
--- 4111,4115 ----
      char tmprgb[16];
      self = (HV*) SvRV(ST(0));
!     hwnd = INT2PTR(HWND,SvIV(*hv_fetch(self, "-handle", 7, 0)));
      if(hwnd) {
          if(hdc = BeginPaint(hwnd, &ps)) {
***************
*** 4147,4154 ****
          tmp = hv_fetch(self, "-handle", 7, 0);
          if(tmp == NULL) XSRETURN_NO;
!         hwnd = (HWND) SvIV(*tmp);
          tmp = hv_fetch(self, "-ps.hdc", 7, 0);
          if(tmp == NULL) XSRETURN_NO;
!         ps.hdc = (HDC) SvIV(*tmp);
          tmp = hv_fetch(self, "-ps.fErase", 10, 0);
          if(tmp == NULL) XSRETURN_NO;
--- 4150,4157 ----
          tmp = hv_fetch(self, "-handle", 7, 0);
          if(tmp == NULL) XSRETURN_NO;
!         hwnd = INT2PTR(HWND,SvIV(*tmp));
          tmp = hv_fetch(self, "-ps.hdc", 7, 0);
          if(tmp == NULL) XSRETURN_NO;
!         ps.hdc = INT2PTR(HDC,SvIV(*tmp));
          tmp = hv_fetch(self, "-ps.fErase", 10, 0);
          if(tmp == NULL) XSRETURN_NO;
***************
*** 5083,5087 ****
                  next_i = i + 1;
                  if(SvIOK(ST(next_i))) {
!                     bi.pidlRoot = (LPCITEMIDLIST) SvIV(ST(next_i));
                  } else {
                      SHGetDesktopFolder(&pDesktopFolder);
--- 5086,5090 ----
                  next_i = i + 1;
                  if(SvIOK(ST(next_i))) {
!                     bi.pidlRoot = INT2PTR(LPCITEMIDLIST,SvIV(ST(next_i)));
                  } else {
                      SHGetDesktopFolder(&pDesktopFolder);
***************
*** 5682,5686 ****
          parentmenu = hv_fetch((HV*)SvRV((ST(0))), "-menu", 5, 0);
          if(parentmenu != NULL) {
!             hMenu = (HMENU) SvIV(*parentmenu);
              myItem = SvIV(*(hv_fetch((HV*)SvRV(ST(0)), "-id", 3, 0)));
          } else {
--- 5685,5689 ----
          parentmenu = hv_fetch((HV*)SvRV((ST(0))), "-menu", 5, 0);
          if(parentmenu != NULL) {
!             hMenu = INT2PTR(HMENU,SvIV(*parentmenu));
              myItem = SvIV(*(hv_fetch((HV*)SvRV(ST(0)), "-id", 3, 0)));
          } else {
***************
*** 5724,5728 ****
          parentmenu = hv_fetch((HV*)SvRV((ST(0))), "-menu", 5, 0);
          if(parentmenu != NULL) {
!             hMenu = (HMENU) SvIV(*parentmenu);
              myItem = SvIV(*(hv_fetch((HV*)SvRV(ST(0)), "-id", 3, 0)));
              i = 1;
--- 5727,5731 ----
          parentmenu = hv_fetch((HV*)SvRV((ST(0))), "-menu", 5, 0);
          if(parentmenu != NULL) {
!             hMenu = INT2PTR(HMENU,SvIV(*parentmenu));
              myItem = SvIV(*(hv_fetch((HV*)SvRV(ST(0)), "-id", 3, 0)));
              i = 1;
***************
*** 5771,5775 ****
          parentmenu = hv_fetch((HV*)SvRV((ST(0))), "-menu", 5, 0);
          if(parentmenu != NULL) {
!             hMenu = (HMENU) SvIV(*parentmenu);
              myItem = SvIV(*(hv_fetch((HV*)SvRV(ST(0)), "-id", 3, 0)));
              i = 1;
--- 5774,5778 ----
          parentmenu = hv_fetch((HV*)SvRV((ST(0))), "-menu", 5, 0);
          if(parentmenu != NULL) {
!             hMenu = INT2PTR(HMENU,SvIV(*parentmenu));
              myItem = SvIV(*(hv_fetch((HV*)SvRV(ST(0)), "-id", 3, 0)));
              i = 1;

Index: Makefile.PL
===================================================================
RCS file: /cvsroot/perl-win32-gui/Win32-GUI/Makefile.PL,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Makefile.PL	12 Apr 2006 20:00:06 -0000	1.18
--- Makefile.PL	13 Apr 2006 22:17:07 -0000	1.19
***************
*** 375,378 ****
--- 375,382 ----
  	$(NOECHO) $(PERL) -I$(BUILD_TOOLS) $(BUILD_TOOLS)/doHTMLDocs.pl
  
+ demos:
+ 	$(MKPATH) $(INST_DEMO)
+ 	-$(CP) samples/* $(INST_DEMO)
+ 
  all:: poddocs demos
  
***************
*** 387,394 ****
  # -- Win32::GUI ppm section --
  
- demos:
- 	$(MKPATH) $(INST_DEMO)
- 	$(CP) samples/* $(INST_DEMO)
- 
  ppmdist: all htmldocs
  	$(TAR) --exclude="*.pod" -$(TARFLAGS) $(DISTNAME).tar blib
--- 391,394 ----

Index: CHANGELOG
===================================================================
RCS file: /cvsroot/perl-win32-gui/Win32-GUI/CHANGELOG,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** CHANGELOG	12 Apr 2006 20:00:05 -0000	1.76
--- CHANGELOG	13 Apr 2006 22:17:07 -0000	1.77
***************
*** 6,9 ****
--- 6,19 ----
  Win32-GUI ChangeLog
  ===================
+ + [Robert May] : 13 Apr 2006 - Clean build under Cygwin
+     - TYPEMAP corrected various entries to use INT2PTR and PTR2INT
+       macros to eliminate warnings of casting to/from pointers with
+       different sizes.
+     - DC.xs, GUI.xs, GUI_Helpers.cpp, GUI_Options.cpp, TreeView.xs
+       used INT2PTR and PTR2INT wherever necessary to silence
+       compiler warnings.
+     - Makefile.PL corrected location of demos target, so that demos
+       are installed under cygwin
+ 
  + [Robert May] : 12 Apr 2006 - Start of DropFiles integration
      - GUI.pm Add Acceptfiles method and documentation.

Index: GUI_Helpers.cpp
===================================================================
RCS file: /cvsroot/perl-win32-gui/Win32-GUI/GUI_Helpers.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** GUI_Helpers.cpp	16 Mar 2006 21:11:11 -0000	1.17
--- GUI_Helpers.cpp	13 Apr 2006 22:17:07 -0000	1.18
***************
*** 166,173 ****
              pHv = hv_fetch_mg(NOTXSCALL (HV*) SvRV(pSv), "-handle", 7, 0);
              if(pHv != NULL) {
!                 hReturn = (HWND) SvIV(*pHv);
              }
          } else {
!             hReturn = (HWND) SvIV(pSv);
          }
      }
--- 166,173 ----
              pHv = hv_fetch_mg(NOTXSCALL (HV*) SvRV(pSv), "-handle", 7, 0);
              if(pHv != NULL) {
!                 hReturn = INT2PTR(HWND,SvIV(*pHv));
              }
          } else {
!             hReturn = INT2PTR(HWND,SvIV(pSv));
          }
      }
***************
*** 210,214 ****
      wndproc = hv_fetch_mg(NOTXSCALL hash, (char*) Name, strlen(Name), FALSE);
      if(wndproc == NULL) return NULL;
!     return (WNDPROC) SvIV(*wndproc);
  }
  
--- 210,214 ----
      wndproc = hv_fetch_mg(NOTXSCALL hash, (char*) Name, strlen(Name), FALSE);
      if(wndproc == NULL) return NULL;
!     return INT2PTR(WNDPROC,SvIV(*wndproc));
  }
  
***************
*** 294,298 ****
      t = hv_fetch_mg(NOTXSCALL parent, "-handle", 7, 0);
      if(t != NULL) {
!         hParent = (HWND) SvIV(*t);
      } else {
          return NULL;
--- 294,298 ----
      t = hv_fetch_mg(NOTXSCALL parent, "-handle", 7, 0);
      if(t != NULL) {
!         hParent = INT2PTR(HWND,SvIV(*t));
      } else {
          return NULL;
***************
*** 431,435 ****
      handle = hv_fetch(hash, temp, strlen(temp), FALSE);
      if(handle == NULL) return NULL;
!     return (HMENU) SvIV(*handle);
  }
  
--- 431,435 ----
      handle = hv_fetch(hash, temp, strlen(temp), FALSE);
      if(handle == NULL) return NULL;
!     return INT2PTR(HMENU,SvIV(*handle));
  }
  

Index: TreeView.xs
===================================================================
RCS file: /cvsroot/perl-win32-gui/Win32-GUI/TreeView.xs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TreeView.xs	16 Mar 2006 21:11:12 -0000	1.7
--- TreeView.xs	13 Apr 2006 22:17:07 -0000	1.8
***************
*** 1101,1105 ****
      else
          RETVAL = TreeView_Expand(handle,
!                                  (HTREEITEM) SvIV(ST(1)),
                                   TVE_COLLAPSE | TVE_COLLAPSERESET);
  OUTPUT:
--- 1101,1105 ----
      else
          RETVAL = TreeView_Expand(handle,
!                                  INT2PTR(HTREEITEM,SvIV(ST(1))),
                                   TVE_COLLAPSE | TVE_COLLAPSERESET);
  OUTPUT:

Index: GUI_Options.cpp
===================================================================
RCS file: /cvsroot/perl-win32-gui/Win32-GUI/GUI_Options.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** GUI_Options.cpp	12 Apr 2006 20:00:06 -0000	1.13
--- GUI_Options.cpp	13 Apr 2006 22:17:07 -0000	1.14
***************
*** 181,185 ****
              } else if(strcmp(option, "-instance") == 0) {
                  next_i = i + 1;
!                 perlcs->cs.hInstance = (HINSTANCE) SvIV(ST(next_i));
              } else if(strcmp(option, "-name") == 0) {
                  next_i = i + 1;
--- 181,185 ----
              } else if(strcmp(option, "-instance") == 0) {
                  next_i = i + 1;
!                 perlcs->cs.hInstance = INT2PTR(HINSTANCE,SvIV(ST(next_i)));
              } else if(strcmp(option, "-name") == 0) {
                  next_i = i + 1;
***************
*** 760,764 ****
              } else if(strcmp(option, "-hinst") == 0) {
                  next_i = i + 1;
!                 ti->hinst = (HINSTANCE) SvIV(ST(next_i));
              } else if(strcmp(option, "-flags") == 0) {
                  next_i = i + 1;
--- 760,764 ----
              } else if(strcmp(option, "-hinst") == 0) {
                  next_i = i + 1;
!                 ti->hinst = INT2PTR(HINSTANCE,SvIV(ST(next_i)));
              } else if(strcmp(option, "-flags") == 0) {
                  next_i = i + 1;

Index: TYPEMAP
===================================================================
RCS file: /cvsroot/perl-win32-gui/Win32-GUI/TYPEMAP,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TYPEMAP	16 Mar 2006 21:11:12 -0000	1.7
--- TYPEMAP	13 Apr 2006 22:17:07 -0000	1.8
***************
*** 13,17 ****
  HPEN         T_HANDLE
  HRGN         T_HANDLE
! HTREEITEM    T_IV
  LONG         T_IV
  LPCTSTR      T_PV
--- 13,17 ----
  HPEN         T_HANDLE
  HRGN         T_HANDLE
! HTREEITEM    T_PTR
  LONG         T_IV
  LPCTSTR      T_PV
***************
*** 23,33 ****
  LPARAM       T_LPARAM
  LRESULT      T_IV
! HINSTANCE    T_IV
  COLORREF     T_COLOR
  LPCSTR       T_PV
! HENHMETAFILE T_IV
  FLOAT        T_FLOAT
  LPVOID       T_PV
! HACCEL       T_IV
  
  ################################################################################
--- 23,33 ----
  LPARAM       T_LPARAM
  LRESULT      T_IV
! HINSTANCE    T_PTR
  COLORREF     T_COLOR
  LPCSTR       T_PV
! HENHMETAFILE T_PTR
  FLOAT        T_FLOAT
  LPVOID       T_PV
! HACCEL       T_PTR
  
  ################################################################################
***************
*** 37,45 ****
          SV** out=hv_fetch((HV*)SvRV($arg), \"-handle\", 7, 0);
          if(out != NULL)
!             $var = ($type) SvIV(*out);
          else
              $var = NULL;
      } else
!        $var = ($type) SvIV($arg);
  
  T_COLOR
--- 37,45 ----
          SV** out=hv_fetch((HV*)SvRV($arg), \"-handle\", 7, 0);
          if(out != NULL)
!             $var = INT2PTR($type,SvIV(*out));
          else
              $var = NULL;
      } else
!        $var = INT2PTR($type,SvIV($arg));
  
  T_COLOR
***************
*** 53,57 ****
  OUTPUT
  T_HANDLE
!     sv_setiv($arg, (IV) $var);
  T_COLOR
      sv_setiv($arg, (IV) $var);
--- 53,57 ----
  OUTPUT
  T_HANDLE
!     sv_setiv($arg, PTR2IV($var));
  T_COLOR
      sv_setiv($arg, (IV) $var);

Index: DC.xs
===================================================================
RCS file: /cvsroot/perl-win32-gui/Win32-GUI/DC.xs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** DC.xs	25 Aug 2005 19:30:17 -0000	1.12
--- DC.xs	13 Apr 2006 22:17:07 -0000	1.13
***************
*** 949,953 ****
              window = hv_fetch_mg(NOTXSCALL self, "-window", 7, 0);
              if(window != NULL) {
!                 hwnd = (HWND) SvIV(*window);
              } else {
                  XSRETURN_UNDEF;
--- 949,953 ----
              window = hv_fetch_mg(NOTXSCALL self, "-window", 7, 0);
              if(window != NULL) {
!                 hwnd = INT2PTR(HWND,SvIV(*window));
              } else {
                  XSRETURN_UNDEF;
***************
*** 1003,1007 ****
              window = hv_fetch_mg(NOTXSCALL self, szKey, strlen(szKey), 0);
              if(window != NULL) {
!                 hwnd = (HWND) SvIV(*window);
              } else {
                  XSRETURN_NO;
--- 1003,1007 ----
              window = hv_fetch_mg(NOTXSCALL self, szKey, strlen(szKey), 0);
              if(window != NULL) {
!                 hwnd = INT2PTR(HWND,SvIV(*window));
              } else {
                  XSRETURN_NO;