[Fxruby-commits] CVS: FXRuby/fox-includes FX4Splitter.h,1.5,1.6 FXArray.h,1.3,1.4 FXArrowButton.h,1.
Status: Inactive
Brought to you by:
lyle
Update of /cvsroot/fxruby/FXRuby/fox-includes
In directory usw-pr-cvs1:/tmp/cvs-serv10097
Modified Files:
FX4Splitter.h FXArray.h FXArrowButton.h FXBMPIcon.h
FXBMPImage.h FXBitmap.h FXButton.h FXCURCursor.h FXCanvas.h
FXCharset.h FXCheckButton.h FXColorDialog.h FXColorSelector.h
FXColorWell.h FXColorWheel.h FXComposite.h FXDHMat.h FXDHVec.h
FXDQuat.h FXDVec.h FXDataTarget.h FXDebugTarget.h
FXDelegator.h FXDial.h FXDict.h FXDirBox.h FXDirDialog.h
FXDirSelector.h FXDocument.h FXDragCorner.h FXDrawable.h
FXDriveBox.h FXElement.h FXException.h FXFile.h FXFileDialog.h
FXFileDict.h FXFileList.h FXFileSelector.h FXFont.h
FXFontDialog.h FXFontSelector.h FXFrame.h FXGIFCursor.h
FXGIFIcon.h FXGIFImage.h FXGLCanvas.h FXGLCone.h FXGLContext.h
FXGLCube.h FXGLCylinder.h FXGLObject.h FXGLShape.h
FXGLSphere.h FXGLTriangleMesh.h FXGLViewer.h FXGLVisual.h
FXGroupBox.h FXHMat.h FXHVec.h FXHeader.h FXHorizontalFrame.h
FXICOIcon.h FXICOImage.h FXIcon.h FXId.h FXImage.h
FXImageView.h FXInputDialog.h FXJPGIcon.h FXJPGImage.h
FXLabel.h FXMDIButton.h FXMenuButton.h FXMenuCaption.h
FXMenuCascade.h FXMenuCommand.h FXMenuPane.h FXMenuSeparator.h
FXMenuTitle.h FXMessageBox.h FXObjectList.h FXOptionMenu.h
FXPCXIcon.h FXPCXImage.h FXPNGIcon.h FXPNGImage.h FXPacker.h
FXPicker.h FXPoint.h FXPrintDialog.h FXQuat.h FXRGBIcon.h
FXRGBImage.h FXRadioButton.h FXRange.h FXRecentFiles.h
FXRectangle.h FXRegion.h FXRegistry.h FXReplaceDialog.h
FXRex.h FXRootWindow.h FXScrollWindow.h FXSearchDialog.h
FXSettings.h FXShell.h FXShutter.h FXSize.h FXSlider.h
FXSpinner.h FXSplitter.h FXString.h FXStringDict.h
FXSwitcher.h FXTGAIcon.h FXTGAImage.h FXTIFIcon.h FXTIFImage.h
FXTabBar.h FXTabBook.h FXTabItem.h FXToggleButton.h FXURL.h
FXUndoList.h FXVec.h FXVerticalFrame.h FXVisual.h FXXPMIcon.h
FXXPMImage.h fx.h fx3d.h fxkeys.h fxver.h xincs.h
Log Message:
Checked in first set of fox-1.1.13 header files (those which haven't
changed other than inclusion in FX namespace).
Index: FX4Splitter.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FX4Splitter.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FX4Splitter.h 26 Nov 2001 16:13:03 -0000 1.5
--- FX4Splitter.h 11 Jul 2002 17:28:13 -0000 1.6
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1999,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1999,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FX4SPLITTER_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FX4SPLITTER_H
***************
*** 29,33 ****
#endif
!
// Splitter options
--- 29,33 ----
#endif
! namespace FX {
// Splitter options
***************
*** 157,160 ****
--- 157,161 ----
};
+ }
#endif
Index: FXArray.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXArray.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FXArray.h 8 Mar 2001 21:51:06 -0000 1.3
--- FXArray.h 11 Jul 2002 17:28:13 -0000 1.4
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1997,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1997,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,28 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXARRAY_H
#define FXARRAY_H
--- 20,33 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXARRAY_H
#define FXARRAY_H
+ #ifndef FXELEMENT_H
+ #include "FXElement.h"
+ #endif
+
+ namespace FX {
***************
*** 104,108 ****
template<class TYPE>
FXint FXArray<TYPE>::size() const {
! return total;
}
--- 109,113 ----
template<class TYPE>
FXint FXArray<TYPE>::size() const {
! return total;
}
***************
*** 126,131 ****
template<class TYPE>
const TYPE& FXArray<TYPE>::operator[](FXint i) const {
! FXASSERT(0<=i&&i<number);
! return list[i];
}
--- 131,136 ----
template<class TYPE>
const TYPE& FXArray<TYPE>::operator[](FXint i) const {
! FXASSERT(0<=i&&i<number);
! return list[i];
}
***************
*** 133,139 ****
// Return element lvalue
template<class TYPE>
! TYPE& FXArray<TYPE>::operator[](FXint i){
! FXASSERT(0<=i&&i<number);
! return list[i];
}
--- 138,144 ----
// Return element lvalue
template<class TYPE>
! TYPE& FXArray<TYPE>::operator[](FXint i){
! FXASSERT(0<=i&&i<number);
! return list[i];
}
***************
*** 188,192 ****
}
}
!
// Insert element anywhere
--- 193,197 ----
}
}
!
// Insert element anywhere
***************
*** 198,203 ****
list[pos]=p;
}
!
!
// Append element at end
template<class TYPE>
--- 203,208 ----
list[pos]=p;
}
!
!
// Append element at end
template<class TYPE>
***************
*** 253,258 ****
// Trunc excess
template<class TYPE>
! void FXArray<TYPE>::trunc(){
! size(number);
}
--- 258,263 ----
// Trunc excess
template<class TYPE>
! void FXArray<TYPE>::trunc(){
! size(number);
}
***************
*** 260,265 ****
// Clear the list
template<class TYPE>
! void FXArray<TYPE>::clear(){
! size(0);
}
--- 265,270 ----
// Clear the list
template<class TYPE>
! void FXArray<TYPE>::clear(){
! size(0);
}
***************
*** 282,287 ****
constructElms(list,number); // Fresh elements
loadElms(store,list,number); // Uses load operator
! }
!
// Destruct list
--- 287,292 ----
constructElms(list,number); // Fresh elements
loadElms(store,list,number); // Uses load operator
! }
!
// Destruct list
***************
*** 292,295 ****
--- 297,301 ----
}
+ }
#endif
Index: FXArrowButton.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXArrowButton.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** FXArrowButton.h 17 Jan 2002 23:52:57 -0000 1.9
--- FXArrowButton.h 11 Jul 2002 17:28:13 -0000 1.10
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXARROWBUTTON_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXARROWBUTTON_H
***************
*** 29,32 ****
--- 29,34 ----
#endif
+ namespace FX {
+
struct FXTimer;
***************
*** 161,164 ****
--- 163,167 ----
};
+ }
#endif
Index: FXBMPIcon.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXBMPIcon.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FXBMPIcon.h 2 Jan 2002 22:23:55 -0000 1.4
--- FXBMPIcon.h 11 Jul 2002 17:28:13 -0000 1.5
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1997,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1997,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXBMPICON_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXBMPICON_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 62,65 ****
--- 63,67 ----
extern FXAPI FXbool fxsaveBMP(FXStream& store,const FXuchar *data,FXColor transp,FXint width,FXint height);
+ }
#endif
Index: FXBMPImage.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXBMPImage.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FXBMPImage.h 2 Jan 2002 22:23:56 -0000 1.4
--- FXBMPImage.h 11 Jul 2002 17:28:13 -0000 1.5
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXBMPIMAGE_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXBMPIMAGE_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 62,65 ****
--- 63,67 ----
extern FXAPI FXbool fxsaveBMP(FXStream& store,const FXuchar *data,FXColor transp,FXint width,FXint height);
+ }
#endif
Index: FXBitmap.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXBitmap.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FXBitmap.h 2 Jan 2002 22:23:56 -0000 1.5
--- FXBitmap.h 11 Jul 2002 17:28:13 -0000 1.6
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXBITMAP_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXBITMAP_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
// Image rendering hints
***************
*** 111,114 ****
--- 112,116 ----
};
+ }
#endif
Index: FXButton.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXButton.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** FXButton.h 17 Jan 2002 23:52:57 -0000 1.9
--- FXButton.h 11 Jul 2002 17:28:13 -0000 1.10
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1997,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1997,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXBUTTON_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXBUTTON_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 100,104 ****
/// Set as default button
virtual void setDefault(FXbool enable=TRUE);
!
/// Set the button state
void setState(FXuint s);
--- 101,105 ----
/// Set as default button
virtual void setDefault(FXbool enable=TRUE);
!
/// Set the button state
void setState(FXuint s);
***************
*** 112,118 ****
/// Get the button style flags
FXuint getButtonStyle() const;
!
};
#endif
--- 113,120 ----
/// Get the button style flags
FXuint getButtonStyle() const;
!
};
+ }
#endif
Index: FXCURCursor.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXCURCursor.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXCURCursor.h 2 Jan 2002 22:23:56 -0000 1.1
--- FXCURCursor.h 11 Jul 2002 17:28:13 -0000 1.2
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 2001 by Sander Jansen. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 2001,2002 by Sander Jansen. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCURCURSOR_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCURCURSOR_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
/// CUR Cursor class
***************
*** 54,57 ****
--- 55,59 ----
extern FXAPI FXbool fxloadCUR(FXStream& store,FXuchar*& source,FXuchar*& mask,FXint& width,FXint& height,FXint& xspot,FXint& yspot);
+ }
#endif
Index: FXCanvas.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXCanvas.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FXCanvas.h 26 Nov 2001 16:13:03 -0000 1.4
--- FXCanvas.h 11 Jul 2002 17:28:13 -0000 1.5
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1997,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1997,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCANVAS_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCANVAS_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 53,56 ****
--- 54,58 ----
};
+ }
#endif
Index: FXCharset.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXCharset.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FXCharset.h 16 Feb 2001 00:04:14 -0000 1.2
--- FXCharset.h 11 Jul 2002 17:28:13 -0000 1.3
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 2000 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 2000,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,30 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCHARSET_H
#define FXCHARSET_H
! /// A set of characters
class FXAPI FXCharset {
private:
--- 20,31 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCHARSET_H
#define FXCHARSET_H
+ namespace FX {
! /// A set of characters
class FXAPI FXCharset {
private:
***************
*** 56,60 ****
/// See if character ch is member of set
! FXbool has(FXchar ch) const {
return (s[((FXuchar)ch)>>5] & (1<<(ch&31)))!=0;
}
--- 57,61 ----
/// See if character ch is member of set
! FXbool has(FXchar ch) const {
return (s[((FXuchar)ch)>>5] & (1<<(ch&31)))!=0;
}
***************
*** 73,77 ****
/// Include character ch into set
! FXCharset& operator+=(FXchar ch){
s[((FXuchar)ch)>>5] |= (1<<(ch&31));
return *this;
--- 74,78 ----
/// Include character ch into set
! FXCharset& operator+=(FXchar ch){
s[((FXuchar)ch)>>5] |= (1<<(ch&31));
return *this;
***************
*** 79,83 ****
/// Exclude character ch from set
! FXCharset& operator-=(FXchar ch){
s[((FXuchar)ch)>>5] &= ~(1<<(ch&31));
return *this;
--- 80,84 ----
/// Exclude character ch from set
! FXCharset& operator-=(FXchar ch){
s[((FXuchar)ch)>>5] &= ~(1<<(ch&31));
return *this;
***************
*** 151,156 ****
--- 152,159 ----
/// Load set from a stream
friend FXAPI FXStream& operator>>(FXStream& store,FXCharset& cs);
+
};
+ }
#endif
Index: FXCheckButton.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXCheckButton.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FXCheckButton.h 26 Nov 2001 16:13:03 -0000 1.7
--- FXCheckButton.h 11 Jul 2002 17:28:13 -0000 1.8
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCHECKBUTTON_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCHECKBUTTON_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 117,120 ****
--- 118,122 ----
};
+ }
#endif
Index: FXColorDialog.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXColorDialog.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FXColorDialog.h 26 Nov 2001 16:13:03 -0000 1.3
--- FXColorDialog.h 11 Jul 2002 17:28:13 -0000 1.4
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCOLORDIALOG_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCOLORDIALOG_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 87,90 ****
--- 88,92 ----
};
+ }
#endif
Index: FXColorSelector.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXColorSelector.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FXColorSelector.h 26 Nov 2001 16:13:03 -0000 1.4
--- FXColorSelector.h 11 Jul 2002 17:28:13 -0000 1.5
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCOLORSELECTOR_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCOLORSELECTOR_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 179,182 ****
--- 180,184 ----
};
+ }
#endif
Index: FXColorWell.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXColorWell.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FXColorWell.h 17 Jan 2002 23:52:57 -0000 1.8
--- FXColorWell.h 11 Jul 2002 17:28:13 -0000 1.9
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCOLORWELL_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCOLORWELL_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 167,170 ****
--- 168,172 ----
};
+ }
#endif
Index: FXColorWheel.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXColorWheel.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FXColorWheel.h 26 Nov 2001 16:13:03 -0000 1.2
--- FXColorWheel.h 11 Jul 2002 17:28:13 -0000 1.3
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 2001,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCOLORWHEEL_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCOLORWHEEL_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 123,126 ****
--- 124,128 ----
};
+ }
#endif
Index: FXComposite.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXComposite.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FXComposite.h 26 Nov 2001 16:13:03 -0000 1.5
--- FXComposite.h 11 Jul 2002 17:28:13 -0000 1.6
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1997,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1997,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCOMPOSITE_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXCOMPOSITE_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 81,84 ****
--- 82,86 ----
};
+ }
#endif
Index: FXDHMat.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXDHMat.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FXDHMat.h 16 Feb 2001 00:04:15 -0000 1.2
--- FXDHMat.h 11 Jul 2002 17:28:13 -0000 1.3
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1994,2000 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1994,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,28 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDHMAT_H
#define FXDHMAT_H
/// Homogeneous matrix (double-precision version)
--- 20,29 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDHMAT_H
#define FXDHMAT_H
+ namespace FX {
/// Homogeneous matrix (double-precision version)
***************
*** 50,57 ****
FXDHMat& operator/=(FXdouble w);
! /// Return a non-const reference to the ith row
FXDHVec& operator[](FXint i){return m[i];}
! /// Return a const reference to the ith row
const FXDHVec& operator[](FXint i) const {return m[i];}
--- 51,58 ----
FXDHMat& operator/=(FXdouble w);
! /// Return a non-const reference to the ith row
FXDHVec& operator[](FXint i){return m[i];}
! /// Return a const reference to the ith row
const FXDHVec& operator[](FXint i) const {return m[i];}
***************
*** 77,81 ****
friend FXAPI FXDVec operator*(const FXDVec& v,const FXDHMat& m);
friend FXAPI FXDVec operator*(const FXDHMat& a,const FXDVec& v);
!
/// Set to identity matrix
FXDHMat& eye();
--- 78,82 ----
friend FXAPI FXDVec operator*(const FXDVec& v,const FXDHMat& m);
friend FXAPI FXDVec operator*(const FXDHMat& a,const FXDVec& v);
!
/// Set to identity matrix
FXDHMat& eye();
***************
*** 83,87 ****
/// Orthographic projection
FXDHMat& ortho(FXdouble left,FXdouble right,FXdouble bottom,FXdouble top,FXdouble hither,FXdouble yon);
!
/// Perspective projection
FXDHMat& frustum(FXdouble left,FXdouble right,FXdouble bottom,FXdouble top,FXdouble hither,FXdouble yon);
--- 84,88 ----
/// Orthographic projection
FXDHMat& ortho(FXdouble left,FXdouble right,FXdouble bottom,FXdouble top,FXdouble hither,FXdouble yon);
!
/// Perspective projection
FXDHMat& frustum(FXdouble left,FXdouble right,FXdouble bottom,FXdouble top,FXdouble hither,FXdouble yon);
***************
*** 138,141 ****
--- 139,144 ----
friend FXAPI FXStream& operator>>(FXStream& store,FXDHMat& m);
};
+
+ }
#endif
Index: FXDHVec.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXDHVec.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FXDHVec.h 16 Feb 2001 00:04:15 -0000 1.2
--- FXDHVec.h 11 Jul 2002 17:28:13 -0000 1.3
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1994 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1994,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,28 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDHVEC_H
#define FXDHVEC_H
--- 20,29 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDHVEC_H
#define FXDHVEC_H
+ namespace FX {
***************
*** 110,114 ****
};
!
#endif
--- 111,115 ----
};
! }
#endif
Index: FXDQuat.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXDQuat.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FXDQuat.h 16 Feb 2001 00:04:15 -0000 1.2
--- FXDQuat.h 11 Jul 2002 17:28:13 -0000 1.3
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1994,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1994,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,28 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDQUAT_H
#define FXDQUAT_H
/// Quaternion (double-precision version)
--- 20,29 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDQUAT_H
#define FXDQUAT_H
+ namespace FX {
/// Quaternion (double-precision version)
***************
*** 35,39 ****
/// Construct from axis and angle
FXDQuat(const FXDVec& axis,FXdouble phi=0.0);
!
/// Construct from euler angles yaw (z), pitch (y), and roll (x)
FXDQuat(FXdouble roll,FXdouble pitch,FXdouble yaw);
--- 36,40 ----
/// Construct from axis and angle
FXDQuat(const FXDVec& axis,FXdouble phi=0.0);
!
/// Construct from euler angles yaw (z), pitch (y), and roll (x)
FXDQuat(FXdouble roll,FXdouble pitch,FXdouble yaw);
***************
*** 47,60 ****
/// Set quaternion from yaw (z), pitch (y), and roll (x)
void setRollPitchYaw(FXdouble roll,FXdouble pitch,FXdouble yaw);
!
! /// Obtain yaw, pitch, and roll
void getRollPitchYaw(FXdouble& roll,FXdouble& pitch,FXdouble& yaw);
!
/// Exponentiate quaternion
friend FXAPI FXDQuat exp(const FXDQuat& q);
!
/// Take logarithm of quaternion
friend FXAPI FXDQuat log(const FXDQuat& q);
!
/// Invert quaternion
friend FXAPI FXDQuat invert(const FXDQuat& q);
--- 48,61 ----
/// Set quaternion from yaw (z), pitch (y), and roll (x)
void setRollPitchYaw(FXdouble roll,FXdouble pitch,FXdouble yaw);
!
! /// Obtain yaw, pitch, and roll
void getRollPitchYaw(FXdouble& roll,FXdouble& pitch,FXdouble& yaw);
!
/// Exponentiate quaternion
friend FXAPI FXDQuat exp(const FXDQuat& q);
!
/// Take logarithm of quaternion
friend FXAPI FXDQuat log(const FXDQuat& q);
!
/// Invert quaternion
friend FXAPI FXDQuat invert(const FXDQuat& q);
***************
*** 72,75 ****
--- 73,78 ----
friend FXAPI FXDQuat lerp(const FXDQuat& u,const FXDQuat& v,FXdouble f);
};
+
+ }
#endif
Index: FXDVec.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXDVec.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FXDVec.h 16 Feb 2001 00:04:15 -0000 1.2
--- FXDVec.h 11 Jul 2002 17:28:13 -0000 1.3
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1994,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1994,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,28 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDVEC_H
#define FXDVEC_H
--- 20,29 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDVEC_H
#define FXDVEC_H
+ namespace FX {
***************
*** 105,109 ****
};
!
#endif
--- 106,110 ----
};
! }
#endif
Index: FXDataTarget.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXDataTarget.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FXDataTarget.h 26 Nov 2001 16:13:03 -0000 1.4
--- FXDataTarget.h 11 Jul 2002 17:28:13 -0000 1.5
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDATATARGET_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDATATARGET_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 156,162 ****
/// Associate with string variable
void connect(FXString& value){ type=DT_STRING; data=&value; }
};
!
#endif
--- 157,166 ----
/// Associate with string variable
void connect(FXString& value){ type=DT_STRING; data=&value; }
+
+ /// Destroy
+ virtual ~FXDataTarget();
};
! }
#endif
Index: FXDebugTarget.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXDebugTarget.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FXDebugTarget.h 26 Nov 2001 16:13:03 -0000 1.3
--- FXDebugTarget.h 11 Jul 2002 17:28:13 -0000 1.4
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDEBUGTARGET_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDEBUGTARGET_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 56,61 ****
};
!
!
#endif
--- 57,61 ----
};
! }
#endif
Index: FXDelegator.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXDelegator.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FXDelegator.h 26 Nov 2001 16:13:03 -0000 1.3
--- FXDelegator.h 11 Jul 2002 17:28:13 -0000 1.4
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 2000,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 2000,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDELEGATOR_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDELEGATOR_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 64,69 ****
};
!
!
#endif
--- 65,69 ----
};
! }
#endif
Index: FXDial.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXDial.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FXDial.h 26 Nov 2001 16:13:03 -0000 1.6
--- FXDial.h 11 Jul 2002 17:28:13 -0000 1.7
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1998,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
*********************************************************************************
! * Copyright (C) 1998,2002 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDIAL_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDIAL_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 169,172 ****
--- 170,175 ----
virtual void load(FXStream& store);
};
+
+ }
#endif
Index: FXDict.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXDict.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FXDict.h 25 Feb 2002 15:57:03 -0000 1.5
--- FXDict.h 11 Jul 2002 17:28:13 -0000 1.6
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDICT_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDICT_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 161,164 ****
--- 162,166 ----
};
+ }
#endif
Index: FXDirBox.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXDirBox.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FXDirBox.h 26 Nov 2001 16:13:03 -0000 1.4
--- FXDirBox.h 11 Jul 2002 17:28:13 -0000 1.5
***************
*** 4,8 ****
* *
*********************************************************************************
! * Copyright (C) 1999,2001 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 4,8 ----
* *
**************************************************...
[truncated message content] |