/[classpath]/classpath/native/jni/gtk-peer/gtk_jawt.c
ViewVC logotype

Diff of /classpath/native/jni/gtk-peer/gtk_jawt.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.2 by fitzsim, Sat Aug 20 22:46:54 2005 UTC revision 1.3 by fitzsim, Wed Aug 31 21:27:06 2005 UTC
# Line 73  classpath_jawt_get_default_display (JNIE Line 73  classpath_jawt_get_default_display (JNIE
73    
74    widget = GTK_WIDGET (ptr);    widget = GTK_WIDGET (ptr);
75    
76    /* widget should be realized before Canvas.paint is called. */    if (GTK_WIDGET_REALIZED (widget))
77    g_assert (GTK_WIDGET_REALIZED (widget));      {
78          display = gtk_widget_get_display (widget);
79    display = gtk_widget_get_display (widget);  
80          xdisplay = GDK_DISPLAY_XDISPLAY (display);
81    xdisplay = GDK_DISPLAY_XDISPLAY (display);  
82          return xdisplay;
83    return xdisplay;      }
84      else
85        return NULL;
86  }  }
87    
88  /* Does not require locking: meant to be called after the drawing  /* Does not require locking: meant to be called after the drawing
# Line 107  classpath_jawt_get_visualID (JNIEnv* env Line 109  classpath_jawt_get_visualID (JNIEnv* env
109    
110    widget = GTK_WIDGET (ptr);    widget = GTK_WIDGET (ptr);
111    
112    g_assert (GTK_WIDGET_REALIZED (widget));    if (GTK_WIDGET_REALIZED (widget))
113        {
114    visual = gdk_x11_visual_get_xvisual (gtk_widget_get_visual (widget));        visual = gdk_x11_visual_get_xvisual (gtk_widget_get_visual (widget));
115    g_assert (visual != NULL);        g_assert (visual != NULL);
116    
117    return visual->visualid;        return visual->visualid;
118        }
119      else
120        return NULL;
121  }  }
122    
123  /* Does not require locking: meant to be called after the drawing  /* Does not require locking: meant to be called after the drawing
# Line 139  classpath_jawt_get_drawable (JNIEnv* env Line 144  classpath_jawt_get_drawable (JNIEnv* env
144    
145    widget = GTK_WIDGET (ptr);    widget = GTK_WIDGET (ptr);
146    
147    g_assert (GTK_WIDGET_REALIZED (widget));    if (GTK_WIDGET_REALIZED (widget))
148        {
149    drawable = GDK_DRAWABLE_XID (widget->window);        drawable = GDK_DRAWABLE_XID (widget->window);
150    
151    return drawable;        return drawable;
152        }
153      else
154        return NULL;
155  }  }
156    
157  jint  jint

Legend:
Removed from v.1.2  
changed lines
  Added in v.1.3

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26