diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp index cd6b76dabf80018563c1a78b1668f39c56d7c51c..f9eba3b0ecdf4fa6364ebfbe4c037f3bbb33d08f 100644 --- a/Fltk/GUI.cpp +++ b/Fltk/GUI.cpp @@ -693,10 +693,12 @@ void window_cb(Fl_Widget *w, void *data) oldw = GUI::instance()->graph[0]->win->w(); oldh = GUI::instance()->graph[0]->win->h(); GUI::instance()->graph[0]->win->resize(Fl::x(), Fl::y(), Fl::w(), Fl::h()); + //GUI::instance()->graph[0]->win->fullscreen(); zoom = 0; } else{ GUI::instance()->graph[0]->win->resize(oldx, oldy, oldw, oldh); + //GUI::instance()->graph[0]->win->fullscreen_off(oldx, oldy, oldw, oldh); zoom = 1; } GUI::instance()->graph[0]->win->show(); diff --git a/Geo/GEdgeCompound.cpp b/Geo/GEdgeCompound.cpp index e617f135d3582db70c7fcc16d73b2189aadf5999..137f5e51d90f58c741072e269c7c3c38710cbb1d 100644 --- a/Geo/GEdgeCompound.cpp +++ b/Geo/GEdgeCompound.cpp @@ -7,10 +7,10 @@ // Emilie Marchandise // +#include <stdlib.h> #include "GmshConfig.h" #include "GEdgeCompound.h" #include "Numeric.h" -#include "stdlib.h" GEdgeCompound::GEdgeCompound(GModel *m, int tag, std::vector<GEdge*> &compound) : GEdge(m, tag, 0 , 0), _compound(compound)