anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-21 23:09:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some fixes to compile Baruch's code with compaq cxx (still does not work).

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@940 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2000-07-31 13:36:03 +00:00
parent c64f5752ae
commit b8a28930df
5 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,5 +1,15 @@
2000-07-31 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* src/frontends/xforms/FormGraphics.C (apply): add some
static_cast. Not very nice, but required by compaq cxx.
* src/frontends/xforms/RadioButtonGroup.h: include header
<utility> instead of <pair.h>
* src/insets/insetgraphicsParams.C: add using directive.
(readResize): change return type to void.
(readOrigin): ditto.
* src/lyxfunc.C (getStatus): add missing break for build-program
function; add test for Literate for export functions.

11
src/frontends/xforms/FormGraphics.C
View File

@ -41,6 +41,8 @@
#include "support/LAssert.h"
#endif
using std::endl;
C_RETURNCB(FormGraphics, WMHideCB)
C_GENERICCB(FormGraphics, OKCB)
C_GENERICCB(FormGraphics, ApplyCB)
@ -259,12 +261,15 @@ void FormGraphics::apply()
igp.filename = fl_get_input(dialog_->input_filename);
igp.display = displayButtons.getButton();
igp.display = static_cast<InsetGraphicsParams::DisplayType>
(displayButtons.getButton());
igp.widthResize = widthButtons.getButton();
igp.widthResize = static_cast<InsetGraphicsParams::Resize>
(widthButtons.getButton());
igp.widthSize = strToDbl(fl_get_input(dialog_->input_width));
igp.heightResize = heightButtons.getButton();
igp.heightResize = static_cast<InsetGraphicsParams::Resize>
(heightButtons.getButton());
igp.heightSize = strToDbl(fl_get_input(dialog_->input_height));
igp.rotateAngle = strToInt(fl_get_input(dialog_->input_rotate_angle));

1
src/frontends/xforms/RadioButtonGroup.C
View File

@ -23,6 +23,7 @@
#include <algorithm>
#include <iterator>
using std::find_if;
using std::endl;
void RadioButtonGroup::registerRadioButton(FL_OBJECT *button, int value)
{

2
src/frontends/xforms/RadioButtonGroup.h
View File

@ -24,7 +24,7 @@
#endif
#include <vector>
#include <pair.h>
#include <utility>
using std::vector;
using std::pair;

7
src/insets/insetgraphicsParams.C
View File

@ -23,6 +23,8 @@
#include "support/LAssert.h"
#endif
using std::endl;
/// This variable keeps a tab on whether the translator was set with the
/// translations.
static bool translatorsSet = false;
@ -341,7 +343,8 @@ void InsetGraphicsParams::Write(Buffer const * buf, ostream & os) const
os << " rotateAngle " << rotateAngle << endl;
}
static readResize(InsetGraphicsParams * igp, bool height, string const & token)
static void readResize(InsetGraphicsParams * igp, bool height,
string const & token)
{
InsetGraphicsParams::Resize resize = InsetGraphicsParams::DEFAULT_SIZE;
@ -370,7 +373,7 @@ static readResize(InsetGraphicsParams * igp, bool height, string const & token)
igp->widthResize = resize;
}
static readOrigin(InsetGraphicsParams * igp, string const & token)
static void readOrigin(InsetGraphicsParams * igp, string const & token)
{ // TODO: complete this function.
igp->rotateOrigin = originTranslator.find(token);
}