← Back to branch summary

~ubuntu-branches/ubuntu/trusty/scilab/trusty

« back to all changes in this revision

Viewing changes to modules/graphics/sci_gateway/c/sci_xclick.c

  • Committer: Package Import Robot
  • Author(s): Sylvestre Ledru
  • Date: 2012-08-02 11:02:49 UTC
  • mfrom: (1.4.6)
  • Revision ID: package-import@ubuntu.com-20120802110249-0v5953emkp25geuz
Tags: 5.4.0-beta-2-1~exp1
* New upstream release
* Remove libscilab-java (remove upstream). Use libscilab2-java instead.

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/graphics/sci_gateway/c/sci_xclick.c
21
21
#include "stack-c.h"
22
22
#include "CallJxclick.h"
23
23
#include "GetProperty.h"
24
 
#include "ObjectSelection.h"
25
24
#include "FigureList.h"
26
25
#include "axesScale.h"
27
26
#include "HandleManagement.h"
69
68
  // Conversion is not done if the user clicked on a menu (pixelCoords[*] == -1)
70
69
  if (pixelCoords[0] != -1 && pixelCoords[1] != -1)
71
70
  {
72
 
    char* clickedSubwinUID = getCurrentSubWin();
 
71
    char* clickedSubwinUID = (char*)getCurrentSubWin();
73
72
    sciGet2dViewCoordFromPixel(clickedSubwinUID, pixelCoords, userCoords2D);
74
73
  }
75
74
  else
111
110
  {
112
111
    LhsVar(4) = Rhs+4;
113
112
    CreateVar(Rhs+4,MATRIX_OF_DOUBLE_DATATYPE,&one,&one,&rep);
114
 
    getGraphicObjectProperty(pstWindowUID, __GO_ID__, jni_int, &piFigureId);
 
113
    getGraphicObjectProperty(pstWindowUID, __GO_ID__, jni_int, (void**)&piFigureId);
115
114
    *stk(rep) = (double) iFigureId;
116
115
  }
117
116