← Back to branch summary

~ubuntu-branches/debian/squeeze/gmsh/squeeze

« back to all changes in this revision

Viewing changes to Fltk/manipWindow.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Christophe Prud'homme, Christophe Prud'homme
  • Date: 2009-07-13 15:49:21 UTC
  • mfrom: (7.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20090713154921-zer07j8wixwa07ig
Tags: 2.3.1.dfsg-4
http://bugs.debian.org/529972
[Christophe Prud'homme]
* Bug fix: "gmsh with cgns write support", thanks to Oliver Borm
  (Closes: #529972).
* debian/rules: make sure that Gmsh is built with occ support on all
  platforms thanks to Denis Barbier (#536435).

Show diffs side-by-side

added added

removed removed

Lines of Context:
Fltk/manipWindow.cpp
13
13
#include "Options.h"
14
14
#include "Context.h"
15
15
 
16
 
extern Context_T CTX;
17
 
 
18
16
void manip_cb(Fl_Widget *w, void *data)
19
17
{
20
18
  GUI::instance()->manip->show();
44
42
  int height = 5 * BH + 3 * WB;
45
43
 
46
44
  win = new paletteWindow
47
 
    (width, height, CTX.non_modal_windows ? true : false, "Manipulator");
 
45
    (width, height, CTX::instance()->nonModalWindows ? true : false, "Manipulator");
48
46
  win->box(GMSH_WINDOW_BOX);
49
47
 
50
48
  Fl_Box *top[3], *left[3];
90
88
    o->callback(status_xyz1p_cb, (void *)"reset");
91
89
  }
92
90
 
93
 
  win->position(CTX.manip_position[0], CTX.manip_position[1]);
 
91
  win->position(CTX::instance()->manipPosition[0], CTX::instance()->manipPosition[1]);
94
92
  win->end();
95
93
 
96
94
  FL_NORMAL_SIZE += deltaFontSize;
99
97
void manipWindow::update(bool force)
100
98
{
101
99
  if(force || win->shown()){
102
 
    double val1 = CTX.lc;
 
100
    double val1 = CTX::instance()->lc;
103
101
    
104
102
    double r0 = opt_general_rotation0(0, GMSH_GET, 0);
105
103
    double r1 = opt_general_rotation1(0, GMSH_GET, 0);