[Fxruby-commits] CVS: FXRuby/fox-includes FXDirList.h,1.8,1.9 FXIconList.h,1.11,1.12 FXList.h,1.11,1
Status: Inactive
Brought to you by:
lyle
Menu
▾
▴
[Fxruby-commits] CVS: FXRuby/fox-includes FXDirList.h,1.8,1.9 FXIconList.h,1.11,1.12 FXList.h,1.11,1.12 FXListBox.h,1.8,1.9 FXMDIChild.h,1.5,1.6 FXMDIClient.h,1.3,1.4
|
From: Lyle J. <ly...@us...> - 2002-07-11 20:36:42
|
Update of /cvsroot/fxruby/FXRuby/fox-includes
In directory usw-pr-cvs1:/tmp/cvs-serv11358
Modified Files:
FXDirList.h FXIconList.h FXList.h FXListBox.h FXMDIChild.h
FXMDIClient.h
Log Message:
Index: FXDirList.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXDirList.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FXDirList.h 26 Nov 2001 16:13:03 -0000 1.8
--- FXDirList.h 11 Jul 2002 20:36:38 -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 FXDIRLIST_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXDIRLIST_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 72,84 ****
--- 73,108 ----
/// Constructor
FXDirItem(const FXString& text,FXIcon* oi=NULL,FXIcon* ci=NULL,void* ptr=NULL):FXTreeItem(text,oi,ci,ptr),iprev(NULL),inext(NULL),list(NULL),assoc(NULL),size(0),date(0){}
+
+ /// Return true if this is a file item
+ FXbool isFile() const { return (state&(FOLDER|BLOCKDEV|CHARDEV|FIFO|SOCK))==0; }
+
+ /// Return true if this is a directory item
FXbool isDirectory() const { return (state&FOLDER)!=0; }
+
+ /// Return true if this is an executable item
FXbool isExecutable() const { return (state&EXECUTABLE)!=0; }
+
+ /// Return true if this is a symbolic link item
FXbool isSymlink() const { return (state&SYMLINK)!=0; }
+
+ /// Return true if this is a character device item
FXbool isChardev() const { return (state&CHARDEV)!=0; }
+
+ /// Return true if this is a block device item
FXbool isBlockdev() const { return (state&BLOCKDEV)!=0; }
+
+ /// Return true if this is an FIFO item
FXbool isFifo() const { return (state&FIFO)!=0; }
+
+ /// Return true if this is a socket
FXbool isSocket() const { return (state&SOCK)!=0; }
+
+ /// Return the file-association object for this item
FXFileAssoc* getAssoc() const { return assoc; }
+
+ /// Return the file size for this item
unsigned long getSize() const { return size; }
+
+ /// Return the date for this item
FXTime getDate() const { return date; }
};
***************
*** 248,251 ****
--- 272,276 ----
};
+ }
#endif
Index: FXIconList.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXIconList.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** FXIconList.h 2 Jan 2002 22:23:56 -0000 1.11
--- FXIconList.h 11 Jul 2002 20:36:38 -0000 1.12
***************
*** 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 FXICONLIST_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXICONLIST_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 389,393 ****
/// Repaint item at index
! void updateItem(FXint index);
/// Select items in rectangle
--- 390,394 ----
/// Repaint item at index
! void updateItem(FXint index) const;
/// Select items in rectangle
***************
*** 491,495 ****
};
!
#endif
--- 492,496 ----
};
! }
#endif
Index: FXList.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXList.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** FXList.h 2 Jan 2002 22:23:56 -0000 1.11
--- FXList.h 11 Jul 2002 20:36:38 -0000 1.12
***************
*** 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 FXLIST_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXLIST_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 300,304 ****
/// Repaint item
! void updateItem(FXint index);
/// Enable item
--- 301,305 ----
/// Repaint item
! void updateItem(FXint index) const;
/// Enable item
***************
*** 393,396 ****
--- 394,398 ----
};
+ }
#endif
Index: FXListBox.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXListBox.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FXListBox.h 27 Feb 2002 19:19:04 -0000 1.8
--- FXListBox.h 11 Jul 2002 20:36:38 -0000 1.9
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 60,63 ****
--- 61,65 ----
long onFocusUp(FXObject*,FXSelector,void*);
long onFocusDown(FXObject*,FXSelector,void*);
+ long onFocusSelf(FXObject*,FXSelector,void*);
long onFieldButton(FXObject*,FXSelector,void*);
long onListUpdate(FXObject*,FXSelector,void*);
***************
*** 226,230 ****
};
!
#endif
--- 228,232 ----
};
! }
#endif
Index: FXMDIChild.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXMDIChild.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FXMDIChild.h 26 Nov 2001 16:13:04 -0000 1.5
--- FXMDIChild.h 11 Jul 2002 20:36:38 -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 FXMDICHILD_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXMDICHILD_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 82,88 ****
FXint oldh;
FXuchar action;
- private:
- FXMDIChild *mdinext;
- FXMDIChild *mdiprev;
protected:
FXMDIChild();
--- 83,86 ----
***************
*** 113,119 ****
long onSelected(FXObject*,FXSelector,void*);
long onDeselected(FXObject*,FXSelector,void*);
- long onMinimize(FXObject*,FXSelector,void*);
- long onRestore(FXObject*,FXSelector,void*);
- long onMaximize(FXObject*,FXSelector,void*);
long onCmdRestore(FXObject*,FXSelector,void*);
long onCmdMaximize(FXObject*,FXSelector,void*);
--- 111,114 ----
***************
*** 131,134 ****
--- 126,130 ----
long onUpdClose(FXObject*,FXSelector,void*);
long onCmdSetStringValue(FXObject*,FXSelector,void*);
+ long onCmdGetStringValue(FXObject*,FXSelector,void*);
virtual long onDefault(FXObject*,FXSelector,void*);
public:
***************
*** 143,152 ****
virtual void detach();
- /// Get next MDI Child
- FXMDIChild* getMDINext() const { return mdinext; }
-
- /// Get previous MDI Child
- FXMDIChild* getMDIPrev() const { return mdiprev; }
-
/// Compute default size
virtual FXint getDefaultWidth();
--- 139,142 ----
***************
*** 214,217 ****
--- 204,219 ----
void setTitleBackColor(FXColor clr);
+ /// Maximize MDI window, return TRUE if maximized
+ virtual FXbool maximize(FXbool notify=FALSE);
+
+ /// Minimize/iconify MDI window, return TRUE if minimized
+ virtual FXbool minimize(FXbool notify=FALSE);
+
+ /// Restore MDI window to normal, return TRUE if restored
+ virtual FXbool restore(FXbool notify=FALSE);
+
+ /// Close MDI window, return TRUE if actually closed
+ virtual FXbool close(FXbool notify=FALSE);
+
/// Return TRUE if maximized
FXbool isMaximized() const;
***************
*** 220,232 ****
FXbool isMinimized() const;
- /// Maximize MDI Child
- virtual void maximize(FXbool notify=FALSE);
-
- /// Minimize/iconify MDI Child
- virtual void minimize(FXbool notify=FALSE);
-
- /// Restore MDI Child to normal
- virtual void restore(FXbool notify=FALSE);
-
/// Get window icon
FXIcon *getWindowIcon() const;
--- 222,225 ----
***************
*** 257,260 ****
--- 250,254 ----
};
+ }
#endif
Index: FXMDIClient.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXMDIClient.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FXMDIClient.h 26 Nov 2001 16:13:04 -0000 1.3
--- FXMDIClient.h 11 Jul 2002 20:36:38 -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 FXMDICLIENT_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXMDICLIENT_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 47,67 ****
* window by the MDI client.
*/
! class FXAPI FXMDIClient : public FXScrollArea {
FXDECLARE(FXMDIClient)
friend class FXMDIChild;
protected:
FXint cascadex; // Cascade offset X
FXint cascadey; // Cascade offset Y
- FXint xmin; // Space taken up by all children
- FXint xmax;
- FXint ymin;
- FXint ymax;
- private:
- FXMDIChild *mdifirst;
- FXMDIChild *mdilast;
- FXMDIChild *active;
protected:
FXMDIClient();
- void recompute();
virtual void layout();
private:
--- 48,60 ----
* window by the MDI client.
*/
! class FXAPI FXMDIClient : public FXComposite {
FXDECLARE(FXMDIClient)
friend class FXMDIChild;
protected:
+ FXMDIChild *active; // Active child
FXint cascadex; // Cascade offset X
FXint cascadey; // Cascade offset Y
protected:
FXMDIClient();
virtual void layout();
private:
***************
*** 116,130 ****
FXMDIClient(FXComposite* p,FXuint opts=0,FXint x=0,FXint y=0,FXint w=0,FXint h=0);
! /// Recalculate interior for scrollbars
! virtual void recalc();
!
! /// Move MDI Children around
! virtual void moveContents(FXint x,FXint y);
!
! /// Get first MDI Child
! FXMDIChild* getMDIChildFirst() const { return mdifirst; }
! /// Get last MDI Child
! FXMDIChild* getMDIChildLast() const { return mdilast; }
/// Pass message to all MDI Child windows
--- 109,117 ----
FXMDIClient(FXComposite* p,FXuint opts=0,FXint x=0,FXint y=0,FXint w=0,FXint h=0);
! /// Return default width
! virtual FXint getDefaultWidth();
! /// Return default height
! virtual FXint getDefaultHeight();
/// Pass message to all MDI Child windows
***************
*** 134,149 ****
long forallDocWindows(FXObject* document,FXObject* sender,FXSelector sel,void* ptr);
! /// Recompute content width
! virtual FXint getContentWidth();
!
! /// Recompute content height
! virtual FXint getContentHeight();
/// Get current active child; may be NULL!
FXMDIChild* getActiveChild() const { return active; }
! /// Set active MDI Child
! FXbool setActiveChild(FXMDIChild* child=NULL,FXbool notify=TRUE);
!
/// Change cascade offset X
void setCascadeX(FXint off){ cascadex=off; }
--- 121,139 ----
long forallDocWindows(FXObject* document,FXObject* sender,FXSelector sel,void* ptr);
! /// Set active MDI Child
! virtual FXbool setActiveChild(FXMDIChild* child=NULL,FXbool notify=TRUE);
/// Get current active child; may be NULL!
FXMDIChild* getActiveChild() const { return active; }
! // Cascade windows
! virtual void cascade(FXbool notify=FALSE);
!
! // Layout horizontally
! virtual void horizontal(FXbool notify=FALSE);
!
! // Layout vertically
! virtual void vertical(FXbool notify=FALSE);
!
/// Change cascade offset X
void setCascadeX(FXint off){ cascadex=off; }
***************
*** 168,171 ****
--- 158,162 ----
};
+ }
#endif
|
