[Gzz-commits] gzz/gfx/jni GzzGL-jni.cxx

[Tuomas J. Lukka]

CVSROOT:        /cvsroot/gzz
Module name:    gzz
Changes by:     Tuomas J. Lukka <address@hidden>        02/09/18 08:19:08

Modified files:
        gfx/jni        : GzzGL-jni.cxx 

Log message:
        Make it compile again. Tero, please be more careful

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/gfx/jni/GzzGL-jni.cxx.diff?tr1=1.23&tr2=1.24&r1=text&r2=text

Patches:
Index: gzz/gfx/jni/GzzGL-jni.cxx
diff -c gzz/gfx/jni/GzzGL-jni.cxx:1.23 gzz/gfx/jni/GzzGL-jni.cxx:1.24
*** gzz/gfx/jni/GzzGL-jni.cxx:1.23      Wed Sep 18 07:40:09 2002
--- gzz/gfx/jni/GzzGL-jni.cxx   Wed Sep 18 08:19:08 2002
***************
*** 24,30 ****
  Os::WindowSystem *ws;
  using Util::ObjectStorer;
  using Os::Image;
- using Os::Window;
  
  using Renderables::Renderable0;
  using Renderables::Renderable1;
--- 24,29 ----
***************
*** 224,230 ****
        DBG(dbg) << "Creating new window for Java "<<x<<" "<<y<<" "<<w<<" 
"<<h<<"\n";
        jobject ehglobal = env->NewGlobalRef(eh);
        GZZJNIEventHandler *evh = new GZZJNIEventHandler(env, ehglobal);
!       Window *win = ws->openWindow(x, y, w, h);
        DBG(dbg) << "Setting its eventhandler to "<<((int)evh)<<"\n";
        win->setEventHandler(evh);
        DBG(dbg) << "Return to J\n";
--- 223,229 ----
        DBG(dbg) << "Creating new window for Java "<<x<<" "<<y<<" "<<w<<" 
"<<h<<"\n";
        jobject ehglobal = env->NewGlobalRef(eh);
        GZZJNIEventHandler *evh = new GZZJNIEventHandler(env, ehglobal);
!       Os::Window *win = ws->openWindow(x, y, w, h);
        DBG(dbg) << "Setting its eventhandler to "<<((int)evh)<<"\n";
        win->setEventHandler(evh);
        DBG(dbg) << "Return to J\n";
***************
*** 243,255 ****
  JNIEXPORT void JNICALL Java_gzz_gfx_gl_GZZGL_repaintWindow
    (JNIEnv *env, jclass, jint id) {
        DBG(dbg_event) << "RepaintWindow called\n";
!       Window *w = windows.get(id);
        w->repaint();
    }
  
  JNIEXPORT void JNICALL Java_gzz_gfx_gl_GZZGL_getWindowSize
    (JNIEnv *env, jclass, jint id, jobject rect) {
!       Window *win = windows.get(id);
        int xywh[4];
        win->getSize(xywh);
  
--- 242,254 ----
  JNIEXPORT void JNICALL Java_gzz_gfx_gl_GZZGL_repaintWindow
    (JNIEnv *env, jclass, jint id) {
        DBG(dbg_event) << "RepaintWindow called\n";
!       Os::Window *w = windows.get(id);
        w->repaint();
    }
  
  JNIEXPORT void JNICALL Java_gzz_gfx_gl_GZZGL_getWindowSize
    (JNIEnv *env, jclass, jint id, jobject rect) {
!       Os::Window *win = windows.get(id);
        int xywh[4];
        win->getSize(xywh);
  
***************
*** 269,279 ****
  
  JNIEXPORT void JNICALL Java_gzz_gfx_gl_GZZGL_addTimeoutWindow
    (JNIEnv *env, jclass, jint id, jint ms, jint tid) {
!       Window *w = windows.get(id);
        w->addTimeout(ms, tid);
    }
  
  // ImageCache
  
  JNIEXPORT void JNICALL Java_gzz_gfx_gl_GZZGL_writeToImageCache
    (JNIEnv *env, jclass cls, jstring juri, jcharArray jbuf, jint len) {
--- 268,279 ----
  
  JNIEXPORT void JNICALL Java_gzz_gfx_gl_GZZGL_addTimeoutWindow
    (JNIEnv *env, jclass, jint id, jint ms, jint tid) {
!       Os::Window *w = windows.get(id);
        w->addTimeout(ms, tid);
    }
  
  // ImageCache
+ /* THIS DOES NOT COMPILE ON JDK 1.4 !!!!!!
  
  JNIEXPORT void JNICALL Java_gzz_gfx_gl_GZZGL_writeToImageCache
    (JNIEnv *env, jclass cls, jstring juri, jcharArray jbuf, jint len) {
***************
*** 300,305 ****
--- 300,306 ----
  //    pb = imageCache->getPixbuf(suri, lod);
      }
      (*env)->ReleaseStringUTFChars(env, juri, uri);
+ */
  
  // Image