[Fxruby-commits] CVS: FXRuby/fox-includes FXMainWindow.h,1.4,1.5 FXMatrix.h,1.4,1.5 FXObject.h,1.4,1
Status: Inactive
Brought to you by:
lyle
Menu
▾
▴
[Fxruby-commits] CVS: FXRuby/fox-includes FXMainWindow.h,1.4,1.5 FXMatrix.h,1.4,1.5 FXObject.h,1.4,1.5 FXPopup.h,1.6,1.7 FXProgressBar.h,1.5,1.6 FXProgressDialog.h,1.2,1.3 FXScrollArea.h,1.6,1.7 FXSeparator.h,1.3,1.4 FXStream.h,1.2,1.3 FXTable.h,1.6,1.7 FXText.h,1.11,1.12 FXTextField.h,1.8,1.9 FXTopWindow.h,1.8,1.9 FXTreeList.h,1.10,1.11 FXTreeListBox.h,1.7,1.8 FXWindow.h,1.9,1.10 fxdefs.h,1.17,1.18
|
From: Lyle J. <ly...@us...> - 2002-07-12 16:34:51
|
Update of /cvsroot/fxruby/FXRuby/fox-includes
In directory usw-pr-cvs1:/tmp/cvs-serv30500/fox-includes
Modified Files:
FXMainWindow.h FXMatrix.h FXObject.h FXPopup.h FXProgressBar.h
FXProgressDialog.h FXScrollArea.h FXSeparator.h FXStream.h
FXTable.h FXText.h FXTextField.h FXTopWindow.h FXTreeList.h
FXTreeListBox.h FXWindow.h fxdefs.h
Log Message:
Many, many changes for the fox-1.1 update.
Index: FXMainWindow.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXMainWindow.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FXMainWindow.h 26 Nov 2001 16:13:04 -0000 1.4
--- FXMainWindow.h 12 Jul 2002 16:34:47 -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 FXMAINWINDOW_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXMAINWINDOW_H
***************
*** 29,35 ****
#endif
! /// Main application window
class FXAPI FXMainWindow : public FXTopWindow {
FXDECLARE(FXMainWindow)
--- 29,44 ----
#endif
+ namespace FX {
! /**
! * Main application window. There may be any number of
! * MainWindows in an application.
! * When a MainWindow is closed, it sends a SEL_CLOSE message to
! * its target; the target should return 0 if there is no objection
! * against proceeding with the close, and 1 otherwise.
! * After the SEL_CLOSE message has been sent and no objection was
! * raised, the MainWindow will delete itself.
! */
class FXAPI FXMainWindow : public FXTopWindow {
FXDECLARE(FXMainWindow)
***************
*** 40,55 ****
FXMainWindow &operator=(const FXMainWindow&);
public:
- long onClose(FXObject*,FXSelector,void*);
- public:
/// Construct a main window
FXMainWindow(FXApp* a,const FXString& name,FXIcon *ic=NULL,FXIcon *mi=NULL,FXuint opts=DECOR_ALL,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=0,FXint pr=0,FXint pt=0,FXint pb=0,FXint hs=0,FXint vs=0);
/// Destructor
virtual ~FXMainWindow();
};
!
!
#endif
--- 49,64 ----
FXMainWindow &operator=(const FXMainWindow&);
public:
/// Construct a main window
FXMainWindow(FXApp* a,const FXString& name,FXIcon *ic=NULL,FXIcon *mi=NULL,FXuint opts=DECOR_ALL,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=0,FXint pr=0,FXint pt=0,FXint pb=0,FXint hs=0,FXint vs=0);
+ /// Create server-side resources
+ virtual void create();
+
/// Destructor
virtual ~FXMainWindow();
};
! }
#endif
Index: FXMatrix.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXMatrix.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FXMatrix.h 26 Nov 2001 16:13:04 -0000 1.4
--- FXMatrix.h 12 Jul 2002 16:34:47 -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 FXMATRIX_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXMATRIX_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 86,93 ****
/// Return the row in which the given child is placed
! FXint rowOfChild(FXWindow* child) const;
/// Return the column in which the given child is placed
! FXint colOfChild(FXWindow* child) const;
/// Change the matrix style
--- 87,94 ----
/// Return the row in which the given child is placed
! FXint rowOfChild(const FXWindow* child) const;
/// Return the column in which the given child is placed
! FXint colOfChild(const FXWindow* child) const;
/// Change the matrix style
***************
*** 110,113 ****
--- 111,115 ----
};
+ }
#endif
Index: FXObject.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXObject.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FXObject.h 25 Jun 2001 21:11:35 -0000 1.4
--- FXObject.h 12 Jul 2002 16:34:47 -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,37 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXOBJECT_H
#define FXOBJECT_H
! // Minimum and maximum keys
! #define MINKEY 0
! #define MAXKEY 65535
! // Minimum and maximum types
! #define MINTYPE 0
! #define MAXTYPE 65535
--- 20,42 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXOBJECT_H
#define FXOBJECT_H
+ namespace FX {
! /// Minimum and maximum keys
! enum {
! MINKEY = 0,
! MAXKEY = 65535
! };
! /// Minimum and maximum types
! enum {
! MINTYPE = 0,
! MAXTYPE = 65535
! };
***************
*** 44,48 ****
-
/// Describes a FOX object
struct FXAPI FXMetaClass {
--- 49,52 ----
***************
*** 79,82 ****
--- 83,87 ----
public:
__FXMETACLASSINITIALIZER__(const FXMetaClass* meta);
+ ~__FXMETACLASSINITIALIZER__();
};
***************
*** 85,95 ****
#define FXDECLARE(classname) \
public: \
! struct FXMapEntry { FXSelector keylo; FXSelector keyhi; long (classname::* func)(FXObject*,FXSelector,void*); }; \
! static const FXMetaClass metaClass; \
! static FXObject* manufacture(); \
! virtual long handle(FXObject* sender,FXSelector sel,void* ptr); \
! virtual const FXMetaClass* getMetaClass() const { return &metaClass; } \
! friend FXStream& operator<<(FXStream& store,const classname* obj){return store.saveObject((FXObjectPtr)(obj));} \
! friend FXStream& operator>>(FXStream& store,classname*& obj){return store.loadObject((FXObjectPtr&)(obj));} \
private:
--- 90,100 ----
#define FXDECLARE(classname) \
public: \
! struct FXMapEntry { FX::FXSelector keylo; FX::FXSelector keyhi; long (classname::* func)(FX::FXObject*,FX::FXSelector,void*); }; \
! static const FX::FXMetaClass metaClass; \
! static FX::FXObject* manufacture(); \
! virtual long handle(FX::FXObject* sender,FX::FXSelector sel,void* ptr); \
! virtual const FX::FXMetaClass* getMetaClass() const { return &metaClass; } \
! friend FX::FXStream& operator<<(FX::FXStream& store,const classname* obj){return store.saveObject((FX::FXObjectPtr)(obj));} \
! friend FX::FXStream& operator>>(FX::FXStream& store,classname*& obj){return store.loadObject((FX::FXObjectPtr&)(obj));} \
private:
***************
*** 97,104 ****
/// Macro to set up class implementation
#define FXIMPLEMENT(classname,baseclassname,mapping,nmappings) \
! FXObject* classname::manufacture(){return new classname;} \
! const FXMetaClass classname::metaClass={#classname,classname::manufacture,&baseclassname::metaClass,mapping,nmappings,sizeof(classname::FXMapEntry),sizeof(#classname)}; \
! __FXMETACLASSINITIALIZER__ classname##Initializer(&classname::metaClass); \
! long classname::handle(FXObject* sender,FXSelector sel,void* ptr){ \
const FXMapEntry* me=(const FXMapEntry*)metaClass.search(sel); \
return me ? (this->* me->func)(sender,sel,ptr) : baseclassname::handle(sender,sel,ptr); \
--- 102,109 ----
/// Macro to set up class implementation
#define FXIMPLEMENT(classname,baseclassname,mapping,nmappings) \
! FX::FXObject* classname::manufacture(){return new classname;} \
! const FX::FXMetaClass classname::metaClass={#classname,classname::manufacture,&baseclassname::metaClass,mapping,nmappings,sizeof(classname::FXMapEntry),sizeof(#classname)}; \
! FX::__FXMETACLASSINITIALIZER__ classname##Initializer(&classname::metaClass); \
! long classname::handle(FX::FXObject* sender,FX::FXSelector sel,void* ptr){ \
const FXMapEntry* me=(const FXMapEntry*)metaClass.search(sel); \
return me ? (this->* me->func)(sender,sel,ptr) : baseclassname::handle(sender,sel,ptr); \
***************
*** 109,118 ****
#define FXDECLARE_ABSTRACT(classname) \
public: \
! struct FXMapEntry { FXSelector keylo; FXSelector keyhi; long (classname::* func)(FXObject*,FXSelector,void*); }; \
! static const FXMetaClass metaClass; \
! virtual long handle(FXObject* sender,FXSelector sel,void* ptr); \
! virtual const FXMetaClass* getMetaClass() const { return &metaClass; } \
! friend FXStream& operator<<(FXStream& store,const classname* obj){return store.saveObject((FXObjectPtr)(obj));} \
! friend FXStream& operator>>(FXStream& store,classname*& obj){return store.loadObject((FXObjectPtr&)(obj));} \
private:
--- 114,123 ----
#define FXDECLARE_ABSTRACT(classname) \
public: \
! struct FXMapEntry { FX::FXSelector keylo; FX::FXSelector keyhi; long (classname::* func)(FX::FXObject*,FX::FXSelector,void*); }; \
! static const FX::FXMetaClass metaClass; \
! virtual long handle(FX::FXObject* sender,FX::FXSelector sel,void* ptr); \
! virtual const FX::FXMetaClass* getMetaClass() const { return &metaClass; } \
! friend FX::FXStream& operator<<(FX::FXStream& store,const classname* obj){return store.saveObject((FX::FXObjectPtr)(obj));} \
! friend FX::FXStream& operator>>(FX::FXStream& store,classname*& obj){return store.loadObject((FX::FXObjectPtr&)(obj));} \
private:
***************
*** 120,126 ****
/// Macro to set up abstract class implementation
#define FXIMPLEMENT_ABSTRACT(classname,baseclassname,mapping,nmappings) \
! const FXMetaClass classname::metaClass={#classname,NULL,&baseclassname::metaClass,mapping,nmappings,sizeof(classname::FXMapEntry),sizeof(#classname)}; \
__FXMETACLASSINITIALIZER__ classname##Initializer(&classname::metaClass); \
! long classname::handle(FXObject* sender,FXSelector sel,void* ptr){ \
const FXMapEntry* me=(const FXMapEntry*)metaClass.search(sel); \
return me ? (this->* me->func)(sender,sel,ptr) : baseclassname::handle(sender,sel,ptr); \
--- 125,131 ----
/// Macro to set up abstract class implementation
#define FXIMPLEMENT_ABSTRACT(classname,baseclassname,mapping,nmappings) \
! const FX::FXMetaClass classname::metaClass={#classname,NULL,&baseclassname::metaClass,mapping,nmappings,sizeof(classname::FXMapEntry),sizeof(#classname)}; \
__FXMETACLASSINITIALIZER__ classname##Initializer(&classname::metaClass); \
! long classname::handle(FX::FXObject* sender,FX::FXSelector sel,void* ptr){ \
const FXMapEntry* me=(const FXMapEntry*)metaClass.search(sel); \
return me ? (this->* me->func)(sender,sel,ptr) : baseclassname::handle(sender,sel,ptr); \
***************
*** 174,177 ****
--- 179,183 ----
};
+ }
#endif
Index: FXPopup.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXPopup.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FXPopup.h 26 Nov 2001 16:13:05 -0000 1.6
--- FXPopup.h 12 Jul 2002 16:34:47 -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 FXPOPUP_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXPOPUP_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 43,48 ****
class FXAPI FXPopup : public FXShell {
FXDECLARE(FXPopup)
protected:
! FXWindow *grabowner; // Window which will get grabbed when outside
FXColor baseColor;
FXColor hiliteColor;
--- 44,52 ----
class FXAPI FXPopup : public FXShell {
FXDECLARE(FXPopup)
+ private:
+ FXPopup *prevActive; // Popup below this one in stack
+ FXPopup *nextActive; // Popup above this one in stack
protected:
! FXWindow *grabowner; // Window which will get grabbed when outside
FXColor baseColor;
FXColor hiliteColor;
***************
*** 51,55 ****
FXint border;
protected:
! FXPopup(){}
virtual void layout();
virtual FXbool doesOverrideRedirect() const;
--- 55,59 ----
FXint border;
protected:
! FXPopup();
virtual void layout();
virtual FXbool doesOverrideRedirect() const;
***************
*** 103,106 ****
--- 107,116 ----
virtual FXint getDefaultHeight();
+ /// Return a pointer to the prior active popup
+ FXPopup* getPrevActive() const { return prevActive; }
+
+ /// Return a pointer to the next active popup
+ FXPopup* getNextActive() const { return nextActive; }
+
/// Move the focus to this window
virtual void setFocus();
***************
*** 109,112 ****
--- 119,128 ----
virtual void killFocus();
+ /// Show this window
+ virtual void show();
+
+ /// Hide this window
+ virtual void hide();
+
/// Change frame style
void setFrameStyle(FXuint style);
***************
*** 175,178 ****
--- 191,195 ----
};
+ }
#endif
Index: FXProgressBar.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXProgressBar.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FXProgressBar.h 26 Nov 2001 16:13:05 -0000 1.5
--- FXProgressBar.h 12 Jul 2002 16:34:47 -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 FXPROGRESSBAR_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXPROGRESSBAR_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 55,58 ****
--- 56,60 ----
protected:
FXProgressBar(){}
+ void drawInterior(FXDCWindow& dc);
private:
FXProgressBar(const FXProgressBar&);
***************
*** 152,155 ****
--- 154,159 ----
virtual ~FXProgressBar();
};
+
+ }
#endif
Index: FXProgressDialog.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXProgressDialog.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FXProgressDialog.h 26 Nov 2001 16:13:05 -0000 1.2
--- FXProgressDialog.h 12 Jul 2002 16:34:47 -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 FXPROGRESSDIALOG_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXPROGRESSDIALOG_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 57,61 ****
FXbool cancelled; // User hit cancel
protected:
! FXProgressDialog(){}
private:
FXProgressDialog(const FXProgressDialog&);
--- 58,62 ----
FXbool cancelled; // User hit cancel
protected:
! FXProgressDialog();
private:
FXProgressDialog(const FXProgressDialog&);
***************
*** 97,105 ****
FXbool isCancelled() const { return cancelled; }
/// Destroy
virtual ~FXProgressDialog();
};
!
#endif
--- 98,109 ----
FXbool isCancelled() const { return cancelled; }
+ /// Change cancelled flag
+ void setCancelled(FXbool flg){ cancelled=flg; }
+
/// Destroy
virtual ~FXProgressDialog();
};
! }
#endif
Index: FXScrollArea.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXScrollArea.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FXScrollArea.h 2 Jan 2002 22:23:56 -0000 1.6
--- FXScrollArea.h 12 Jul 2002 16:34:47 -0000 1.7
***************
*** 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 FXSCROLLAREA_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXSCROLLAREA_H
***************
*** 29,32 ****
--- 29,34 ----
#endif
+ namespace FX {
+
/// Scrollbar options
***************
*** 46,50 ****
! class FXScrollbar;
class FXScrollCorner;
struct FXTimer;
--- 48,52 ----
! class FXScrollBar;
class FXScrollCorner;
struct FXTimer;
***************
*** 68,73 ****
FXDECLARE(FXScrollArea)
protected:
! FXScrollbar *horizontal;
! FXScrollbar *vertical;
FXScrollCorner *corner;
FXTimer *scrolltimer;
--- 70,75 ----
FXDECLARE(FXScrollArea)
protected:
! FXScrollBar *horizontal;
! FXScrollBar *vertical;
FXScrollCorner *corner;
FXTimer *scrolltimer;
***************
*** 124,131 ****
/// Return a pointer to the horizontal scrollbar
! FXScrollbar* horizontalScrollbar() const { return horizontal; }
/// Return a pointer to the vertical scrollbar
! FXScrollbar* verticalScrollbar() const { return vertical; }
/// Return the current x-position
--- 126,133 ----
/// Return a pointer to the horizontal scrollbar
! FXScrollBar* horizontalScrollBar() const { return horizontal; }
/// Return a pointer to the vertical scrollbar
! FXScrollBar* verticalScrollBar() const { return vertical; }
/// Return the current x-position
***************
*** 148,152 ****
};
!
#endif
--- 150,154 ----
};
! }
#endif
Index: FXSeparator.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXSeparator.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FXSeparator.h 26 Nov 2001 16:13:05 -0000 1.3
--- FXSeparator.h 12 Jul 2002 16:34:47 -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 FXSEPARATOR_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXSEPARATOR_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 40,51 ****
! /// Horizontal separator
! class FXAPI FXHorizontalSeparator : public FXFrame {
! FXDECLARE(FXHorizontalSeparator)
protected:
! FXHorizontalSeparator(){}
private:
! FXHorizontalSeparator(const FXHorizontalSeparator&);
! FXHorizontalSeparator &operator=(const FXHorizontalSeparator&);
public:
long onPaint(FXObject*,FXSelector,void*);
--- 41,52 ----
! /// Separator widget
! class FXAPI FXSeparator : public FXFrame {
! FXDECLARE(FXSeparator)
protected:
! FXSeparator(){}
private:
! FXSeparator(const FXSeparator&);
! FXSeparator &operator=(const FXSeparator&);
public:
long onPaint(FXObject*,FXSelector,void*);
***************
*** 53,57 ****
/// Constructor
! FXHorizontalSeparator(FXComposite* p,FXuint opts=SEPARATOR_GROOVE|LAYOUT_FILL_X,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=1,FXint pr=1,FXint pt=0,FXint pb=0);
/// Return default width
--- 54,58 ----
/// Constructor
! FXSeparator(FXComposite* p,FXuint opts=SEPARATOR_GROOVE|LAYOUT_FILL_X,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=0,FXint pr=0,FXint pt=0,FXint pb=0);
/// Return default width
***************
*** 63,68 ****
! /// Vertical separator
! class FXAPI FXVerticalSeparator : public FXFrame {
FXDECLARE(FXVerticalSeparator)
protected:
--- 64,86 ----
!
! /// Horizontal separator widget
! class FXAPI FXHorizontalSeparator : public FXSeparator {
! FXDECLARE(FXHorizontalSeparator)
! protected:
! FXHorizontalSeparator(){}
! private:
! FXHorizontalSeparator(const FXHorizontalSeparator&);
! FXHorizontalSeparator &operator=(const FXHorizontalSeparator&);
! public:
!
! /// Constructor
! FXHorizontalSeparator(FXComposite* p,FXuint opts=SEPARATOR_GROOVE|LAYOUT_FILL_X,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=1,FXint pr=1,FXint pt=0,FXint pb=0);
! };
!
!
!
! /// Vertical separator widget
! class FXAPI FXVerticalSeparator : public FXSeparator {
FXDECLARE(FXVerticalSeparator)
protected:
***************
*** 72,88 ****
FXVerticalSeparator &operator=(const FXVerticalSeparator&);
public:
- long onPaint(FXObject*,FXSelector,void*);
- public:
/// Constructor
FXVerticalSeparator(FXComposite* p,FXuint opts=SEPARATOR_GROOVE|LAYOUT_FILL_Y,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=0,FXint pr=0,FXint pt=1,FXint pb=1);
-
- /// Return default width
- virtual FXint getDefaultWidth();
-
- /// Return default height
- virtual FXint getDefaultHeight();
};
#endif
--- 90,99 ----
FXVerticalSeparator &operator=(const FXVerticalSeparator&);
public:
/// Constructor
FXVerticalSeparator(FXComposite* p,FXuint opts=SEPARATOR_GROOVE|LAYOUT_FILL_Y,FXint x=0,FXint y=0,FXint w=0,FXint h=0,FXint pl=0,FXint pr=0,FXint pt=1,FXint pb=1);
};
+ }
#endif
Index: FXStream.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXStream.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FXStream.h 16 Feb 2001 00:04:16 -0000 1.2
--- FXStream.h 12 Jul 2002 16:34:47 -0000 1.3
***************
*** 1,8 ****
/********************************************************************************
* *
! * Persistent Storage Stream *
* *
*********************************************************************************
! * Copyright (C) 1997 by Jeroen van der Zijp. All Rights Reserved. *
*********************************************************************************
* This library is free software; you can redistribute it and/or *
--- 1,8 ----
/********************************************************************************
* *
! * P e r s i s t e n t S t o r a g e S t r e a m C l a s s e s *
* *
*********************************************************************************
! * 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 FXSTREAM_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXSTREAM_H
***************
*** 26,54 ****
/// Stream data flow direction
! enum FXStreamDirection {
! FXStreamDead=0, // Unopened stream
! FXStreamSave=1, // Saving stuff to stream
! FXStreamLoad=2 // Loading stuff from stream
};
!
/// Stream status codes
enum FXStreamStatus {
! FXStreamOK=0, // OK
! FXStreamEnd=1, // Try read past end of stream
! FXStreamFull=2, // Filled up stream buffer or disk full
! FXStreamNoWrite=3, // Unable to open for write
! FXStreamNoRead=4, // Unable to open for read
! FXStreamFormat=5, // Stream format error
! FXStreamUnknown=6, // Trying to read unknown class
! FXStreamAlloc=7, // Alloc failed
! FXStreamFailure=8 // General failure
};
// Hash table entry
! struct FXStreamHashEntry {
FXuint ref; // Object reference number
FXObject* obj; // Pointer to object
--- 26,56 ----
+ namespace FX {
+
/// Stream data flow direction
! enum FXStreamDirection {
! FXStreamDead=0, /// Unopened stream
! FXStreamSave=1, /// Saving stuff to stream
! FXStreamLoad=2 /// Loading stuff from stream
};
!
/// Stream status codes
enum FXStreamStatus {
! FXStreamOK=0, /// OK
! FXStreamEnd=1, /// Try read past end of stream
! FXStreamFull=2, /// Filled up stream buffer or disk full
! FXStreamNoWrite=3, /// Unable to open for write
! FXStreamNoRead=4, /// Unable to open for read
! FXStreamFormat=5, /// Stream format error
! FXStreamUnknown=6, /// Trying to read unknown class
! FXStreamAlloc=7, /// Alloc failed
! FXStreamFailure=8 /// General failure
};
// Hash table entry
! struct FXStreamHashEntry {
FXuint ref; // Object reference number
FXObject* obj; // Pointer to object
***************
*** 63,67 ****
/// Persistent store definition
class FXAPI FXStream {
!
FXStreamHashEntry* table; // Hash table
FXuint ntable; // Amount of table that is filled
--- 65,69 ----
/// Persistent store definition
class FXAPI FXStream {
! private:
FXStreamHashEntry* table; // Hash table
FXuint ntable; // Amount of table that is filled
***************
*** 71,87 ****
const FXObject* parent; // Parent object
void grow(); // Enlarge the table
-
protected:
FXStreamDirection dir; // Direction of current transfer
FXStreamStatus code; // Status code
unsigned long pos; // Position
-
protected:
/// Save bunch of items
! virtual void saveItems(const void *buf,FXuint n);
/// Load bunch of items
! virtual void loadItems(void *buf,FXuint n);
public:
--- 73,87 ----
const FXObject* parent; // Parent object
void grow(); // Enlarge the table
protected:
FXStreamDirection dir; // Direction of current transfer
FXStreamStatus code; // Status code
unsigned long pos; // Position
protected:
/// Save bunch of items
! virtual void saveItems(const void *buf,unsigned long n);
/// Load bunch of items
! virtual void loadItems(void *buf,unsigned long n);
public:
***************
*** 122,126 ****
/// Return implementation's endianness
static FXbool isLittleEndian(){ return !FOX_BIGENDIAN; }
!
/// Save to stream
virtual FXStream& operator<<(const FXuchar& v);
--- 122,126 ----
/// Return implementation's endianness
static FXbool isLittleEndian(){ return !FOX_BIGENDIAN; }
!
/// Save to stream
virtual FXStream& operator<<(const FXuchar& v);
***************
*** 132,136 ****
FXStream& operator<<(const FXfloat& v);
FXStream& operator<<(const FXdouble& v);
!
#ifdef FX_LONG
FXStream& operator<<(const FXlong& v);
--- 132,136 ----
FXStream& operator<<(const FXfloat& v);
FXStream& operator<<(const FXdouble& v);
!
#ifdef FX_LONG
FXStream& operator<<(const FXlong& v);
***************
*** 138,158 ****
#endif
! FXStream& save(const FXuchar* p,FXuint n);
! FXStream& save(const FXchar* p,FXuint n);
! FXStream& save(const FXushort* p,FXuint n);
! FXStream& save(const FXshort* p,FXuint n);
! FXStream& save(const FXuint* p,FXuint n);
! FXStream& save(const FXint* p,FXuint n);
! FXStream& save(const FXfloat* p,FXuint n);
! FXStream& save(const FXdouble* p,FXuint n);
!
#ifdef FX_LONG
! FXStream& save(const FXlong* p,FXuint n);
! FXStream& save(const FXulong* p,FXuint n);
#endif
/// Save object
FXStream& saveObject(const FXObject* v);
!
/// Load from stream
virtual FXStream& operator>>(FXuchar& v);
--- 138,158 ----
#endif
! FXStream& save(const FXuchar* p,unsigned long n);
! FXStream& save(const FXchar* p,unsigned long n);
! FXStream& save(const FXushort* p,unsigned long n);
! FXStream& save(const FXshort* p,unsigned long n);
! FXStream& save(const FXuint* p,unsigned long n);
! FXStream& save(const FXint* p,unsigned long n);
! FXStream& save(const FXfloat* p,unsigned long n);
! FXStream& save(const FXdouble* p,unsigned long n);
!
#ifdef FX_LONG
! FXStream& save(const FXlong* p,unsigned long n);
! FXStream& save(const FXulong* p,unsigned long n);
#endif
/// Save object
FXStream& saveObject(const FXObject* v);
!
/// Load from stream
virtual FXStream& operator>>(FXuchar& v);
***************
*** 164,168 ****
FXStream& operator>>(FXfloat& v);
FXStream& operator>>(FXdouble& v);
!
#ifdef FX_LONG
FXStream& operator>>(FXlong& v);
--- 164,168 ----
FXStream& operator>>(FXfloat& v);
FXStream& operator>>(FXdouble& v);
!
#ifdef FX_LONG
FXStream& operator>>(FXlong& v);
***************
*** 170,190 ****
#endif
! FXStream& load(FXuchar* p,FXuint n);
! FXStream& load(FXchar* p,FXuint n);
! FXStream& load(FXushort* p,FXuint n);
! FXStream& load(FXshort* p,FXuint n);
! FXStream& load(FXuint* p,FXuint n);
! FXStream& load(FXint* p,FXuint n);
! FXStream& load(FXfloat* p,FXuint n);
! FXStream& load(FXdouble* p,FXuint n);
!
#ifdef FX_LONG
! FXStream& load(FXlong* p,FXuint n);
! FXStream& load(FXulong* p,FXuint n);
#endif
/// Load object
FXStream& loadObject(FXObject*& v);
!
/// Destructor
virtual ~FXStream();
--- 170,190 ----
#endif
! FXStream& load(FXuchar* p,unsigned long n);
! FXStream& load(FXchar* p,unsigned long n);
! FXStream& load(FXushort* p,unsigned long n);
! FXStream& load(FXshort* p,unsigned long n);
! FXStream& load(FXuint* p,unsigned long n);
! FXStream& load(FXint* p,unsigned long n);
! FXStream& load(FXfloat* p,unsigned long n);
! FXStream& load(FXdouble* p,unsigned long n);
!
#ifdef FX_LONG
! FXStream& load(FXlong* p,unsigned long n);
! FXStream& load(FXulong* p,unsigned long n);
#endif
/// Load object
FXStream& loadObject(FXObject*& v);
!
/// Destructor
virtual ~FXStream();
***************
*** 197,205 ****
/// File Store Definition
class FXAPI FXFileStream : public FXStream {
! void* file; // File being dealt with
protected:
! virtual void saveItems(const void *buf,FXuint n);
! virtual void loadItems(void *buf,FXuint n);
!
public:
--- 197,205 ----
/// File Store Definition
class FXAPI FXFileStream : public FXStream {
! private:
! void *file; // File being dealt with
protected:
! virtual void saveItems(const void *buf,unsigned long n);
! virtual void loadItems(void *buf,unsigned long n);
public:
***************
*** 219,223 ****
virtual FXStream& operator<<(const FXuchar& v);
virtual FXStream& operator<<(const FXchar& v);
!
/// Load from stream
virtual FXStream& operator>>(FXuchar& v);
--- 219,223 ----
virtual FXStream& operator<<(const FXuchar& v);
virtual FXStream& operator<<(const FXchar& v);
!
/// Load from stream
virtual FXStream& operator>>(FXuchar& v);
***************
*** 228,243 ****
};
!
/************************** Memory Store Definition **************************/
/// Memory Store Definition
class FXAPI FXMemoryStream : public FXStream {
! FXuchar *ptr; // Memory pointer
! FXuint space; // Space in buffer
! FXbool owns; // Owns the data array
protected:
! virtual void saveItems(const void *buf,FXuint n);
! virtual void loadItems(void *buf,FXuint n);
!
public:
--- 228,243 ----
};
!
/************************** Memory Store Definition **************************/
/// Memory Store Definition
class FXAPI FXMemoryStream : public FXStream {
! private:
! FXuchar *ptr; // Memory pointer
! unsigned long space; // Space in buffer
! FXbool owns; // Owns the data array
protected:
! virtual void saveItems(const void *buf,unsigned long n);
! virtual void loadItems(void *buf,unsigned long n);
public:
***************
*** 247,269 ****
/// Open file store
FXbool open(FXuchar* data,FXStreamDirection save_or_load);
!
/// Open memory store
! FXbool open(FXuchar* data,FXuint sp,FXStreamDirection save_or_load);
/// Get available space
! FXuint getSpace() const { return space; }
/// Set available space
! void setSpace(FXuint sp);
!
/// Take buffer away from stream
! void takeBuffer(FXuchar*& buffer,FXuint& sp);
!
/// Give buffer to stream
! void giveBuffer(FXuchar *buffer,FXuint sp);
!
/// Close memory store
FXbool close();
!
/// Move to position
virtual FXbool position(unsigned long p);
--- 247,269 ----
/// Open file store
FXbool open(FXuchar* data,FXStreamDirection save_or_load);
!
/// Open memory store
! FXbool open(FXuchar* data,unsigned long sp,FXStreamDirection save_or_load);
/// Get available space
! unsigned long getSpace() const { return space; }
/// Set available space
! void setSpace(unsigned long sp);
!
/// Take buffer away from stream
! void takeBuffer(FXuchar*& buffer,unsigned long& sp);
!
/// Give buffer to stream
! void giveBuffer(FXuchar *buffer,unsigned long sp);
!
/// Close memory store
FXbool close();
!
/// Move to position
virtual FXbool position(unsigned long p);
***************
*** 272,285 ****
virtual FXStream& operator<<(const FXuchar& v);
virtual FXStream& operator<<(const FXchar& v);
!
/// Load from stream
virtual FXStream& operator>>(FXuchar& v);
virtual FXStream& operator>>(FXchar& v);
!
/// Destructor
virtual ~FXMemoryStream();
};
!
#endif
--- 272,285 ----
virtual FXStream& operator<<(const FXuchar& v);
virtual FXStream& operator<<(const FXchar& v);
!
/// Load from stream
virtual FXStream& operator>>(FXuchar& v);
virtual FXStream& operator>>(FXchar& v);
!
/// Destructor
virtual ~FXMemoryStream();
};
! }
#endif
Index: FXTable.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXTable.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FXTable.h 2 Jan 2002 22:23:56 -0000 1.6
--- FXTable.h 12 Jul 2002 16:34:47 -0000 1.7
***************
*** 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 FXTABLE_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXTABLE_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 40,44 ****
/// Default cell margin
! #define DEFAULT_MARGIN 2
--- 41,45 ----
/// Default cell margin
! const FXint DEFAULT_MARGIN = 2;
***************
*** 389,400 ****
FXint getNumCols() const { return ncols; }
! /// Change cell margins
void setMarginTop(FXint pt);
FXint getMarginTop() const { return margintop; }
void setMarginBottom(FXint pb);
FXint getMarginBottom() const { return marginbottom; }
void setMarginLeft(FXint pl);
FXint getMarginLeft() const { return marginleft; }
void setMarginRight(FXint pr);
FXint getMarginRight() const { return marginright; }
--- 390,415 ----
FXint getNumCols() const { return ncols; }
! /// Change top cell margin
void setMarginTop(FXint pt);
+
+ /// Return top cell margin
FXint getMarginTop() const { return margintop; }
+
+ /// Change bottom cell margin
void setMarginBottom(FXint pb);
+
+ /// Return bottom cell margin
FXint getMarginBottom() const { return marginbottom; }
+
+ /// Change left cell margin
void setMarginLeft(FXint pl);
+
+ /// Return left cell margin
FXint getMarginLeft() const { return marginleft; }
+
+ /// Change right cell margin
void setMarginRight(FXint pr);
+
+ /// Return right cell margin
FXint getMarginRight() const { return marginright; }
***************
*** 492,499 ****
/// Repaint cells between grid lines sr,er and grid lines sc,ec
! void updateRange(FXint sr,FXint er,FXint sc,FXint ec);
/// Repaint cell at r,c
! void updateItem(FXint r,FXint c);
/// Enable, disable, select, deselect, toggle cell
--- 507,514 ----
/// Repaint cells between grid lines sr,er and grid lines sc,ec
! void updateRange(FXint sr,FXint er,FXint sc,FXint ec) const;
/// Repaint cell at r,c
! void updateItem(FXint r,FXint c) const;
/// Enable, disable, select, deselect, toggle cell
***************
*** 574,578 ****
};
!
#endif
--- 589,593 ----
};
! }
#endif
Index: FXText.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXText.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** FXText.h 25 Feb 2002 15:57:03 -0000 1.11
--- FXText.h 12 Jul 2002 16:34:47 -0000 1.12
***************
*** 20,24 ****
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXTEXT_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXTEXT_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 145,149 ****
FXint posToLine(FXint pos,FXint ln) const;
FXbool posVisible(FXint pos) const;
! void updateRange(FXint beg,FXint end);
void movegap(FXint pos);
void sizegap(FXint sz);
--- 146,150 ----
FXint posToLine(FXint pos,FXint ln) const;
FXbool posVisible(FXint pos) const;
! void updateRange(FXint beg,FXint end) const;
void movegap(FXint pos);
void sizegap(FXint sz);
***************
*** 185,189 ****
MOUSE_SCROLL, // Scrolling
MOUSE_DRAG, // Dragging text
- MOUSE_PASTE, // Pasting
MOUSE_TRYDRAG // Tentative drag
};
--- 186,189 ----
***************
*** 241,244 ****
--- 241,245 ----
long onUpdCursorColumn(FXObject*,FXSelector,void*);
long onUpdHaveSelection(FXObject*,FXSelector,void*);
+ long onUpdSelectAll(FXObject*,FXSelector,void*);
long onCmdSetStringValue(FXObject*,FXSelector,void*);
long onCmdGetStringValue(FXObject*,FXSelector,void*);
***************
*** 290,293 ****
--- 291,295 ----
long onCmdChangeCase(FXObject*,FXSelector,void*);
long onCmdShiftText(FXObject*,FXSelector,void*);
+ long onCmdPasteMiddle(FXObject*,FXSelector,void*);
// Changing Selection
***************
*** 339,344 ****
ID_CUT_SEL,
ID_COPY_SEL,
- ID_PASTE_SEL,
ID_DELETE_SEL,
ID_SELECT_CHAR,
ID_SELECT_WORD,
--- 341,347 ----
ID_CUT_SEL,
ID_COPY_SEL,
ID_DELETE_SEL,
+ ID_PASTE_SEL,
+ ID_PASTE_MIDDLE,
ID_SELECT_CHAR,
ID_SELECT_WORD,
***************
*** 588,592 ****
/// Extract n characters of style info from position pos
void extractStyle(FXchar *style,FXint pos,FXint n) const;
!
/// Replace m characters at pos by n characters
void replaceText(FXint pos,FXint m,const FXchar *text,FXint n,FXbool notify=FALSE);
--- 591,595 ----
/// Extract n characters of style info from position pos
void extractStyle(FXchar *style,FXint pos,FXint n) const;
!
/// Replace m characters at pos by n characters
void replaceText(FXint pos,FXint m,const FXchar *text,FXint n,FXbool notify=FALSE);
***************
*** 777,790 ****
/// Change number of visible rows
! void setVisRows(FXint rows);
/// Return number of visible rows
! FXint getVisRows() const { return vrows; }
/// Change number of visible columns
! void setVisCols(FXint cols);
/// Return number of visible columns
! FXint getVisCols() const { return vcols; }
/**
--- 780,793 ----
/// Change number of visible rows
! void setVisibleRows(FXint rows);
/// Return number of visible rows
! FXint getVisibleRows() const { return vrows; }
/// Change number of visible columns
! void setVisibleCols(FXint cols);
/// Return number of visible columns
! FXint getVisibleCols() const { return vcols; }
/**
***************
*** 815,819 ****
};
!
#endif
--- 818,822 ----
};
! }
#endif
Index: FXTextField.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXTextField.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FXTextField.h 2 Jan 2002 22:23:56 -0000 1.8
--- FXTextField.h 12 Jul 2002 16:34:47 -0000 1.9
***************
*** 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 FXTEXTFIELD_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXTEXTFIELD_H
***************
*** 29,32 ****
--- 29,33 ----
#endif
+ namespace FX {
***************
*** 139,142 ****
--- 140,145 ----
long onCmdToggleOverstrike(FXObject*,FXSelector,void*);
long onUpdToggleOverstrike(FXObject*,FXSelector,void*);
+ long onUpdHaveSelection(FXObject*,FXSelector,void*);
+ long onUpdSelectAll(FXObject*,FXSelector,void*);
public:
enum{
***************
*** 300,303 ****
--- 303,307 ----
};
+ }
#endif
Index: FXTopWindow.h
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/fox-includes/FXTopWindow.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FXTopWindow.h 26 Nov 2001 16:13:06 -0000 1.8
--- FXTopWindow.h 12 Jul 2002 16:34:47 -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 FXTOPWINDOW_H
--- 20,24 ----
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id$ *
********************************************************************************/
#ifndef FXTOPWINDOW_H
***************
*** 30,45 ****
/// Title and border decorations
enum {
! DECOR_NONE = 0, /// Borderless window
! DECOR_TITLE = 0x00020000, /// Window title
! DECOR_MINIMIZE = 0x00040000, /// Minimize button
! DECOR_MAXIMIZE = 0x00080000, /// Maximize button
! DECOR_CLOSE = 0x00100000, /// Close button
! DECOR_BORDER = 0x00200000, /// Border
! DECOR_RESIZE = 0x00400000, /// Resize handles
! DECOR_MENU = 0x00800000, /// Window menu
! DECOR_ALL = (DECOR_TITLE|DECOR_MINIMIZE|DECOR_MAXIMIZE|DECOR_CLOSE|DECOR_BORDER|DECOR_RESIZE|DECOR_MENU)
};
--- 30,49 ----
+ namespace FX {
+
/// Title and border decorations
enum {
! DECOR_NONE = 0, /// Borderless window
! DECOR_TITLE = 0x00020000, /// Window title
! DECOR_MINIMIZE = 0x00040000, /// Minimize button
! DECOR_MAXIMIZE = 0x00080000, /// Maximize button
! DECOR_CLOSE = 0x00100000, /// Close button
! DECOR_BORDER = 0x00200000, /// Border
! DECOR_SHRINKABLE = 0x00400000, /// Window can become smaller
! DECOR_STRETCHABLE = 0x00800000, /// Window can become larger
! DECOR_RESIZE = DECOR_SHRINKABLE|DECOR_STRETCHABLE, /// Resize handles
! DECOR_MENU = 0x01000000, /// Window menu
! DECOR_ALL = (DECOR_TITLE|DECOR_MINIMIZE|DECOR_MAXIMIZE|DECOR_CLOSE|DECOR_BORDER|DECOR_SHRINKABLE|DECOR_STRETCHABLE|DECOR_MENU)
};
***************
*** 56,64 ****
! class FXToolbar;
! /// Abstract base class for all top-level windows
class FXAPI FXTopWindow : public FXShell {
FXDECLARE_ABSTRACT(FXTopWindow)
--- 60,90 ----
! class FXToolBar;
! /**
! * Abstract base class for all top-level windows.
! * TopWindows are usually managed by a Window Manager under X11 and
! * therefore borders and window-menus and other decorations like resize-
! * handles are subject to the Window Manager's interpretation of the
! * decoration hints.
! * When a TopWindow is closed, it sends a SEL_CLOSE message to its
! * target. The target should return 0 in response to this message if
! * there is no objection to proceed with the closing of the window, and
! * return 1 otherwise. After the SEL_CLOSE message has been sent and
! * no objection was raised, the window will delete itself.
! * When receiving a SEL_UPDATE, the target can update the title string
! * of the window, so that the title of the window reflects the name
! * of the document, for example.
! * For convenience, TopWindow provides the same layout behavior as
! * the Packer widget, as well as docking and undocking of toolbars.
! * TopWindows can be owned by other windows, or be free-floating.
! * Owned TopWindows will usually remain stacked on top of the owner
! * windows; also, the lifetime of an owned window should not
! * exceed that of the owner.
! * The application will receive an ID_QUIT message when the last
! * MainWindow is hidden, therefore normally terminating the application.
! */
class FXAPI FXTopWindow : public FXShell {
FXDECLARE_ABSTRACT(FXTopWindow)
***************
*** 91,107 ****
#endif
public:
- long onClose(FXObject*,FXSelector,void*);
- long onCmdSetStringValue(FXObject*,FXSelector,void*);
- long onCmdIconify(FXObject*,FXSelector,void*);
- long onCmdDeiconify(FXObject*,FXSelector,void*);
long onFocusUp(FXObject*,FXSelector,void*);
long onFocusDown(FXObject*,FXSelector,void*);
long onFocusLeft(FXObject*,FXSelector,void*);
long onFocusRight(FXObject*,FXSelector,voi...
[truncated message content] |