Hello community,
here is the log from the commit of package fox16 for openSUSE:Factory checked
in at 2013-09-16 12:35:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fox16 (Old)
and /work/SRC/openSUSE:Factory/.fox16.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fox16"
Changes:
--------
--- /work/SRC/openSUSE:Factory/fox16/fox16.changes 2013-01-24
09:55:19.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.fox16.new/fox16.changes 2013-09-16
12:35:57.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Sep 16 07:05:07 UTC 2013 - l...@linux-schulserver.de
+
+- update to 1.6.49:
+ + Check index out of bounds in FXTabBook::setCurrent().
+
+-------------------------------------------------------------------
Old:
----
fox-1.6.47.tar.bz2
New:
----
fox-1.6.49.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fox16.spec ++++++
--- /var/tmp/diff_new_pack.0gHOJK/_old 2013-09-16 12:35:57.000000000 +0200
+++ /var/tmp/diff_new_pack.0gHOJK/_new 2013-09-16 12:35:57.000000000 +0200
@@ -17,7 +17,7 @@
Name: fox16
-Version: 1.6.47
+Version: 1.6.49
Release: 0
Summary: Shared Libraries for the FOX Toolkit
License: LGPL-2.1+
++++++ fox-1.6.47.tar.bz2 -> fox-1.6.49.tar.bz2 ++++++
++++ 6434 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/fox-1.6.47/chart/FXChart.cpp new/fox-1.6.49/chart/FXChart.cpp
--- old/fox-1.6.47/chart/FXChart.cpp 2012-11-14 17:56:11.000000000 +0100
+++ new/fox-1.6.49/chart/FXChart.cpp 2013-04-07 20:51:42.000000000 +0200
@@ -359,7 +359,7 @@
// Request for clipboard data
long FXChart::onClipboardRequest(FXObject *sender,FXSelector sel,void *ptr){
FXEvent *event=(FXEvent*)ptr;
- unsigned long size;
+ FXuval size;
FXuchar *data;
// Try handling it in base class first
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/fox-1.6.47/configure.ac new/fox-1.6.49/configure.ac
--- old/fox-1.6.47/configure.ac 2012-11-14 17:56:11.000000000 +0100
+++ new/fox-1.6.49/configure.ac 2013-04-07 20:51:50.000000000 +0200
@@ -1,7 +1,7 @@
# Version of the code
m4_define([fox_major], [1])
m4_define([fox_minor], [6])
-m4_define([fox_level], [47])
+m4_define([fox_level], [49])
m4_define([fox_version],[fox_major.fox_minor.fox_level])
# Init
@@ -110,7 +110,7 @@
# Add copious amounts of debugging with gcc
if test "${GXX}" = "yes" ; then
CXXFLAGS="${CXXFLAGS} -Wall -Wformat -Woverloaded-virtual -Wshadow"
- LDFLAGS="-rdynamic ${LDFLAGS}"
+ #LDFLAGS="-rdynamic ${LDFLAGS}"
fi
# Debugging turned on
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/fox-1.6.47/include/fxdefs.h new/fox-1.6.49/include/fxdefs.h
--- old/fox-1.6.47/include/fxdefs.h 2012-11-14 17:56:11.000000000 +0100
+++ new/fox-1.6.49/include/fxdefs.h 2013-04-07 20:51:42.000000000 +0200
@@ -388,6 +388,9 @@
#if defined(_MSC_VER) && defined(_WIN64)
typedef __int64 FXival;
typedef unsigned __int64 FXuval;
+#elif defined(__GNUC__) && defined(_WIN64)
+typedef long long FXival;
+typedef unsigned long long FXuval;
#else
typedef long FXival;
typedef unsigned long FXuval;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/fox-1.6.47/include/fxver.h new/fox-1.6.49/include/fxver.h
--- old/fox-1.6.47/include/fxver.h 2012-11-14 18:00:06.000000000 +0100
+++ new/fox-1.6.49/include/fxver.h 2013-04-07 21:12:36.000000000 +0200
@@ -5,7 +5,7 @@
// FOX version
#define FOX_MAJOR 1
#define FOX_MINOR 6
-#define FOX_LEVEL 47
+#define FOX_LEVEL 49
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/fox-1.6.47/missing new/fox-1.6.49/missing
--- old/fox-1.6.47/missing 2010-11-20 04:20:16.000000000 +0100
+++ new/fox-1.6.49/missing 2012-09-18 04:53:51.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-01-06.13; # UTC
# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -84,7 +84,6 @@
help2man touch the output file
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
- tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
@@ -122,15 +121,6 @@
# Not GNU programs, they don't have --version.
;;
- tar*)
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- exit 1
- fi
- ;;
-
*)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
@@ -226,7 +216,7 @@
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
if test $# -ne 1; then
- eval LASTARG="\${$#}"
+ eval LASTARG=\${$#}
case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -256,7 +246,7 @@
\`Flex' from any GNU archive site."
rm -f lex.yy.c
if test $# -ne 1; then
- eval LASTARG="\${$#}"
+ eval LASTARG=\${$#}
case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
@@ -318,41 +308,6 @@
touch $file
;;
- tar*)
- shift
-
- # We have already tried tar in the generic part.
- # Look for gnutar/gtar before invocation to avoid ugly error
- # messages.
- if (gnutar --version > /dev/null 2>&1); then
- gnutar "$@" && exit 0
- fi
- if (gtar --version > /dev/null 2>&1); then
- gtar "$@" && exit 0
- fi
- firstarg="$1"
- if shift; then
- case $firstarg in
- *o*)
- firstarg=`echo "$firstarg" | sed s/o//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- case $firstarg in
- *h*)
- firstarg=`echo "$firstarg" | sed s/h//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- fi
-
- echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
- You may want to install GNU tar or Free paxutils, or check the
- command line arguments."
- exit 1
- ;;
-
*)
echo 1>&2 "\
WARNING: \`$1' is needed, and is $msg.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/fox-1.6.47/shutterbug/ShutterBug.cpp
new/fox-1.6.49/shutterbug/ShutterBug.cpp
--- old/fox-1.6.47/shutterbug/ShutterBug.cpp 2012-11-14 17:56:11.000000000
+0100
+++ new/fox-1.6.49/shutterbug/ShutterBug.cpp 2013-04-07 20:51:42.000000000
+0200
@@ -633,7 +633,7 @@
// Somebody wants our selection
long ShutterBug::onClipboardRequest(FXObject* sender,FXSelector sel,void* ptr){
FXEvent *event=(FXEvent*)ptr;
- unsigned long size;
+ FXuval size;
FXuchar *data;
FXTRACE((1,"%s::onClipboardRequest \n",getClassName()));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/fox-1.6.47/src/FXDCWindow.cpp new/fox-1.6.49/src/FXDCWindow.cpp
--- old/fox-1.6.47/src/FXDCWindow.cpp 2012-11-14 17:56:11.000000000 +0100
+++ new/fox-1.6.49/src/FXDCWindow.cpp 2013-04-07 20:51:42.000000000 +0200
@@ -2190,12 +2190,12 @@
if(stipple){
lb.lbStyle=BS_PATTERN;
lb.lbColor=devfg;
- lb.lbHatch=(LONG)stipple->id(); // This should be a HBITMAP
+ lb.lbHatch=(FXuval)stipple->id(); // This should be a HBITMAP
}
else if(pattern>=STIPPLE_0 && pattern<=STIPPLE_16){
lb.lbStyle=BS_PATTERN;
lb.lbColor=devfg;
- lb.lbHatch=(LONG)getApp()->stipples[pattern];
+ lb.lbHatch=(FXuval)getApp()->stipples[pattern];
}
else{
lb.lbStyle=BS_HATCHED;
@@ -2207,12 +2207,12 @@
if(stipple){
lb.lbStyle=BS_PATTERN;
lb.lbColor=devfg;
- lb.lbHatch=(LONG)stipple->id(); // This should be a HBITMAP
+ lb.lbHatch=(FXuval)stipple->id(); // This should be a HBITMAP
}
else if(pattern>=STIPPLE_0 && pattern<=STIPPLE_16){
lb.lbStyle=BS_PATTERN;
lb.lbColor=devfg;
- lb.lbHatch=(LONG)getApp()->stipples[pattern];
+ lb.lbHatch=(FXuval)getApp()->stipples[pattern];
}
else{
lb.lbStyle=BS_HATCHED;
@@ -2310,12 +2310,12 @@
if(stipple){
lb.lbStyle=BS_PATTERN;
lb.lbColor=devfg;
- lb.lbHatch=(LONG)stipple->id(); // This should be a HBITMAP
+ lb.lbHatch=(FXuval)stipple->id(); // This should be a HBITMAP
}
else if(pattern>=STIPPLE_0 && pattern<=STIPPLE_16){
lb.lbStyle=BS_PATTERN;
lb.lbColor=devfg;
- lb.lbHatch=(LONG)getApp()->stipples[pattern];
+ lb.lbHatch=(FXuval)getApp()->stipples[pattern];
}
else{
lb.lbStyle=BS_HATCHED;
@@ -2328,12 +2328,12 @@
if(stipple){
lb.lbStyle=BS_PATTERN;
lb.lbColor=devfg;
- lb.lbHatch=(LONG)stipple->id(); // This should be a HBITMAP
+ lb.lbHatch=(FXuval)stipple->id(); // This should be a HBITMAP
}
else if(pattern>=STIPPLE_0 && pattern<=STIPPLE_16){
lb.lbStyle=BS_PATTERN;
lb.lbColor=devfg;
- lb.lbHatch=(LONG)getApp()->stipples[pattern];
+ lb.lbHatch=(FXuval)getApp()->stipples[pattern];
}
else{
lb.lbStyle=BS_HATCHED;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/fox-1.6.47/src/FXDebugTarget.cpp new/fox-1.6.49/src/FXDebugTarget.cpp
--- old/fox-1.6.47/src/FXDebugTarget.cpp 2012-11-14 17:56:11.000000000
+0100
+++ new/fox-1.6.49/src/FXDebugTarget.cpp 2013-04-07 20:51:42.000000000
+0200
@@ -153,7 +153,7 @@
FXuint msid=FXSELID(sel);
FXASSERT(ARRAYNUMBER(messageTypeName)==SEL_LAST);
if(sender!=lastsender || sel!=lastsel){
- fxmessage("\nTYPE:%-23s ID:%-5d SENDER: %-15s PTR: 0x%08lx
#%-4d",type<SEL_LAST?messageTypeName[type]:"ILLEGAL",msid,sender?sender->getClassName():"NULL",(unsigned
long)ptr,1);
+ fxmessage("\nTYPE:%-23s ID:%-5d SENDER: %-15s PTR: 0x%08p
#%-4d",type<SEL_LAST?messageTypeName[type]:"ILLEGAL",msid,sender?sender->getClassName():"NULL",ptr,1);
lastsender=sender;
lastsel=sel;
count=1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/fox-1.6.47/src/FXMDIButton.cpp new/fox-1.6.49/src/FXMDIButton.cpp
--- old/fox-1.6.47/src/FXMDIButton.cpp 2012-11-14 17:56:11.000000000 +0100
+++ new/fox-1.6.49/src/FXMDIButton.cpp 2013-04-07 20:51:42.000000000 +0200
@@ -94,11 +94,10 @@
// Handle repaint
long FXMDIDeleteButton::onPaint(FXObject*,FXSelector,void* ptr){
- FXEvent *ev=(FXEvent*)ptr;
- FXDCWindow dc(this,ev);
+ FXDCWindow dc(this,(FXEvent*)ptr);
FXint xx,yy;
dc.setForeground(backColor);
- dc.fillRectangle(ev->rect.x,ev->rect.y,ev->rect.w,ev->rect.h);
+ dc.fillRectangle(0,0,width,height);
if(options&(FRAME_RAISED|FRAME_SUNKEN)){
if(state==STATE_UP){
if(options&FRAME_THICK) drawDoubleRaisedRectangle(dc,0,0,width,height);
@@ -166,11 +165,10 @@
// Handle repaint
long FXMDIRestoreButton::onPaint(FXObject*,FXSelector,void* ptr){
- FXEvent *ev=(FXEvent*)ptr;
- FXDCWindow dc(this,ev);
+ FXDCWindow dc(this,(FXEvent*)ptr);
FXint xx,yy;
dc.setForeground(backColor);
- dc.fillRectangle(ev->rect.x,ev->rect.y,ev->rect.w,ev->rect.h);
+ dc.fillRectangle(0,0,width,height);
if(options&(FRAME_RAISED|FRAME_SUNKEN)){
if(state==STATE_UP){
if(options&FRAME_THICK) drawDoubleRaisedRectangle(dc,0,0,width,height);
@@ -232,11 +230,10 @@
// Handle repaint
long FXMDIMaximizeButton::onPaint(FXObject*,FXSelector,void* ptr){
- FXEvent *ev=(FXEvent*)ptr;
- FXDCWindow dc(this,ev);
+ FXDCWindow dc(this,(FXEvent*)ptr);
FXint xx,yy;
dc.setForeground(backColor);
- dc.fillRectangle(ev->rect.x,ev->rect.y,ev->rect.w,ev->rect.h);
+ dc.fillRectangle(0,0,width,height);
if(options&(FRAME_RAISED|FRAME_SUNKEN)){
if(state==STATE_UP){
if(options&FRAME_THICK) drawDoubleRaisedRectangle(dc,0,0,width,height);
@@ -291,11 +288,10 @@
// Handle repaint
long FXMDIMinimizeButton::onPaint(FXObject*,FXSelector,void* ptr){
- FXEvent *ev=(FXEvent*)ptr;
- FXDCWindow dc(this,ev);
+ FXDCWindow dc(this,(FXEvent*)ptr);
FXint xx,yy;
dc.setForeground(backColor);
- dc.fillRectangle(ev->rect.x,ev->rect.y,ev->rect.w,ev->rect.h);
+ dc.fillRectangle(0,0,width,height);
if(options&(FRAME_RAISED|FRAME_SUNKEN)){
if(state==STATE_UP){
if(options&FRAME_THICK) drawDoubleRaisedRectangle(dc,0,0,width,height);
@@ -355,11 +351,10 @@
// Handle repaint
long FXMDIWindowButton::onPaint(FXObject*,FXSelector,void* ptr){
- FXEvent *ev=(FXEvent*)ptr;
- FXDCWindow dc(this,ev);
+ FXDCWindow dc(this,(FXEvent*)ptr);
FXint ix,iy,iw,ih;
dc.setForeground(backColor);
- dc.fillRectangle(ev->rect.x,ev->rect.y,ev->rect.w,ev->rect.h);
+ dc.fillRectangle(0,0,width,height);
drawFrame(dc,0,0,width,height);
if(icon){
iw=icon->getWidth();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/fox-1.6.47/src/FXStat.cpp new/fox-1.6.49/src/FXStat.cpp
--- old/fox-1.6.47/src/FXStat.cpp 2012-11-14 17:56:11.000000000 +0100
+++ new/fox-1.6.49/src/FXStat.cpp 2013-04-07 20:51:42.000000000 +0200
@@ -214,11 +214,10 @@
SHFILEINFO sfi;
utf2ncs(buffer,file.text(),file.length()+1);
if(::GetFileAttributesExW(buffer,GetFileExInfoStandard,&data)){
- info.modeFlags=0777;
+ info.modeFlags=FXIO::OwnerFull|FXIO::GroupFull|FXIO::OtherFull;
if(data.dwFileAttributes&FILE_ATTRIBUTE_HIDDEN)
info.modeFlags|=FXIO::Hidden;
- if(data.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY)
info.modeFlags|=FXIO::Directory;
- else info.modeFlags|=FXIO::File;
if(data.dwFileAttributes&FILE_ATTRIBUTE_READONLY)
info.modeFlags&=~(FXIO::OwnerWrite|FXIO::GroupWrite|FXIO::OtherWrite);
+ if(data.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY)
info.modeFlags|=FXIO::Directory|FXIO::OwnerWrite|FXIO::GroupWrite|FXIO::OtherWrite;
else info.modeFlags|=FXIO::File;
if(::SHGetFileInfoW(buffer,0,&sfi,sizeof(SHFILEINFO),SHGFI_EXETYPE)==0)
info.modeFlags&=~(FXIO::OwnerExec|FXIO::GroupExec|FXIO::OtherExec);
info.userNumber=0;
info.groupNumber=0;
@@ -232,11 +231,10 @@
WIN32_FILE_ATTRIBUTE_DATA data;
SHFILEINFO sfi;
if(::GetFileAttributesExA(file.text(),GetFileExInfoStandard,&data)){
- info.modeFlags=0777;
+ info.modeFlags=FXIO::OwnerFull|FXIO::GroupFull|FXIO::OtherFull;
if(data.dwFileAttributes&FILE_ATTRIBUTE_HIDDEN)
info.modeFlags|=FXIO::Hidden;
- if(data.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY)
info.modeFlags|=FXIO::Directory;
- else info.modeFlags|=FXIO::File;
if(data.dwFileAttributes&FILE_ATTRIBUTE_READONLY)
info.modeFlags&=~(FXIO::OwnerWrite|FXIO::GroupWrite|FXIO::OtherWrite);
+ if(data.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY)
info.modeFlags|=FXIO::Directory|FXIO::OwnerWrite|FXIO::GroupWrite|FXIO::OtherWrite;
else info.modeFlags|=FXIO::File;
if(::SHGetFileInfoA(file.text(),0,&sfi,sizeof(SHFILEINFO),SHGFI_EXETYPE)==0)
info.modeFlags&=~(FXIO::OwnerExec|FXIO::GroupExec|FXIO::OtherExec);
info.userNumber=0;
info.groupNumber=0;
@@ -292,11 +290,10 @@
SHFILEINFO sfi;
utf2ncs(buffer,file.text(),file.length()+1);
if(::GetFileAttributesExW(buffer,GetFileExInfoStandard,&data)){
- info.modeFlags=0777;
+ info.modeFlags=FXIO::OwnerFull|FXIO::GroupFull|FXIO::OtherFull;
if(data.dwFileAttributes&FILE_ATTRIBUTE_HIDDEN)
info.modeFlags|=FXIO::Hidden;
- if(data.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY)
info.modeFlags|=FXIO::Directory;
- else info.modeFlags|=FXIO::File;
if(data.dwFileAttributes&FILE_ATTRIBUTE_READONLY)
info.modeFlags&=~(FXIO::OwnerWrite|FXIO::GroupWrite|FXIO::OtherWrite);
+ if(data.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY)
info.modeFlags|=FXIO::Directory|FXIO::OwnerWrite|FXIO::GroupWrite|FXIO::OtherWrite;
else info.modeFlags|=FXIO::File;
if(::SHGetFileInfoW(buffer,0,&sfi,sizeof(SHFILEINFO),SHGFI_EXETYPE)==0)
info.modeFlags&=~(FXIO::OwnerExec|FXIO::GroupExec|FXIO::OtherExec);
info.userNumber=0;
info.groupNumber=0;
@@ -310,11 +307,10 @@
WIN32_FILE_ATTRIBUTE_DATA data;
SHFILEINFO sfi;
if(::GetFileAttributesExA(file.text(),GetFileExInfoStandard,&data)){
- info.modeFlags=0777;
+ info.modeFlags=FXIO::OwnerFull|FXIO::GroupFull|FXIO::OtherFull;
if(data.dwFileAttributes&FILE_ATTRIBUTE_HIDDEN)
info.modeFlags|=FXIO::Hidden;
- if(data.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY)
info.modeFlags|=FXIO::Directory;
- else info.modeFlags|=FXIO::File;
if(data.dwFileAttributes&FILE_ATTRIBUTE_READONLY)
info.modeFlags&=~(FXIO::OwnerWrite|FXIO::GroupWrite|FXIO::OtherWrite);
+ if(data.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY)
info.modeFlags|=FXIO::Directory|FXIO::OwnerWrite|FXIO::GroupWrite|FXIO::OtherWrite;
else info.modeFlags|=FXIO::File;
if(::SHGetFileInfoA(file.text(),0,&sfi,sizeof(SHFILEINFO),SHGFI_EXETYPE)==0)
info.modeFlags&=~(FXIO::OwnerExec|FXIO::GroupExec|FXIO::OtherExec);
info.userNumber=0;
info.groupNumber=0;
@@ -365,11 +361,10 @@
#ifdef WIN32
BY_HANDLE_FILE_INFORMATION data;
if(::GetFileInformationByHandle(file.handle(),&data)){
- info.modeFlags=0777;
+ info.modeFlags=FXIO::OwnerFull|FXIO::GroupFull|FXIO::OtherFull;
if(data.dwFileAttributes&FILE_ATTRIBUTE_HIDDEN)
info.modeFlags|=FXIO::Hidden;
- if(data.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY)
info.modeFlags|=FXIO::Directory;
- else info.modeFlags|=FXIO::File;
if(data.dwFileAttributes&FILE_ATTRIBUTE_READONLY)
info.modeFlags&=~(FXIO::OwnerWrite|FXIO::GroupWrite|FXIO::OtherWrite);
+ if(data.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY)
info.modeFlags|=FXIO::Directory|FXIO::OwnerWrite|FXIO::GroupWrite|FXIO::OtherWrite;
else info.modeFlags|=FXIO::File;
info.userNumber=0;
info.groupNumber=0;
info.accessTime=fxfiletime(data.ftLastAccessTime);
@@ -415,15 +410,18 @@
// Change the mode flags for this file
bool FXStat::mode(const FXString& file,FXuint perm){
+ if(!file.empty()){
#ifndef WIN32
- FXuint bits=perm&0777;
- if(perm&FXIO::SetUser) bits|=S_ISUID;
- if(perm&FXIO::SetGroup) bits|=S_ISGID;
- if(perm&FXIO::Sticky) bits|=S_ISVTX;
- return !file.empty() && ::chmod(file.text(),bits)==0;
+ FXuint bits=perm&0777;
+ if(perm&FXIO::SetUser) bits|=S_ISUID;
+ if(perm&FXIO::SetGroup) bits|=S_ISGID;
+ if(perm&FXIO::Sticky) bits|=S_ISVTX;
+ return ::chmod(file.text(),bits)==0;
#else
- return false; // FIXME Unimplemented yet
+ return false; // FIXME Unimplemented yet
#endif
+ }
+ return false;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/fox-1.6.47/src/FXTabBar.cpp new/fox-1.6.49/src/FXTabBar.cpp
--- old/fox-1.6.47/src/FXTabBar.cpp 2012-11-14 17:56:11.000000000 +0100
+++ new/fox-1.6.49/src/FXTabBar.cpp 2013-04-07 20:51:50.000000000 +0200
@@ -39,6 +39,7 @@
#include "FXFont.h"
#include "FXIcon.h"
#include "FXTabBar.h"
+#include "FXTabBook.h"
/*
@@ -46,7 +47,6 @@
- Should focus go to tab items?
- Tab items should observe various border styles.
- TAB/TABTAB should go into content, arrow keys navigate between tabs.
- - Fix setCurrent() to be like FXSwitcher.
*/
@@ -369,7 +369,8 @@
// Set current subwindow
void FXTabBar::setCurrent(FXint panel,FXbool notify){
- if(0<=panel && panel!=current){
+ register FXint
nc=isMemberOf(&FXTabBook::metaClass)?numChildren()>>1:numChildren();
+ if(panel!=current && 0<=panel && panel<nc){
current=panel;
recalc();
if(notify && target){
target->tryHandle(this,FXSEL(SEL_COMMAND,message),(void*)(FXival)current); }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/fox-1.6.47/src/FXTabBook.cpp new/fox-1.6.49/src/FXTabBook.cpp
--- old/fox-1.6.47/src/FXTabBook.cpp 2012-11-14 17:56:11.000000000 +0100
+++ new/fox-1.6.49/src/FXTabBook.cpp 2013-04-07 20:51:50.000000000 +0200
@@ -200,7 +200,7 @@
}
}
- // This will change only if current now invisible
+ // Changes current only if old current no longer visible
current=newcurrent;
// Left or right tabs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/fox-1.6.47/src/FXWindow.cpp new/fox-1.6.49/src/FXWindow.cpp
--- old/fox-1.6.47/src/FXWindow.cpp 2012-11-14 17:56:11.000000000 +0100
+++ new/fox-1.6.49/src/FXWindow.cpp 2013-04-07 20:51:42.000000000 +0200
@@ -3060,7 +3060,7 @@
#else
- FXuint version=0;
+ FXuval version=0;
FXbool forcepos=FALSE;
POINT point;
HWND window;
@@ -3070,7 +3070,7 @@
point.y=y;
window=WindowFromPoint(point); // FIXME wrong for disabled windows
while(window){
- version=(FXuint)GetProp(window,(LPCTSTR)MAKELONG(getApp()->xdndAware,0));
+ version=(FXuval)GetProp(window,(LPCTSTR)MAKELONG(getApp()->xdndAware,0));
if(version) break;
window=GetParent(window);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/fox-1.6.47/src/version.rc new/fox-1.6.49/src/version.rc
--- old/fox-1.6.47/src/version.rc 2012-11-14 18:00:06.000000000 +0100
+++ new/fox-1.6.49/src/version.rc 2013-04-07 21:12:36.000000000 +0200
@@ -1,5 +1,5 @@
1 VERSIONINFO
-FILEVERSION 1,6,47,0
+FILEVERSION 1,6,49,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -15,7 +15,7 @@
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "FOX GUI Library\0"
-VALUE "FileVersion", "1,6,47.0\0"
+VALUE "FileVersion", "1,6,49.0\0"
VALUE "LegalCopyright", "GNU Library General Public License\0"
END
END
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/fox-1.6.47/tests/dctest.cpp new/fox-1.6.49/tests/dctest.cpp
--- old/fox-1.6.47/tests/dctest.cpp 2012-11-14 17:56:11.000000000 +0100
+++ new/fox-1.6.49/tests/dctest.cpp 2013-04-07 20:51:42.000000000 +0200
@@ -1058,7 +1058,7 @@
// Erase Color
long DCTestWindow::onCmdEraseColor(FXObject*,FXSelector,void* ptr){
- erasecolor=(FXColor)(long)ptr;
+ erasecolor=(FXColor)(FXuval)ptr;
linesCanvas->update();
shapesCanvas->update();
imagesCanvas->update();
@@ -1074,7 +1074,7 @@
// Foreground Color
long DCTestWindow::onCmdForeColor(FXObject*,FXSelector,void* ptr){
- forecolor=(FXColor)(long)ptr;
+ forecolor=(FXColor)(FXuval)ptr;
linesCanvas->update();
shapesCanvas->update();
imagesCanvas->update();
@@ -1090,7 +1090,7 @@
// Back Color
long DCTestWindow::onCmdBackColor(FXObject*,FXSelector,void* ptr){
- backcolor=(FXColor)(long)ptr;
+ backcolor=(FXColor)(FXuval)ptr;
linesCanvas->update();
shapesCanvas->update();
imagesCanvas->update();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/fox-1.6.47/tests/header.cpp new/fox-1.6.49/tests/header.cpp
--- old/fox-1.6.47/tests/header.cpp 2012-11-14 17:56:11.000000000 +0100
+++ new/fox-1.6.49/tests/header.cpp 2013-04-07 20:51:42.000000000 +0200
@@ -186,7 +186,7 @@
// Changed the header control
long HeaderWindow::onCmdHeader(FXObject*,FXSelector,void* ptr){
- FXint which=(FXint)(long)ptr;
+ FXint which=(FXint)(FXival)ptr;
FXASSERT(0<=which && which<4);
FXTRACE((1,"Width of item %d = %d\n",which,header1->getItemSize(which)));
list[which]->setWidth(header1->getItemSize(which));
@@ -196,7 +196,7 @@
// Clicked a header button:- we highlight all in the list
long HeaderWindow::onCmdHeaderButton(FXObject*,FXSelector,void* ptr){
- FXint which=(FXint)(long)ptr;
+ FXint which=(FXint)(FXival)ptr;
FXint i;
FXASSERT(0<=which && which<4);
for(i=0; i<list[which]->getNumItems(); i++){
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/fox-1.6.47/tests/minheritance.cpp new/fox-1.6.49/tests/minheritance.cpp
--- old/fox-1.6.47/tests/minheritance.cpp 2012-11-14 17:56:11.000000000
+0100
+++ new/fox-1.6.49/tests/minheritance.cpp 2013-04-07 20:51:42.000000000
+0200
@@ -163,7 +163,7 @@
/*******************************************************************************/
Base1::Base1(){
- FXTRACE((100,"Base1::Base1 at %08lx\n",(unsigned long)this));
+ FXTRACE((100,"Base1::Base1 at %08p\n",this));
a=1;
}
@@ -182,12 +182,12 @@
FXIMPLEMENT(Base2,FXObject,Base2Map,ARRAYNUMBER(Base2Map))
Base2::Base2(){
- FXTRACE((100,"Base2::Base2 at %08lx\n",(unsigned long)this));
+ FXTRACE((100,"Base2::Base2 at %08p\n",this));
b=2;
}
long Base2::onCmdBase2(FXObject*,FXSelector,void*){
- FXTRACE((100,"Base2::onCmdBase2 at %08lx b=%d\n",(unsigned long)this,b));
+ FXTRACE((100,"Base2::onCmdBase2 at %08p b=%d\n",this,b));
return 1;
}
@@ -200,7 +200,7 @@
Base3::Base3(){
- FXTRACE((100,"Base3::Base3 at %08lx\n",(unsigned long)this));
+ FXTRACE((100,"Base3::Base3 at %08p\n",this));
c=3;
}
@@ -221,12 +221,12 @@
FXIMPLEMENT(TwoBaseOne,Base2,TwoBaseOneMap,ARRAYNUMBER(TwoBaseOneMap))
TwoBaseOne::TwoBaseOne(){
- FXTRACE((100,"TwoBaseOne::TwoBaseOne at %08lx\n",(unsigned long)this));
+ FXTRACE((100,"TwoBaseOne::TwoBaseOne at %08p\n",this));
d=4;
}
long TwoBaseOne::onCmdTwoBaseOne(FXObject*,FXSelector,void*){
- FXTRACE((100,"TwoBaseOne::onCmdTwoBaseOne at %08lx d=%d\n",(unsigned
long)this,d));
+ FXTRACE((100,"TwoBaseOne::onCmdTwoBaseOne at %08p d=%d\n",this,d));
return 1;
}
@@ -244,12 +244,12 @@
FXIMPLEMENT(TwoBaseTwo,Base2,TwoBaseTwoMap,ARRAYNUMBER(TwoBaseTwoMap))
TwoBaseTwo::TwoBaseTwo(){
- FXTRACE((100,"TwoBaseTwo::TwoBaseTwo at %08lx\n",(unsigned long)this));
+ FXTRACE((100,"TwoBaseTwo::TwoBaseTwo at %08p\n",this));
e=4;
}
long TwoBaseTwo::onCmdTwoBaseTwo(FXObject*,FXSelector,void*){
- FXTRACE((100,"TwoBaseTwo::onCmdTwoBaseTwo at %08lx e=%d\n",(unsigned
long)this,e));
+ FXTRACE((100,"TwoBaseTwo::onCmdTwoBaseTwo at %08p e=%d\n",this,e));
return 1;
}
@@ -270,12 +270,12 @@
FXIMPLEMENT(ThreeBase,TwoBaseOne,ThreeBaseMap,ARRAYNUMBER(ThreeBaseMap))
ThreeBase::ThreeBase(){
- FXTRACE((100,"ThreeBase::ThreeBase at %08lx\n",(unsigned long)this));
+ FXTRACE((100,"ThreeBase::ThreeBase at %08p\n",this));
f=5;
}
long ThreeBase::onCmdThreeBase(FXObject*,FXSelector,void*){
- FXTRACE((100,"ThreeBase::onCmdThreeBase at %08lx f=%d\n",(unsigned
long)this,f));
+ FXTRACE((100,"ThreeBase::onCmdThreeBase at %08p f=%d\n",this,f));
return 1;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/fox-1.6.47/tests/tabbook.cpp new/fox-1.6.49/tests/tabbook.cpp
--- old/fox-1.6.47/tests/tabbook.cpp 2012-11-14 17:56:11.000000000 +0100
+++ new/fox-1.6.49/tests/tabbook.cpp 2013-04-07 20:51:42.000000000 +0200
@@ -236,7 +236,7 @@
// Active panel switched
long TabBookWindow::onCmdPanel(FXObject*,FXSelector,void* ptr){
- FXTRACE((1,"Panel = %d\n",(FXint)(long)ptr));
+ FXTRACE((1,"Panel = %d\n",(FXint)(FXival)ptr));
return 1;
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
