Hello community,
here is the log from the commit of package fox16
checked in at Thu Oct 11 01:28:10 CEST 2007.
--------
--- fox16/fox16.changes 2007-06-05 16:27:01.000000000 +0200
+++ /mounts/work_src_done/STABLE/fox16/fox16.changes 2007-10-10 12:51:54.000000000 +0200
@@ -1,0 +2,23 @@
+Wed Oct 10 11:47:49 CEST 2007 - lrupp@suse.de
+
+- update to 1.6.30:
+ + Fixed some issues with flush() in FXBZFileStream and
+ FXGZFileStream.
+ + FXDial didn't issue SEL_COMMAND when driven from keyboard.
+ + Small typo found in fxfilematch() was found which affected
+ character-range matching.
+ + Problem in FX7Segment fixed.
+ + Added ".jpeg" as additional extension for JPEG images in
+ FXIconSource.
+ + Fix in FXSplashWindow not killing timer if it gets destroyed
+ before timer goes off.
+ + FX7Segment had bug in onCmdGetStringValue() implementation
+ + Cruft removed from FXMat3f.
+ + Bold style fixed in FXText.
+ + Read outside buffer problem fixed in FXText.
+ + Bugs in FXListBox and FXTreeListBox fixed.
+- added fox16-rpmlintrc
+- added LICENSE_ADDENDUM, removed INSTALL from %doc
+- create desktop entries for adie, calculator and pathfinder
+
+-------------------------------------------------------------------
Old:
----
fox-1.6.27.tar.bz2
rpmlintrc
New:
----
adie.png
calculator.png
fox-1.6.30.tar.bz2
fox16-rpmlintrc
pathfinder.png
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fox16.spec ++++++
--- /var/tmp/diff_new_pack.M11244/_old 2007-10-11 01:27:52.000000000 +0200
+++ /var/tmp/diff_new_pack.M11244/_new 2007-10-11 01:27:52.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package fox16 (Version 1.6.27)
+# spec file for package fox16 (Version 1.6.30)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,14 +11,18 @@
# norootforbuild
Name: fox16
-URL: http://www.fox-toolkit.org/
+Url: http://www.fox-toolkit.org/
Summary: Shared Libraries for the FOX Toolkit
Group: Development/Languages/C and C++
-License: GNU Library General Public License v. 2.0 and 2.1 (LGPL)
-Version: 1.6.27
+License: LGPL v2 or later
+Version: 1.6.30
Release: 1
-Autoreqprov: on
+AutoReqProv: on
Source: fox-%{version}.tar.bz2
+Source1: calculator.png
+Source2: pathfinder.png
+Source3: adie.png
+Source4: fox16-rpmlintrc
Provides: fox = %{version}-%{release}
Patch1: fox-1.6.26_initialise_local_variable.patch
Patch2: fox-1.6.26-missing_html_tag.patch
@@ -29,6 +33,7 @@
#
%if 0%{?suse_version}
BuildRequires: cups-devel xorg-x11-devel
+BuildRequires: update-desktop-files
%if 0%{?suse_version} >= 1020
BuildRequires: xorg-x11-Mesa-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel
%else
@@ -203,7 +208,7 @@
%build
autoreconf -fi
-CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG -Wuninitialized -fno-strict-aliasing" \
+## CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG -Wuninitialized -fno-strict-aliasing" \
%configure \
--enable-threadsafe \
--enable-release \
@@ -219,16 +224,65 @@
%install
%makeinstall
-%{__mv} %{buildroot}%{_datadir}/doc/fox-* rpmdocs
+mv %{buildroot}%{_datadir}/doc/fox-* rpmdocs
rm -f doc/Makefile.am doc/Makefile.in doc/Makefile
rm -r doc/art/Makefile.am doc/art/Makefile.in doc/art/Makefile
rm -f doc/screenshots/Makefile.am doc/screenshots/Makefile.in doc/screenshots/Makefile
# remove docs as they are supplied by rpm
rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/doc/fox-*
rm -rf ${RPM_BUILD_ROOT}/usr/fox
+# install desktop files for example applications
+%if 0%{?suse_version}
+mkdir -p %buildroot/%{_datadir}/{applications,pixmaps}
+install -m 644 %SOURCE1 %buildroot/%{_datadir}/pixmaps/
+install -m 644 %SOURCE2 %buildroot/%{_datadir}/pixmaps/
+install -m 644 %SOURCE3 %buildroot/%{_datadir}/pixmaps/
+cat > %buildroot/%{_datadir}/applications/calculator.desktop << EOF
+[Desktop Entry]
+Encoding=UTF-8
+Name=Calculator
+Icon=calculator.png
+Exec=calculator
+GenericName=Calculator
+GenericName[de]=Taschenrechner
+Terminal=false
+Type=Application
+Categories=Qt;KDE;Utility;X-KDE-Utilities-Desktop;Calculator;
+Comment=A fox-toolkit based calculator
+Comment[de]=Ein auf dem Fox-Toolkit basierender Taschenrechner
+EOF
+cat > %buildroot/%{_datadir}/applications/pathfinder.desktop << EOF
+[Desktop Entry]
+Encoding=UTF-8
+Name=PathFinder
+Icon=pathfinder.png
+Exec=PathFinder
+GenericName=File Manager
+GenericName[de]=Dateimanager
+Terminal=false
+Type=Application
+Categories=Application;System;FileManager;
+EOF
+cat > %buildroot/%{_datadir}/applications/adie.desktop << EOF
+[Desktop Entry]
+Encoding=UTF-8
+Name=Adie
+Icon=adie.png
+Exec=adie
+GenericName=Text Editor
+GenericName[de]=Texteditor
+Terminal=false
+Type=Application
+MimeType=text/english;text/plain;
+Categories=TextEditor
+EOF
+%suse_update_desktop_file calculator
+%suse_update_desktop_file pathfinder
+%suse_update_desktop_file adie
+%endif
%clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
%post -p /sbin/ldconfig
@@ -237,7 +291,7 @@
%files
%defattr(644, root, root, 0755)
%doc doc
-%doc ADDITIONS AUTHORS INSTALL LICENSE README TRACING index.html
+%doc ADDITIONS AUTHORS LICENSE* README TRACING index.html
%defattr(-, root, root, 0755)
%{_libdir}/libFOX-*.so*
%{_libdir}/libCHART-*.so*
@@ -268,12 +322,33 @@
%{_bindir}/PathFinder
%{_bindir}/calculator
%{_bindir}/shutterbug
+%{_datadir}/applications/*.desktop
+%{_datadir}/pixmaps/*.png
%{_mandir}/man1/adie*
%{_mandir}/man1/calculator*
%{_mandir}/man1/PathFinder*
%{_mandir}/man1/shutterbug*
-
%changelog
+* Wed Oct 10 2007 - lrupp@suse.de
+- update to 1.6.30:
+ + Fixed some issues with flush() in FXBZFileStream and
+ FXGZFileStream.
+ + FXDial didn't issue SEL_COMMAND when driven from keyboard.
+ + Small typo found in fxfilematch() was found which affected
+ character-range matching.
+ + Problem in FX7Segment fixed.
+ + Added ".jpeg" as additional extension for JPEG images in
+ FXIconSource.
+ + Fix in FXSplashWindow not killing timer if it gets destroyed
+ before timer goes off.
+ + FX7Segment had bug in onCmdGetStringValue() implementation
+ + Cruft removed from FXMat3f.
+ + Bold style fixed in FXText.
+ + Read outside buffer problem fixed in FXText.
+ + Bugs in FXListBox and FXTreeListBox fixed.
+- added fox16-rpmlintrc
+- added LICENSE_ADDENDUM, removed INSTALL from %%doc
+- create desktop entries for adie, calculator and pathfinder
* Tue Jun 05 2007 - lrupp@suse.de
- update to 1.6.27
+ Fixed regression in glUseFXFont() when using Xft instead of XLFD.
++++++ fox-1.6.27.tar.bz2 -> fox-1.6.30.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.27/configure new/fox-1.6.30/configure
--- old/fox-1.6.27/configure 2007-04-20 07:02:40.000000000 +0200
+++ new/fox-1.6.30/configure 2007-10-06 15:28:23.000000000 +0200
@@ -1520,7 +1520,7 @@
FOX_MINOR_VERSION=6
-FOX_PATCH_LEVEL=27
+FOX_PATCH_LEVEL=30
FOX_INTERFACE_VERSION=0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.27/configure.in new/fox-1.6.30/configure.in
--- old/fox-1.6.27/configure.in 2007-04-20 07:02:35.000000000 +0200
+++ new/fox-1.6.30/configure.in 2007-10-06 15:27:26.000000000 +0200
@@ -8,7 +8,7 @@
FOX_MINOR_VERSION=6
dnl Increment after every source code change
-FOX_PATCH_LEVEL=27
+FOX_PATCH_LEVEL=30
dnl Binaries compiled with this patchlevel of FOX will need at least
dnl version MAJOR.MINOR.INTERFACE_VERSION to run. The assertion
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.27/include/FXBZFileStream.h new/fox-1.6.30/include/FXBZFileStream.h
--- old/fox-1.6.27/include/FXBZFileStream.h 2006-01-22 18:57:59.000000000 +0100
+++ new/fox-1.6.30/include/FXBZFileStream.h 2007-09-29 02:14:21.000000000 +0200
@@ -19,7 +19,7 @@
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
-* $Id: FXBZFileStream.h,v 1.5 2006/01/22 17:57:59 fox Exp $ *
+* $Id: FXBZFileStream.h,v 1.5.2.1 2007/09/28 16:42:19 fox Exp $ *
********************************************************************************/
#ifdef HAVE_BZ2LIB_H
#ifndef FXBZFILESTREAM_H
@@ -52,6 +52,9 @@
/// Open file stream
bool open(const FXString& filename,FXStreamDirection save_or_load,FXuval size=8192);
+ /// Flush buffer
+ virtual bool flush();
+
/// Close file stream
virtual bool close();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.27/include/FXGZFileStream.h new/fox-1.6.30/include/FXGZFileStream.h
--- old/fox-1.6.27/include/FXGZFileStream.h 2006-01-22 18:58:04.000000000 +0100
+++ new/fox-1.6.30/include/FXGZFileStream.h 2007-09-29 02:14:22.000000000 +0200
@@ -19,7 +19,7 @@
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
-* $Id: FXGZFileStream.h,v 1.5 2006/01/22 17:58:04 fox Exp $ *
+* $Id: FXGZFileStream.h,v 1.5.2.1 2007/09/28 16:42:19 fox Exp $ *
********************************************************************************/
#ifdef HAVE_ZLIB_H
#ifndef FXGZFILESTREAM_H
@@ -52,6 +52,9 @@
/// Open file stream
bool open(const FXString& filename,FXStreamDirection save_or_load,FXuval size=8192);
+ /// Flush buffer
+ virtual bool flush();
+
/// Close file stream
virtual bool close();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.27/include/FXPipe.h new/fox-1.6.30/include/FXPipe.h
--- old/fox-1.6.27/include/FXPipe.h 2006-01-22 18:58:07.000000000 +0100
+++ new/fox-1.6.30/include/FXPipe.h 2007-08-09 02:17:06.000000000 +0200
@@ -19,10 +19,10 @@
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
-* $Id: FXPipe.h,v 1.7 2006/01/22 17:58:07 fox Exp $ *
+* $Id: FXPipe.h,v 1.7.2.1 2007/08/02 21:31:17 fox Exp $ *
********************************************************************************/
#ifndef FXPIPE_H
-#define FXFILE_H
+#define FXPIPE_H
#ifndef FXIO_H
#include "FXIO.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.27/include/fxver.h new/fox-1.6.30/include/fxver.h
--- old/fox-1.6.27/include/fxver.h 2007-04-20 07:02:55.000000000 +0200
+++ new/fox-1.6.30/include/fxver.h 2007-10-06 15:35:45.000000000 +0200
@@ -5,7 +5,7 @@
// FOX version
#define FOX_MAJOR 1
#define FOX_MINOR 6
-#define FOX_LEVEL 27
+#define FOX_LEVEL 30
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.27/src/FX7Segment.cpp new/fox-1.6.30/src/FX7Segment.cpp
--- old/fox-1.6.27/src/FX7Segment.cpp 2006-03-16 04:19:10.000000000 +0100
+++ new/fox-1.6.30/src/FX7Segment.cpp 2007-08-11 02:50:32.000000000 +0200
@@ -19,7 +19,7 @@
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
-* $Id: FX7Segment.cpp,v 1.19 2006/03/16 03:19:10 fox Exp $ *
+* $Id: FX7Segment.cpp,v 1.19.2.1 2007/08/11 00:50:32 fox Exp $ *
********************************************************************************/
#include "xincs.h"
#include "fxver.h"
@@ -267,7 +267,7 @@
// Get value as string
long FX7Segment::onCmdGetStringValue(FXObject*,FXSelector,void* ptr){
- *((FXint*)ptr)=FXIntVal(label);
+ *((FXString*)ptr)=label;
return 1;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.27/src/FXBZFileStream.cpp new/fox-1.6.30/src/FXBZFileStream.cpp
--- old/fox-1.6.27/src/FXBZFileStream.cpp 2006-08-04 02:15:40.000000000 +0200
+++ new/fox-1.6.30/src/FXBZFileStream.cpp 2007-09-29 02:14:26.000000000 +0200
@@ -19,7 +19,7 @@
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
-* $Id: FXBZFileStream.cpp,v 1.5.2.1 2006/08/03 16:32:10 fox Exp $ *
+* $Id: FXBZFileStream.cpp,v 1.5.2.2 2007/09/28 16:42:20 fox Exp $ *
********************************************************************************/
#include "xincs.h"
#include "fxver.h"
@@ -74,18 +74,20 @@
FXASSERT(begptr<=rdptr);
FXASSERT(rdptr<=wrptr);
FXASSERT(wrptr<=endptr);
- while(rdptrstream.next_in=(char*)rdptr;
bz->stream.avail_in=wrptr-rdptr;
bz->stream.next_out=bz->buffer;
bz->stream.avail_out=BUFFERSIZE;
bzerror=BZ2_bzCompress(&bz->stream,ac);
// if(bzerror!=BZ_OK) break;
- if(!(bzerror==BZ_RUN_OK || bzerror==BZ_STREAM_END)) break;
+ if(bzerror<0) break; // break on error condition
m=bz->stream.next_out-bz->buffer;
n=file.writeBlock(bz->buffer,m);
if(nstream.next_in;
+ if(bzerror==BZ_STREAM_END) break; // break from FINISH
+ if(ac==BZ_FLUSH && bzerror==BZ_RUN_OK) break; // break from FLUSH
}
if(rdptrstream.avail_in=n;
if(bz->stream.avail_in<=0){ // get more input if buffer is empty
n=file.readBlock(bz->buffer,BUFFERSIZE);
- if(n<=0) break;
+ if(n<0) break;
bz->stream.next_in=bz->buffer;
bz->stream.avail_in=n;
}
@@ -119,7 +121,7 @@
bz->stream.avail_out=endptr-wrptr;
bzerror=BZ2_bzDecompress(&bz->stream);
// if(bzerror!=BZ_OK) break;
- if(!(bzerror==BZ_OK || bzerror==BZ_STREAM_END)) break;
+ if(bzerror<0) break; // break on error condition
wrptr=(FXuchar*)bz->stream.next_out;
if(bzerror==BZ_STREAM_END) break;
}
@@ -155,6 +157,16 @@
}
+// Flush buffer
+bool FXBZFileStream::flush(){
+ bool status;
+ int action=ac;
+ if(ac!=BZ_FINISH) ac=BZ_FLUSH;
+ status=FXStream::flush();
+ ac=action;
+ return status;
+ }
+
// Close file stream
bool FXBZFileStream::close(){
if(dir){
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.27/src/FXComboBox.cpp new/fox-1.6.30/src/FXComboBox.cpp
--- old/fox-1.6.27/src/FXComboBox.cpp 2006-01-27 03:07:44.000000000 +0100
+++ new/fox-1.6.30/src/FXComboBox.cpp 2007-06-08 00:08:14.000000000 +0200
@@ -19,7 +19,7 @@
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
-* $Id: FXComboBox.cpp,v 1.66 2006/01/27 02:07:44 fox Exp $ *
+* $Id: FXComboBox.cpp,v 1.66.2.2 2007/06/07 20:17:57 fox Exp $ *
********************************************************************************/
#include "xincs.h"
#include "fxver.h"
@@ -91,6 +91,7 @@
FXMAPFUNC(SEL_FOCUS_SELF,0,FXComboBox::onFocusSelf),
FXMAPFUNC(SEL_UPDATE,FXComboBox::ID_TEXT,FXComboBox::onUpdFmText),
FXMAPFUNC(SEL_CLICKED,FXComboBox::ID_LIST,FXComboBox::onListClicked),
+ FXMAPFUNC(SEL_COMMAND,FXComboBox::ID_LIST,FXComboBox::onListClicked),
FXMAPFUNC(SEL_LEFTBUTTONPRESS,FXComboBox::ID_TEXT,FXComboBox::onTextButton),
FXMAPFUNC(SEL_MOUSEWHEEL,FXComboBox::ID_TEXT,FXComboBox::onMouseWheel),
FXMAPFUNC(SEL_CHANGED,FXComboBox::ID_TEXT,FXComboBox::onTextChanged),
@@ -212,11 +213,11 @@
// Forward clicked message from list to target
-long FXComboBox::onListClicked(FXObject*,FXSelector,void* ptr){
- button->handle(this,FXSEL(SEL_COMMAND,ID_UNPOST),NULL); // Unpost the list
- if(0<=((FXint)(FXival)ptr)){
+long FXComboBox::onListClicked(FXObject*,FXSelector sel,void* ptr){
+ button->handle(this,FXSEL(SEL_COMMAND,ID_UNPOST),NULL);
+ if(FXSELTYPE(sel)==SEL_COMMAND){
field->setText(list->getItemText((FXint)(FXival)ptr));
- field->selectAll();
+ if(!(options&COMBOBOX_STATIC)) field->selectAll(); // Select if editable
if(target) target->tryHandle(this,FXSEL(SEL_COMMAND,message),(void*)getText().text());
}
return 1;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.27/src/FXDial.cpp new/fox-1.6.30/src/FXDial.cpp
--- old/fox-1.6.27/src/FXDial.cpp 2006-01-22 18:58:22.000000000 +0100
+++ new/fox-1.6.30/src/FXDial.cpp 2007-09-22 06:28:37.000000000 +0200
@@ -19,7 +19,7 @@
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
-* $Id: FXDial.cpp,v 1.50 2006/01/22 17:58:22 fox Exp $ *
+* $Id: FXDial.cpp,v 1.50.2.1 2007/09/22 04:28:37 fox Exp $ *
********************************************************************************/
#include "xincs.h"
#include "fxver.h"
@@ -404,13 +404,11 @@
break;
case KEY_plus:
case KEY_KP_Add:
-inc: //setValue(pos+((incr+359)/360),TRUE);
- setValue(pos+1);
+inc: setValue(pos+1,TRUE);
return 1;
case KEY_minus:
case KEY_KP_Subtract:
-dec: //setValue(pos-((incr+359)/360),TRUE);
- setValue(pos-1);
+dec: setValue(pos-1,TRUE);
return 1;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.27/src/fxfilematch.cpp new/fox-1.6.30/src/fxfilematch.cpp
--- old/fox-1.6.27/src/fxfilematch.cpp 2006-03-01 03:13:22.000000000 +0100
+++ new/fox-1.6.30/src/fxfilematch.cpp 2007-09-16 06:31:13.000000000 +0200
@@ -19,7 +19,7 @@
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
-* $Id: fxfilematch.cpp,v 1.16 2006/03/01 02:13:22 fox Exp $ *
+* $Id: fxfilematch.cpp,v 1.16.2.1 2007/09/16 04:31:13 fox Exp $ *
********************************************************************************/
#include "xincs.h"
#include "fxver.h"
@@ -123,8 +123,8 @@
c=FOLD(c);
if((flags&FILEMATCH_FILE_NAME) && ISPATHSEP(c)) return false;
if(c=='-' && *p!=']'){
- ce = *p++;
- if(ce=='\\' && !(flags&FILEMATCH_NOESCAPE)) c=*p++;
+ c = *p++;
+ if(c=='\\' && !(flags&FILEMATCH_NOESCAPE)) c=*p++;
if(c=='\0') return false;
ce=FOLD(c);
c=*p++;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.27/src/FXGZFileStream.cpp new/fox-1.6.30/src/FXGZFileStream.cpp
--- old/fox-1.6.27/src/FXGZFileStream.cpp 2006-08-04 02:15:43.000000000 +0200
+++ new/fox-1.6.30/src/FXGZFileStream.cpp 2007-09-29 02:14:28.000000000 +0200
@@ -19,7 +19,7 @@
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
-* $Id: FXGZFileStream.cpp,v 1.5.2.1 2006/08/03 16:32:11 fox Exp $ *
+* $Id: FXGZFileStream.cpp,v 1.5.2.2 2007/09/28 16:42:20 fox Exp $ *
********************************************************************************/
#include "xincs.h"
#include "fxver.h"
@@ -68,18 +68,19 @@
FXASSERT(begptr<=rdptr);
FXASSERT(rdptr<=wrptr);
FXASSERT(wrptr<=endptr);
- while(rdptrstream.next_in=(Bytef*)rdptr;
z->stream.avail_in=wrptr-rdptr;
z->stream.next_out=z->buffer;
z->stream.avail_out=BUFFERSIZE;
zerror=deflate(&z->stream,f);
// if(zerror!=Z_OK) break;
- if(!(zerror==Z_OK || zerror==Z_STREAM_END)) break;
+ if(zerror<0) break; // break on error condition
m=z->stream.next_out-z->buffer;
n=file.writeBlock(z->buffer,m);
if(nstream.next_in;
+ if(zerror==Z_STREAM_END) break; // break from FINISH/FLUSH
}
if(rdptrbuffer,BUFFERSIZE);
// n=file.readBlock(z->buffer,BUFFERSIZE);
// if(n<=0) break;
// z->stream.next_in=z->buffer;
// z->stream.avail_in=n;
if(z->stream.avail_in<=0){ // Get more input if buffer is empty
n=file.readBlock(z->buffer,BUFFERSIZE);
- if(n<=0) break;
+ if(n<0) break;
z->stream.next_in=z->buffer;
z->stream.avail_in=n;
}
@@ -114,7 +114,7 @@
z->stream.avail_out=endptr-wrptr;
zerror=inflate(&z->stream,Z_NO_FLUSH);
// if(zerror!=Z_OK) break;
- if(!(zerror==Z_OK || zerror==Z_STREAM_END)) break;
+ if(zerror<0) break; // break on error condition
wrptr=(FXuchar*)z->stream.next_out;
if(zerror==Z_STREAM_END) break;
}
@@ -150,6 +150,16 @@
}
+// Flush buffer
+bool FXGZFileStream::flush(){
+ bool status;
+ int flush=f;
+ if(f!=Z_FINISH) f=Z_SYNC_FLUSH;
+ status=FXStream::flush();
+ f=flush;
+ return status;
+ }
+
// Close file stream
bool FXGZFileStream::close(){
if(dir){
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.27/src/FXIconSource.cpp new/fox-1.6.30/src/FXIconSource.cpp
--- old/fox-1.6.27/src/FXIconSource.cpp 2006-01-22 18:58:32.000000000 +0100
+++ new/fox-1.6.30/src/FXIconSource.cpp 2007-07-20 03:19:50.000000000 +0200
@@ -19,7 +19,7 @@
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
-* $Id: FXIconSource.cpp,v 1.20 2006/01/22 17:58:32 fox Exp $ *
+* $Id: FXIconSource.cpp,v 1.20.2.1 2007/07/12 15:56:45 fox Exp $ *
********************************************************************************/
#include "xincs.h"
#include "fxver.h"
@@ -198,7 +198,7 @@
}
#ifndef CORE_IMAGE_FORMATS
#ifdef HAVE_JPEG_H
- else if(comparecase(FXJPGIcon::fileExt,type)==0){
+ else if(comparecase(FXJPGIcon::fileExt,type)==0 || comparecase("jpeg",type)==0){
icon=new FXJPGIcon(app);
}
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.27/src/FXListBox.cpp new/fox-1.6.30/src/FXListBox.cpp
--- old/fox-1.6.27/src/FXListBox.cpp 2006-04-14 03:21:01.000000000 +0200
+++ new/fox-1.6.30/src/FXListBox.cpp 2007-06-08 00:08:15.000000000 +0200
@@ -19,7 +19,7 @@
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
-* $Id: FXListBox.cpp,v 1.63.2.1 2006/04/14 01:21:01 fox Exp $ *
+* $Id: FXListBox.cpp,v 1.63.2.2 2007/06/07 20:17:57 fox Exp $ *
********************************************************************************/
#include "xincs.h"
#include "fxver.h"
@@ -75,6 +75,7 @@
FXMAPFUNC(SEL_FOCUS_DOWN,0,FXListBox::onFocusDown),
FXMAPFUNC(SEL_UPDATE,FXListBox::ID_LIST,FXListBox::onListUpdate),
FXMAPFUNC(SEL_CLICKED,FXListBox::ID_LIST,FXListBox::onListClicked),
+ FXMAPFUNC(SEL_COMMAND,FXListBox::ID_LIST,FXListBox::onListClicked),
FXMAPFUNC(SEL_CHANGED,FXListBox::ID_LIST,FXListBox::onListChanged),
FXMAPFUNC(SEL_LEFTBUTTONPRESS,FXListBox::ID_FIELD,FXListBox::onFieldButton),
FXMAPFUNC(SEL_MOUSEWHEEL,FXListBox::ID_FIELD,FXListBox::onMouseWheel),
@@ -213,13 +214,12 @@
// Forward clicked message from list to target
-long FXListBox::onListClicked(FXObject*,FXSelector,void* ptr){
- FXint index=(FXint)(FXival)ptr;
- button->handle(this,FXSEL(SEL_COMMAND,ID_UNPOST),NULL); // Unpost the list
- if(0<=index){
- field->setText(getItemText(index));
- field->setIcon(getItemIcon(index));
- if(target) target->tryHandle(this,FXSEL(SEL_COMMAND,message),(void*)(FXival)index);
+long FXListBox::onListClicked(FXObject*,FXSelector sel,void* ptr){
+ button->handle(this,FXSEL(SEL_COMMAND,ID_UNPOST),NULL);
+ if(FXSELTYPE(sel)==SEL_COMMAND){
+ field->setText(getItemText((FXint)(FXival)ptr));
+ field->setIcon(getItemIcon((FXint)(FXival)ptr));
+ if(target) target->tryHandle(this,FXSEL(SEL_COMMAND,message),ptr);
}
return 1;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.27/src/FXMat3f.cpp new/fox-1.6.30/src/FXMat3f.cpp
--- old/fox-1.6.27/src/FXMat3f.cpp 2006-01-22 18:58:35.000000000 +0100
+++ new/fox-1.6.30/src/FXMat3f.cpp 2007-07-20 03:19:50.000000000 +0200
@@ -19,7 +19,7 @@
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
-* $Id: FXMat3f.cpp,v 1.13 2006/01/22 17:58:35 fox Exp $ *
+* $Id: FXMat3f.cpp,v 1.13.2.1 2007/06/27 19:15:49 fox Exp $ *
********************************************************************************/
#include "xincs.h"
#include "fxver.h"
@@ -308,21 +308,6 @@
}
-// Vector times matrix
-FXVec3f operator*(const FXVec3f& v,const FXMat3f& m){
- register FXfloat x=v.x,y=v.y,z=v.z;
- return FXVec3f(x*m[0][0]+y*m[1][0]+z*m[2][0], x*m[0][1]+y*m[1][1]+z*m[2][1], x*m[0][2]+y*m[1][2]+z*m[2][2]);
- }
-
-
-// Vector times matrix
-FXVec2f operator*(const FXVec2f& v,const FXMat3f& m){
- register FXfloat x=v.x,y=v.y;
- FXASSERT(m[0][2]==0.0f && m[1][2]==0.0f && m[2][2]==1.0f);
- return FXVec2f(x*m[0][0]+y*m[1][0]+m[2][0], x*m[0][1]+y*m[1][1]+m[2][1]);
- }
-
-
// Make unit matrix
FXMat3f& FXMat3f::eye(){
m[0][0]=1.0f; m[0][1]=0.0f; m[0][2]=0.0f;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.27/src/FXRealSlider.cpp new/fox-1.6.30/src/FXRealSlider.cpp
--- old/fox-1.6.27/src/FXRealSlider.cpp 2006-08-14 14:00:06.000000000 +0200
+++ new/fox-1.6.30/src/FXRealSlider.cpp 2007-08-09 02:37:06.000000000 +0200
@@ -19,7 +19,7 @@
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
-* $Id: FXRealSlider.cpp,v 1.20.2.1 2006/08/14 12:00:06 fox Exp $ *
+* $Id: FXRealSlider.cpp,v 1.20.2.2 2007/08/09 00:37:06 fox Exp $ *
********************************************************************************/
#include "xincs.h"
#include "fxver.h"
@@ -104,20 +104,27 @@
// Make a slider
FXRealSlider::FXRealSlider(){
flags|=FLAG_ENABLED;
+ range[0]=0.0;
+ range[1]=0.0;
+ pos=0.0;
+ incr=0.01;
+ delta=0.0;
headpos=0;
+ headsize=0;
+ slotsize=0;
+ slotColor=0;
dragpoint=0;
}
// Make a slider
-FXRealSlider::FXRealSlider(FXComposite* p,FXObject* tgt,FXSelector sel,FXuint opts,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb):
- FXFrame(p,opts,x,y,w,h,pl,pr,pt,pb){
+FXRealSlider::FXRealSlider(FXComposite* p,FXObject* tgt,FXSelector sel,FXuint opts,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb):FXFrame(p,opts,x,y,w,h,pl,pr,pt,pb){
flags|=FLAG_ENABLED;
- slotColor=getApp()->getBackColor();
baseColor=getApp()->getBaseColor();
hiliteColor=getApp()->getHiliteColor();
shadowColor=getApp()->getShadowColor();
borderColor=getApp()->getBorderColor();
+ slotColor=getApp()->getBackColor();
target=tgt;
message=sel;
range[0]=0.0;
@@ -126,9 +133,9 @@
incr=0.01;
delta=0.0;
headpos=0;
- dragpoint=0;
headsize=(options&REALSLIDER_INSIDE_BAR)?HEADINSIDEBAR:HEADOVERHANGING;
slotsize=5;
+ dragpoint=0;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.27/src/FXSlider.cpp new/fox-1.6.30/src/FXSlider.cpp
--- old/fox-1.6.27/src/FXSlider.cpp 2006-08-14 14:00:06.000000000 +0200
+++ new/fox-1.6.30/src/FXSlider.cpp 2007-08-09 02:37:06.000000000 +0200
@@ -19,7 +19,7 @@
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
-* $Id: FXSlider.cpp,v 1.65.2.1 2006/08/14 12:00:06 fox Exp $ *
+* $Id: FXSlider.cpp,v 1.65.2.2 2007/08/09 00:37:06 fox Exp $ *
********************************************************************************/
#include "xincs.h"
#include "fxver.h"
@@ -97,20 +97,27 @@
// Make a slider
FXSlider::FXSlider(){
flags|=FLAG_ENABLED;
+ range[0]=0;
+ range[1]=0;
+ pos=0;
+ incr=1;
+ delta=0;
headpos=0;
+ headsize=0;
+ slotsize=0;
+ slotColor=0;
dragpoint=0;
}
// Make a slider
-FXSlider::FXSlider(FXComposite* p,FXObject* tgt,FXSelector sel,FXuint opts,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb):
- FXFrame(p,opts,x,y,w,h,pl,pr,pt,pb){
+FXSlider::FXSlider(FXComposite* p,FXObject* tgt,FXSelector sel,FXuint opts,FXint x,FXint y,FXint w,FXint h,FXint pl,FXint pr,FXint pt,FXint pb):FXFrame(p,opts,x,y,w,h,pl,pr,pt,pb){
flags|=FLAG_ENABLED;
- slotColor=getApp()->getBackColor();
baseColor=getApp()->getBaseColor();
hiliteColor=getApp()->getHiliteColor();
shadowColor=getApp()->getShadowColor();
borderColor=getApp()->getBorderColor();
+ slotColor=getApp()->getBackColor();
target=tgt;
message=sel;
range[0]=0;
@@ -119,9 +126,9 @@
incr=1;
delta=0;
headpos=0;
- dragpoint=0;
headsize=(options&SLIDER_INSIDE_BAR)?HEADINSIDEBAR:HEADOVERHANGING;
slotsize=5;
+ dragpoint=0;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.27/src/FXSplashWindow.cpp new/fox-1.6.30/src/FXSplashWindow.cpp
--- old/fox-1.6.27/src/FXSplashWindow.cpp 2006-08-04 02:15:46.000000000 +0200
+++ new/fox-1.6.30/src/FXSplashWindow.cpp 2007-07-20 03:19:51.000000000 +0200
@@ -19,7 +19,7 @@
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
-* $Id: FXSplashWindow.cpp,v 1.9.2.1 2006/08/01 18:04:44 fox Exp $ *
+* $Id: FXSplashWindow.cpp,v 1.9.2.2 2007/07/19 16:53:17 fox Exp $ *
********************************************************************************/
#include "xincs.h"
#include "fxver.h"
@@ -212,6 +212,8 @@
// Destroy main window
FXSplashWindow::~FXSplashWindow(){
+ getApp()->removeTimeout(this,ID_DELETE);
+ getApp()->removeTimeout(this,ID_HIDE);
if(options&SPLASH_OWNS_ICON) delete icon;
icon=(FXIcon*)-1L;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.27/src/FXText.cpp new/fox-1.6.30/src/FXText.cpp
--- old/fox-1.6.27/src/FXText.cpp 2007-05-17 04:56:16.000000000 +0200
+++ new/fox-1.6.30/src/FXText.cpp 2007-07-20 03:19:54.000000000 +0200
@@ -19,7 +19,7 @@
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
-* $Id: FXText.cpp,v 1.348.2.2 2007/05/17 02:56:16 fox Exp $ *
+* $Id: FXText.cpp,v 1.348.2.3 2007/06/29 13:47:37 fox Exp $ *
********************************************************************************/
#include "xincs.h"
#include "fxver.h"
@@ -496,23 +496,26 @@
// Make a valid position, at the start of a wide character
FXint FXText::validPos(FXint pos) const {
+ register const FXchar *ptr=pos=length) return length;
- return wcvalidate(pos=length || FXISUTF(ptr[pos]) || ++pos>=length || FXISUTF(ptr[pos]) || ++pos>=length || FXISUTF(ptr[pos]) || ++pos>=length || FXISUTF(ptr[pos]) || ++pos>=length || FXISUTF(ptr[pos]) || ++pos), pos;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.27/src/FXTreeListBox.cpp new/fox-1.6.30/src/FXTreeListBox.cpp
--- old/fox-1.6.27/src/FXTreeListBox.cpp 2007-02-07 07:53:39.000000000 +0100
+++ new/fox-1.6.30/src/FXTreeListBox.cpp 2007-06-08 00:08:16.000000000 +0200
@@ -19,7 +19,7 @@
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
-* $Id: FXTreeListBox.cpp,v 1.60.2.1 2007/02/06 16:43:25 fox Exp $ *
+* $Id: FXTreeListBox.cpp,v 1.60.2.2 2007/06/07 20:17:57 fox Exp $ *
********************************************************************************/
#include "xincs.h"
#include "fxver.h"
@@ -85,6 +85,7 @@
FXMAPFUNC(SEL_UPDATE,FXTreeListBox::ID_TREE,FXTreeListBox::onTreeUpdate),
FXMAPFUNC(SEL_CHANGED,FXTreeListBox::ID_TREE,FXTreeListBox::onTreeChanged),
FXMAPFUNC(SEL_CLICKED,FXTreeListBox::ID_TREE,FXTreeListBox::onTreeClicked),
+ FXMAPFUNC(SEL_COMMAND,FXTreeListBox::ID_TREE,FXTreeListBox::onTreeClicked),
FXMAPFUNC(SEL_LEFTBUTTONPRESS,FXTreeListBox::ID_FIELD,FXTreeListBox::onFieldButton),
FXMAPFUNC(SEL_MOUSEWHEEL,FXTreeListBox::ID_FIELD,FXTreeListBox::onMouseWheel),
};
@@ -186,9 +187,9 @@
// Forward clicked message from list to target
-long FXTreeListBox::onTreeClicked(FXObject*,FXSelector,void* ptr){
- button->handle(this,FXSEL(SEL_COMMAND,ID_UNPOST),NULL); // Unpost the list
- if(ptr){
+long FXTreeListBox::onTreeClicked(FXObject*,FXSelector sel,void* ptr){
+ button->handle(this,FXSEL(SEL_COMMAND,ID_UNPOST),NULL);
+ if(FXSELTYPE(sel)==SEL_COMMAND){
field->setText(tree->getItemText((FXTreeItem*)ptr));
field->setIcon(tree->getItemClosedIcon((FXTreeItem*)ptr));
if(target) target->tryHandle(this,FXSEL(SEL_COMMAND,message),ptr);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/fox-1.6.27/src/version.rc new/fox-1.6.30/src/version.rc
--- old/fox-1.6.27/src/version.rc 2007-06-05 04:21:52.000000000 +0200
+++ new/fox-1.6.30/src/version.rc 2007-10-06 15:49:57.000000000 +0200
@@ -1,5 +1,5 @@
1 VERSIONINFO
-FILEVERSION 1,6,27,0
+FILEVERSION 1,6,30,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -15,7 +15,7 @@
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "FOX GUI Library\0"
-VALUE "FileVersion", "1,6,27.0\0"
+VALUE "FileVersion", "1,6,30.0\0"
VALUE "LegalCopyright", "GNU Library General Public License\0"
END
END
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org