home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
ftp.fox-toolkit.org
/
2014.05.ftp.fox-toolkit.org.tar
/
ftp.fox-toolkit.org
/
pub
/
fox-patch-1.0.9-fox-1.0.10
< prev
next >
Wrap
Text File
|
2002-04-29
|
27KB
|
844 lines
diff -P -c -r fox-1.0.9/Makefile.am fox-1.0.10/Makefile.am
*** fox-1.0.9/Makefile.am Mon Oct 22 01:20:10 2001
--- fox-1.0.10/Makefile.am Tue Apr 30 08:24:13 2002
***************
*** 24,29 ****
--- 24,32 ----
cd /home/ftp/pub && ln -sf $(distdir).zip fox-latest.zip
+ diff: distdir
+ -diff -P -c -r fox-1.0.9 $(distdir) > fox-patch-1.0.9-$(distdir)
+
bak:
tar cvzf fox-cvs.tar.gz /mnt/zip/FOX
diff -P -c -r fox-1.0.9/Makefile.in fox-1.0.10/Makefile.in
*** fox-1.0.9/Makefile.in Wed Apr 24 08:26:52 2002
--- fox-1.0.10/Makefile.in Tue Apr 30 08:24:17 2002
***************
*** 366,371 ****
--- 366,374 ----
cd /home/ftp/pub && ln -sf $(distdir).tar.gz fox-latest.tar.gz
cd /home/ftp/pub && ln -sf $(distdir).zip fox-latest.zip
+ diff: distdir
+ -diff -P -c -r fox-1.0.9 $(distdir) > fox-patch-1.0.9-$(distdir)
+
bak:
tar cvzf fox-cvs.tar.gz /mnt/zip/FOX
diff -P -c -r fox-1.0.9/adie/Adie.h fox-1.0.10/adie/Adie.h
*** fox-1.0.9/adie/Adie.h Thu Feb 21 10:16:08 2002
--- fox-1.0.10/adie/Adie.h Tue Apr 30 08:13:07 2002
***************
*** 19,25 ****
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id: Adie.h,v 1.26 2002/02/21 16:16:08 fox Exp $ *
********************************************************************************/
#ifndef ADIE_H
#define ADIE_H
--- 19,25 ----
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id: Adie.h,v 1.26.4.1 2002/04/30 13:13:07 fox Exp $ *
********************************************************************************/
#ifndef ADIE_H
#define ADIE_H
***************
*** 37,43 ****
// Mini application object
! class FXAPI TextWindow : public FXMainWindow {
FXDECLARE(TextWindow)
protected:
struct Bookmark {
--- 37,43 ----
// Mini application object
! class TextWindow : public FXMainWindow {
FXDECLARE(TextWindow)
protected:
struct Bookmark {
***************
*** 353,359 ****
// Determine language from filename
FXString getLanguage(const FXString& filename);
!
// Read syntax for language
void readSyntax(const FXString& language);
--- 353,359 ----
// Determine language from filename
FXString getLanguage(const FXString& filename);
!
// Read syntax for language
void readSyntax(const FXString& language);
***************
*** 362,368 ****
// Delete style
void deleteStyle(FXint index);
!
// Append style
void appendStyle(const FXString& name,const FXHiliteStyle& style);
--- 362,368 ----
// Delete style
void deleteStyle(FXint index);
!
// Append style
void appendStyle(const FXString& name,const FXHiliteStyle& style);
diff -P -c -r fox-1.0.9/adie/Commands.h fox-1.0.10/adie/Commands.h
*** fox-1.0.9/adie/Commands.h Tue Feb 26 23:12:45 2002
--- fox-1.0.10/adie/Commands.h Tue Apr 30 08:13:07 2002
***************
*** 19,25 ****
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id: Commands.h,v 1.5 2002/02/27 05:12:45 fox Exp $ *
********************************************************************************/
#ifndef COMMANDS_H
#define COMMANDS_H
--- 19,25 ----
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id: Commands.h,v 1.5.4.1 2002/04/30 13:13:07 fox Exp $ *
********************************************************************************/
#ifndef COMMANDS_H
#define COMMANDS_H
***************
*** 31,37 ****
// Undo record for text fragment
! class FXAPI FXTextCommand : public FXCommand {
protected:
FXText *text; // Text widget
FXchar *buffer; // Character buffer
--- 31,37 ----
// Undo record for text fragment
! class FXTextCommand : public FXCommand {
protected:
FXText *text; // Text widget
FXchar *buffer; // Character buffer
***************
*** 46,52 ****
// Insert command
! class FXAPI FXTextInsert : public FXTextCommand {
public:
FXTextInsert(FXText* txt,FXint p,FXint ni);
virtual FXString undoName() const { return "Undo insert"; }
--- 46,52 ----
// Insert command
! class FXTextInsert : public FXTextCommand {
public:
FXTextInsert(FXText* txt,FXint p,FXint ni);
virtual FXString undoName() const { return "Undo insert"; }
***************
*** 57,63 ****
// Delete command
! class FXAPI FXTextDelete : public FXTextCommand {
public:
FXTextDelete(FXText* txt,FXint p,FXint nd);
virtual FXString undoName() const { return "Undo delete"; }
--- 57,63 ----
// Delete command
! class FXTextDelete : public FXTextCommand {
public:
FXTextDelete(FXText* txt,FXint p,FXint nd);
virtual FXString undoName() const { return "Undo delete"; }
diff -P -c -r fox-1.0.9/adie/HelpWindow.h fox-1.0.10/adie/HelpWindow.h
*** fox-1.0.9/adie/HelpWindow.h Tue Aug 21 23:01:50 2001
--- fox-1.0.10/adie/HelpWindow.h Tue Apr 30 08:13:07 2002
***************
*** 19,35 ****
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id: HelpWindow.h,v 1.1 2001/08/22 04:01:50 jeroen Exp $ *
********************************************************************************/
#ifndef HELPWINDOW_H
#define HELPWINDOW_H
!
class FXText;
! /// Online help dialog box
! class FXAPI HelpWindow : public FXDialogBox {
FXDECLARE(HelpWindow)
protected:
FXText *helptext; // Help display
--- 19,35 ----
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id: HelpWindow.h,v 1.1.4.1 2002/04/30 13:13:07 fox Exp $ *
********************************************************************************/
#ifndef HELPWINDOW_H
#define HELPWINDOW_H
!
class FXText;
! /// Online help dialog box
! class HelpWindow : public FXDialogBox {
FXDECLARE(HelpWindow)
protected:
FXText *helptext; // Help display
diff -P -c -r fox-1.0.9/adie/Hilite.h fox-1.0.10/adie/Hilite.h
*** fox-1.0.9/adie/Hilite.h Fri Jan 25 08:23:10 2002
--- fox-1.0.10/adie/Hilite.h Tue Apr 30 08:13:07 2002
***************
*** 19,25 ****
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id: Hilite.h,v 1.11 2002/01/25 14:23:10 jeroen Exp $ *
********************************************************************************/
#ifndef HILITE_H
#define HILITE_H
--- 19,25 ----
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id: Hilite.h,v 1.11.4.1 2002/04/30 13:13:07 fox Exp $ *
********************************************************************************/
#ifndef HILITE_H
#define HILITE_H
***************
*** 31,37 ****
// Highlight engine
! class FXAPI Hilite {
private:
HLNode *root; // Root of all syntax nodes
private:
--- 31,37 ----
// Highlight engine
! class Hilite {
private:
HLNode *root; // Root of all syntax nodes
private:
***************
*** 44,56 ****
// Stylize text
void stylize(const FXchar* text,FXchar *style,FXint fm,FXint to) const;
!
// Stylize text from given node
void stylize(const FXchar* text,FXchar *style,FXint fm,FXint to,const HLNode* start) const;
// Append highlight pattern
HLNode *append(const FXchar* pattern,FXint style,FXint priority=0,FXint context=0,HLNode *parent=NULL);
!
// Remove highlight pattern
void remove(HLNode* node);
--- 44,56 ----
// Stylize text
void stylize(const FXchar* text,FXchar *style,FXint fm,FXint to) const;
!
// Stylize text from given node
void stylize(const FXchar* text,FXchar *style,FXint fm,FXint to,const HLNode* start) const;
// Append highlight pattern
HLNode *append(const FXchar* pattern,FXint style,FXint priority=0,FXint context=0,HLNode *parent=NULL);
!
// Remove highlight pattern
void remove(HLNode* node);
***************
*** 59,83 ****
// Find pattern node by style
HLNode *find(FXint style) const;
!
// Get top node
HLNode *top() const { return root; }
// Style of the pattern node
FXint style(HLNode *node) const;
!
// Context of the pattern node
FXint context(HLNode *node) const;
!
// Get parent of pattern node
HLNode *parent(HLNode *node) const;
!
// Get first alternative of pattern node
HLNode *alternative(HLNode *node) const;
!
// Get subnode of pattern node
HLNode *sub(HLNode *node) const;
!
// Clean up
~Hilite();
};
--- 59,83 ----
// Find pattern node by style
HLNode *find(FXint style) const;
!
// Get top node
HLNode *top() const { return root; }
// Style of the pattern node
FXint style(HLNode *node) const;
!
// Context of the pattern node
FXint context(HLNode *node) const;
!
// Get parent of pattern node
HLNode *parent(HLNode *node) const;
!
// Get first alternative of pattern node
HLNode *alternative(HLNode *node) const;
!
// Get subnode of pattern node
HLNode *sub(HLNode *node) const;
!
// Clean up
~Hilite();
};
diff -P -c -r fox-1.0.9/adie/Preferences.h fox-1.0.10/adie/Preferences.h
*** fox-1.0.9/adie/Preferences.h Wed Feb 20 01:02:12 2002
--- fox-1.0.10/adie/Preferences.h Tue Apr 30 08:13:07 2002
***************
*** 19,25 ****
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id: Preferences.h,v 1.21 2002/02/20 07:02:12 fox Exp $ *
********************************************************************************/
#ifndef PREFERENCES_H
#define PREFERENCES_H
--- 19,25 ----
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id: Preferences.h,v 1.21.4.1 2002/04/30 13:13:07 fox Exp $ *
********************************************************************************/
#ifndef PREFERENCES_H
#define PREFERENCES_H
***************
*** 31,37 ****
class TextWindow;
! class FXAPI Preferences : public FXDialogBox {
FXDECLARE(Preferences)
protected:
FXText *filepattext;
--- 31,37 ----
class TextWindow;
! class Preferences : public FXDialogBox {
FXDECLARE(Preferences)
protected:
FXText *filepattext;
***************
*** 69,81 ****
long onUpdStyleDelete(FXObject*,FXSelector,void*);
long onCmdStyleColor(FXObject*,FXSelector,void*);
long onUpdStyleColor(FXObject*,FXSelector,void*);
!
long onCmdLangIndex(FXObject*,FXSelector,void*);
long onCmdLangNew(FXObject*,FXSelector,void*);
long onCmdLangDelete(FXObject*,FXSelector,void*);
long onCmdLangChanged(FXObject*,FXSelector,void*);
long onUpdLangSelected(FXObject*,FXSelector,void*);
!
long onCmdSyntaxLang(FXObject*,FXSelector,void*);
long onCmdSyntaxIndex(FXObject*,FXSelector,void*);
long onCmdSyntaxNew(FXObject*,FXSelector,void*);
--- 69,81 ----
long onUpdStyleDelete(FXObject*,FXSelector,void*);
long onCmdStyleColor(FXObject*,FXSelector,void*);
long onUpdStyleColor(FXObject*,FXSelector,void*);
!
long onCmdLangIndex(FXObject*,FXSelector,void*);
long onCmdLangNew(FXObject*,FXSelector,void*);
long onCmdLangDelete(FXObject*,FXSelector,void*);
long onCmdLangChanged(FXObject*,FXSelector,void*);
long onUpdLangSelected(FXObject*,FXSelector,void*);
!
long onCmdSyntaxLang(FXObject*,FXSelector,void*);
long onCmdSyntaxIndex(FXObject*,FXSelector,void*);
long onCmdSyntaxNew(FXObject*,FXSelector,void*);
***************
*** 102,108 ****
ID_LANG_NEW,
ID_LANG_DELETE,
ID_LANG_CHANGED,
!
ID_SYNTAX_LANG,
ID_SYNTAX_INDEX,
ID_SYNTAX_NEW,
--- 102,108 ----
ID_LANG_NEW,
ID_LANG_DELETE,
ID_LANG_CHANGED,
!
ID_SYNTAX_LANG,
ID_SYNTAX_INDEX,
ID_SYNTAX_NEW,
***************
*** 112,130 ****
ID_LAST
};
public:
!
// Create preferences dialog
Preferences(TextWindow *owner);
// Owner is text window
TextWindow* getOwner() const { return (TextWindow*)FXDialogBox::getOwner(); }
!
// Set filename patterns
void setPatterns(const FXString& patterns);
!
// Get filename patterns
FXString getPatterns() const;
!
// Clean up
virtual ~Preferences();
};
--- 112,130 ----
ID_LAST
};
public:
!
// Create preferences dialog
Preferences(TextWindow *owner);
// Owner is text window
TextWindow* getOwner() const { return (TextWindow*)FXDialogBox::getOwner(); }
!
// Set filename patterns
void setPatterns(const FXString& patterns);
!
// Get filename patterns
FXString getPatterns() const;
!
// Clean up
virtual ~Preferences();
};
diff -P -c -r fox-1.0.9/calculator/HelpWindow.h fox-1.0.10/calculator/HelpWindow.h
*** fox-1.0.9/calculator/HelpWindow.h Tue Mar 13 22:10:24 2001
--- fox-1.0.10/calculator/HelpWindow.h Tue Apr 30 08:13:07 2002
***************
*** 19,35 ****
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id: HelpWindow.h,v 1.1 2001/03/14 04:10:24 jeroen Exp $ *
********************************************************************************/
#ifndef HELPWINDOW_H
#define HELPWINDOW_H
!
class FXText;
! /// Online help dialog box
! class FXAPI HelpWindow : public FXDialogBox {
FXDECLARE(HelpWindow)
protected:
FXText *helptext; // Help display
--- 19,35 ----
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id: HelpWindow.h,v 1.1.4.1 2002/04/30 13:13:07 fox Exp $ *
********************************************************************************/
#ifndef HELPWINDOW_H
#define HELPWINDOW_H
!
class FXText;
! /// Online help dialog box
! class HelpWindow : public FXDialogBox {
FXDECLARE(HelpWindow)
protected:
FXText *helptext; // Help display
diff -P -c -r fox-1.0.9/calculator/Preferences.h fox-1.0.10/calculator/Preferences.h
*** fox-1.0.9/calculator/Preferences.h Wed Mar 14 23:11:05 2001
--- fox-1.0.10/calculator/Preferences.h Tue Apr 30 08:13:07 2002
***************
*** 19,32 ****
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id: Preferences.h,v 1.2 2001/03/15 05:11:05 jeroen Exp $ *
********************************************************************************/
#ifndef PREFERENCES_H
#define PREFERENCES_H
class Calculator;
! class FXAPI Preferences : public FXDialogBox {
FXDECLARE(Preferences)
protected:
FXIcon *palette;
--- 19,32 ----
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id: Preferences.h,v 1.2.4.1 2002/04/30 13:13:07 fox Exp $ *
********************************************************************************/
#ifndef PREFERENCES_H
#define PREFERENCES_H
class Calculator;
! class Preferences : public FXDialogBox {
FXDECLARE(Preferences)
protected:
FXIcon *palette;
diff -P -c -r fox-1.0.9/configure fox-1.0.10/configure
*** fox-1.0.9/configure Wed Apr 24 01:16:13 2002
--- fox-1.0.10/configure Thu Apr 25 18:00:32 2002
***************
*** 720,726 ****
FOX_MINOR_VERSION=0
! FOX_PATCH_LEVEL=9
FOX_INTERFACE_VERSION=0
--- 720,726 ----
FOX_MINOR_VERSION=0
! FOX_PATCH_LEVEL=10
FOX_INTERFACE_VERSION=0
diff -P -c -r fox-1.0.9/configure.in fox-1.0.10/configure.in
*** fox-1.0.9/configure.in Wed Apr 24 01:15:26 2002
--- fox-1.0.10/configure.in Thu Apr 25 18:00:29 2002
***************
*** 8,14 ****
FOX_MINOR_VERSION=0
dnl Increment after every source code change
! FOX_PATCH_LEVEL=9
dnl Binaries compiled with this patchlevel of FOX will need at least
dnl version MAJOR.MINOR.INTERFACE_VERSION to run. The assertion
--- 8,14 ----
FOX_MINOR_VERSION=0
dnl Increment after every source code change
! FOX_PATCH_LEVEL=10
dnl Binaries compiled with this patchlevel of FOX will need at least
dnl version MAJOR.MINOR.INTERFACE_VERSION to run. The assertion
diff -P -c -r fox-1.0.9/include/fxver.h fox-1.0.10/include/fxver.h
*** fox-1.0.9/include/fxver.h Wed Apr 24 01:16:34 2002
--- fox-1.0.10/include/fxver.h Thu Apr 25 18:00:37 2002
***************
*** 5,11 ****
// FOX version
#define FOX_MAJOR 1
#define FOX_MINOR 0
! #define FOX_LEVEL 9
--- 5,11 ----
// FOX version
#define FOX_MAJOR 1
#define FOX_MINOR 0
! #define FOX_LEVEL 10
diff -P -c -r fox-1.0.9/src/FXFileList.cpp fox-1.0.10/src/FXFileList.cpp
*** fox-1.0.9/src/FXFileList.cpp Wed Feb 20 01:02:12 2002
--- fox-1.0.10/src/FXFileList.cpp Thu Apr 25 18:06:25 2002
***************
*** 19,25 ****
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id: FXFileList.cpp,v 1.89 2002/02/20 07:02:12 fox Exp $ *
********************************************************************************/
#include "xincs.h"
#include "fxver.h"
--- 19,25 ----
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id: FXFileList.cpp,v 1.89.4.1 2002/04/25 23:06:25 fox Exp $ *
********************************************************************************/
#include "xincs.h"
#include "fxver.h"
***************
*** 1313,1319 ****
FXIcon *big,*mini;
FXFileItem **hashlist;
int nhashlist,i,x,p,h;
! long filetime,modtime;
struct stat info;
struct dirent *dp;
DIR *dirp;
--- 1313,1319 ----
FXIcon *big,*mini;
FXFileItem **hashlist;
int nhashlist,i,x,p,h;
! long filetime;
struct stat info;
struct dirent *dp;
DIR *dirp;
***************
*** 1382,1390 ****
// Anything about file has changed
filetime=FXMAX(info.st_mtime,info.st_ctime);
- // File mod time
- modtime=info.st_mtime;
-
// Take item from hash table if found
h=hash(name);
for(p=HASH1(h,nhashlist),x=HASH2(h,nhashlist); hashlist[p]; p=(p+x)%nhashlist){
--- 1382,1387 ----
***************
*** 1405,1411 ****
nitems++;
// Anything about the file changed?
! if((item->date!=modtime) || (timestamp<filetime) || (filetime==0)){
// Obtain user name
fxgetusername(usrid,info.st_uid);
--- 1402,1408 ----
nitems++;
// Anything about the file changed?
! if((item->date!=filetime) || (filetime==0)){
// Obtain user name
fxgetusername(usrid,info.st_uid);
***************
*** 1473,1479 ****
item->miniIcon=mini;
item->size=(unsigned long)info.st_size;
item->assoc=fileassoc;
! item->date=modtime;
// Create item
if(id()) item->create();
--- 1470,1476 ----
item->miniIcon=mini;
item->size=(unsigned long)info.st_size;
item->assoc=fileassoc;
! item->date=filetime;
// Create item
if(id()) item->create();
***************
*** 1538,1544 ****
WIN32_FIND_DATA ffData;
HANDLE hFindFile;
SHFILEINFO sfi;
! time_t filetime,modtime;
// Remember current item
if(0<=current){ curitem=(FXFileItem*)items[current]; }
--- 1535,1541 ----
WIN32_FIND_DATA ffData;
HANDLE hFindFile;
SHFILEINFO sfi;
! time_t filetime;
// Remember current item
if(0<=current){ curitem=(FXFileItem*)items[current]; }
***************
*** 1599,1607 ****
// Convert it
filetime=fxfiletime(ffData.ftLastWriteTime);
- // Modified time
- modtime=filetime;
-
// Take item from hash table if found
h=hash(name);
for(p=HASH1(h,nhashlist),x=HASH2(h,nhashlist); hashlist[p]; p=(p+x)%nhashlist){
--- 1596,1601 ----
***************
*** 1622,1628 ****
nitems++;
// Anything about the file changed?
! if((item->date!=modtime) || (timestamp<filetime) || (filetime==0)){
// Obtain user name (no Win95 equivalent?)
fxgetusername(usrid,0);
--- 1616,1622 ----
nitems++;
// Anything about the file changed?
! if((item->date!=filetime) || (filetime==0)){
// Obtain user name (no Win95 equivalent?)
fxgetusername(usrid,0);
***************
*** 1699,1705 ****
item->miniIcon=mini;
item->size=(unsigned long)ffData.nFileSizeLow;
item->assoc=fileassoc;
! item->date=modtime;
// Create item
if(id()) item->create();
--- 1693,1699 ----
item->miniIcon=mini;
item->size=(unsigned long)ffData.nFileSizeLow;
item->assoc=fileassoc;
! item->date=filetime;
// Create item
if(id()) item->create();
diff -P -c -r fox-1.0.9/src/FXTextField.cpp fox-1.0.10/src/FXTextField.cpp
*** fox-1.0.9/src/FXTextField.cpp Fri Feb 22 00:50:41 2002
--- fox-1.0.10/src/FXTextField.cpp Fri Apr 26 08:06:36 2002
***************
*** 19,25 ****
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id: FXTextField.cpp,v 1.79 2002/02/22 06:50:41 fox Exp $ *
********************************************************************************/
#include "xincs.h"
#include "fxver.h"
--- 19,25 ----
* License along with this library; if not, write to the Free Software *
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
*********************************************************************************
! * $Id: FXTextField.cpp,v 1.79.4.1 2002/04/26 13:06:36 fox Exp $ *
********************************************************************************/
#include "xincs.h"
#include "fxver.h"
***************
*** 1093,1098 ****
--- 1093,1107 ----
// Draw text, clipped against frame interior
dc.setClipRectangle(border,border,width-(border<<1),height-(border<<1));
drawTextRange(dc,0,contents.length());
+
+ // Draw caret
+ if(flags&FLAG_CARET){
+ int xx=coord(cursor)-1;
+ dc.setForeground(textColor);
+ dc.fillRectangle(xx,padtop+border,1,height-padbottom-padtop-(border<<1));
+ dc.fillRectangle(xx-2,padtop+border,5,1);
+ dc.fillRectangle(xx-2,height-border-padbottom-1,5,1);
+ }
return 1;
}
diff -P -c -r fox-1.0.9/src/version.rc fox-1.0.10/src/version.rc
*** fox-1.0.9/src/version.rc Wed Apr 24 01:16:34 2002
--- fox-1.0.10/src/version.rc Tue Apr 30 08:18:07 2002
***************
*** 1,5 ****
1 VERSIONINFO
! FILEVERSION 1,0,9,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
--- 1,5 ----
1 VERSIONINFO
! FILEVERSION 1,0,10,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
***************
*** 15,21 ****
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "FOX GUI Library\0"
! VALUE "FileVersion", "1,0,9.0\0"
VALUE "LegalCopyright", "GNU Library General Public License\0"
END
END
--- 15,21 ----
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "FOX GUI Library\0"
! VALUE "FileVersion", "1,0,10.0\0"
VALUE "LegalCopyright", "GNU Library General Public License\0"
END
END
diff -P -c -r fox-1.0.9/tests/gltest.cpp fox-1.0.10/tests/gltest.cpp
*** fox-1.0.9/tests/gltest.cpp Fri Jan 4 16:50:31 2002
--- fox-1.0.10/tests/gltest.cpp Tue Apr 30 08:12:00 2002
***************
*** 18,24 ****
// Settings dialog thanks to Sander Jansen <sxj@cfdrc.com>
! class FXAPI SettingsDialog : public FXDialogBox {
FXDECLARE(SettingsDialog)
private:
SettingsDialog(){}
--- 18,24 ----
// Settings dialog thanks to Sander Jansen <sxj@cfdrc.com>
! class SettingsDialog : public FXDialogBox {
FXDECLARE(SettingsDialog)
private:
SettingsDialog(){}
***************
*** 149,155 ****
// Event Handler Object
! class FXAPI GLTestWindow : public FXMainWindow {
FXDECLARE(GLTestWindow)
private:
--- 149,155 ----
// Event Handler Object
! class GLTestWindow : public FXMainWindow {
FXDECLARE(GLTestWindow)
private: