From 90c099b114f34a81fdccf319d29d69c5a318ec18 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 6 Nov 2012 22:36:34 +0000
Subject: [PATCH] pp
---
Fltk/graphicWindow.cpp | 8 +++++++-
Numeric/BasisFactory.h | 2 +-
Numeric/pointsGenerators.h | 4 ++--
Numeric/pyramidalBasis.cpp | 4 +---
Numeric/pyramidalBasis.h | 5 ++---
Solver/linearSystemGMM.h | 2 +-
6 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/Fltk/graphicWindow.cpp b/Fltk/graphicWindow.cpp
index 9cc68a765d..b12a1dd446 100644
--- a/Fltk/graphicWindow.cpp
+++ b/Fltk/graphicWindow.cpp
@@ -2708,7 +2708,9 @@ graphicWindow::graphicWindow(bool main, int numTiles) : _autoScrollMessages(true
win->callback(remove_graphic_window_cb);
}
+#if defined(__APPLE__)
sysbar = 0;
+#endif
bar = 0;
if(main){
#if defined(__APPLE__)
@@ -3098,7 +3100,11 @@ void graphicWindow::copySelectedMessagesToClipboard()
void graphicWindow::fillRecentHistoryMenu()
{
- if(!bar && !sysbar) return;
+#if defined(__APPLE__)
+ if(CTX::instance()->systemMenuBar && !sysbar)
+ return;
+#endif
+
Fl_Menu_Item *table = bar_table;
#if defined(__APPLE__)
if(CTX::instance()->systemMenuBar)
diff --git a/Numeric/BasisFactory.h b/Numeric/BasisFactory.h
index 691a8340d2..883c80f2c3 100644
--- a/Numeric/BasisFactory.h
+++ b/Numeric/BasisFactory.h
@@ -21,4 +21,4 @@ class BasisFactory
static const nodalBasis* create(int elementType);
};
-#endif
\ No newline at end of file
+#endif
diff --git a/Numeric/pointsGenerators.h b/Numeric/pointsGenerators.h
index fca7e09048..f01d3a283f 100644
--- a/Numeric/pointsGenerators.h
+++ b/Numeric/pointsGenerators.h
@@ -8,7 +8,7 @@
#include "fullMatrix.h"
- /*
+ /*
* Functions to generate point distributions on
* the references elements, for all orders.
*/
@@ -41,4 +41,4 @@ fullMatrix<double> gmshGeneratePointsPrism(int order, bool serendip);
fullMatrix<double> gmshGeneratePointsPyramid(int order, bool serendip);
-#endif
\ No newline at end of file
+#endif
diff --git a/Numeric/pyramidalBasis.cpp b/Numeric/pyramidalBasis.cpp
index cf84f8832f..5c0bbe25c0 100644
--- a/Numeric/pyramidalBasis.cpp
+++ b/Numeric/pyramidalBasis.cpp
@@ -35,7 +35,7 @@ void pyramidalBasis::initialize()
}
VDM.invert(*VDMinv);
}
-
+
inline void pyramidalBasis::f(double u, double v, double w, double *val) const
{
int n = order+1;
@@ -56,5 +56,3 @@ inline void pyramidalBasis::df(double u, double v, double w, double grads[][3])
{
}
-
-
diff --git a/Numeric/pyramidalBasis.h b/Numeric/pyramidalBasis.h
index 1055d039e8..2b5b52aa6a 100644
--- a/Numeric/pyramidalBasis.h
+++ b/Numeric/pyramidalBasis.h
@@ -19,7 +19,7 @@ class pyramidalBasis: public nodalBasis
// Orthogonal basis for the pyramid
BergotBasis bergot;
-
+
public:
pyramidalBasis();
@@ -30,5 +30,4 @@ class pyramidalBasis: public nodalBasis
};
-
-#endif
\ No newline at end of file
+#endif
diff --git a/Solver/linearSystemGMM.h b/Solver/linearSystemGMM.h
index cff85caf03..2c97a23c84 100644
--- a/Solver/linearSystemGMM.h
+++ b/Solver/linearSystemGMM.h
@@ -26,7 +26,7 @@ class linearSystemGmm : public linearSystem<scalar> {
int _noisy, _gmres;
public:
linearSystemGmm()
- : _a(0), _b(0), _x(0), _prec(1.e-8), _noisy(0), _gmres(0) {}
+ : _x(0), _b(0), _a(0), _prec(1.e-8), _noisy(0), _gmres(0) {}
virtual bool isAllocated() const { return _a != 0; }
virtual void allocate(int nbRows)
{
--
GitLab