anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

A patch from Dekel I forgot to commit

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1251 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2000-12-04 09:15:51 +00:00
parent 77c3cb694e
commit 9bcfb039c9
7 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2000-11-30 Dekel Tsur <dekelts@tau.ac.il>
* Several files: Allow compilation when the compiler doesn't
support namespaces.
2000-11-30 Angus Leeming <a.leeming@ic.ac.uk>
* lyx.man:

6
src/filedlg.C
View File

@ -72,6 +72,10 @@ extern "C" int gettimeofday(struct timeval *, struct timezone *);
#include "support/filetools.h"
#include "filedlg.h"
#ifdef SIGC_CXX_NAMESPACES
using SigC::slot;
#endif
// six months, in seconds
static const long SIX_MONTH_SEC = 6L * 30L * 24L * 60L * 60L;
static const long ONE_HOUR_SEC = 60L * 60L;
@ -411,7 +415,7 @@ LyXFileDlg::LyXFileDlg()
fl_hide_object(pFileDlgForm->User1);
fl_hide_object(pFileDlgForm->User2);
r_ = Dialogs::redrawGUI.connect(SigC::slot(this, &LyXFileDlg::redraw));
r_ = Dialogs::redrawGUI.connect(slot(this, &LyXFileDlg::redraw));
}

3
src/filedlg.h
View File

@ -25,6 +25,7 @@
#ifdef SIGC_CXX_NAMESPACES
using SigC::Object;
using SigC::Connection;
#endif
/// LyXDirEntry internal structure definition
@ -119,7 +120,7 @@ private:
/// Simulates a click on OK/Cancel
void Force(bool);
/// Redraw connection.
SigC::Connection r_;
Connection r_;
};
#endif

3
src/insets/figinset.h
View File

@ -19,6 +19,7 @@ struct Figref;
#ifdef SIGC_CXX_NAMESPACES
using SigC::Object;
using SigC::Connection;
#endif
///
@ -155,7 +156,7 @@ private:
/// get sizes from .eps file
void GetPSSizes();
/// Redraw connection.
SigC::Connection r_;
Connection r_;
};

3
src/insets/insetexternal.h
View File

@ -25,6 +25,7 @@ struct ExternalTemplate;
#ifdef SIGC_CXX_NAMESPACES
using SigC::Object;
using SigC::Connection;
#endif
///
@ -162,7 +163,7 @@ private:
string tempname;
/// Redraw connection.
SigC::Connection r_;
Connection r_;
};
#endif

3
src/intl.h
View File

@ -22,6 +22,7 @@ class TransManager;
#ifdef SIGC_CXX_NAMESPACES
using SigC::Object;
using SigC::Connection;
#endif
/// default character set
@ -99,7 +100,7 @@ private:
///
TransManager * trans;
/// Redraw connection.
SigC::Connection r_;
Connection r_;
};

3
src/lyxfr0.h
View File

@ -15,6 +15,7 @@ class LyXFindReplace;
#ifdef SIGC_CXX_NAMESPACES
using SigC::Object;
using SigC::Connection;
#endif
/**
@ -90,7 +91,7 @@ private:
/// replace buttons enabled?
bool fReplaceEnabled;
/// Redraw connection.
SigC::Connection r_;
Connection r_;
};
#endif