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

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

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

revision 1.9 by mark, Sat Jul 2 20:32:54 2005 UTC revision 1.10 by fitzsim, Mon Jul 11 23:27:43 2005 UTC
# Line 45  Java_gnu_java_awt_peer_gtk_GtkScrollPane Line 45  Java_gnu_java_awt_peer_gtk_GtkScrollPane
45  {  {
46    GtkWidget *sw;    GtkWidget *sw;
47    
48      gdk_threads_enter ();
49      
50    /* Create global reference and save it for future use */    /* Create global reference and save it for future use */
51    NSA_SET_GLOBAL_REF (env, obj);    NSA_SET_GLOBAL_REF (env, obj);
52    
   gdk_threads_enter ();  
     
53    sw = gtk_scrolled_window_new (NULL, NULL);    sw = gtk_scrolled_window_new (NULL, NULL);
54    
55    gtk_widget_set_size_request (sw, width, height);    gtk_widget_set_size_request (sw, width, height);
56    
   gdk_threads_leave ();  
   
57    NSA_SET_PTR (env, obj, sw);    NSA_SET_PTR (env, obj, sw);
58    
59      gdk_threads_leave ();
60  }  }
61    
62  JNIEXPORT void JNICALL  JNIEXPORT void JNICALL
# Line 67  Java_gnu_java_awt_peer_gtk_GtkScrollPane Line 67  Java_gnu_java_awt_peer_gtk_GtkScrollPane
67    GtkScrolledWindow *sw;    GtkScrolledWindow *sw;
68    void *ptr;    void *ptr;
69    
70      gdk_threads_enter ();
71    
72    ptr = NSA_GET_PTR (env, obj);    ptr = NSA_GET_PTR (env, obj);
73    
   gdk_threads_enter ();  
74    sw = GTK_SCROLLED_WINDOW (ptr);    sw = GTK_SCROLLED_WINDOW (ptr);
75    
76    hadj = gtk_scrolled_window_get_hadjustment (sw);    hadj = gtk_scrolled_window_get_hadjustment (sw);
# Line 77  Java_gnu_java_awt_peer_gtk_GtkScrollPane Line 78  Java_gnu_java_awt_peer_gtk_GtkScrollPane
78    
79    gtk_adjustment_set_value (hadj, x);    gtk_adjustment_set_value (hadj, x);
80    gtk_adjustment_set_value (vadj, y);    gtk_adjustment_set_value (vadj, y);
81    
82    gdk_threads_leave ();    gdk_threads_leave ();
83  }  }
84    
# Line 88  Java_gnu_java_awt_peer_gtk_GtkScrollPane Line 90  Java_gnu_java_awt_peer_gtk_GtkScrollPane
90    GtkScrolledWindow *sw;    GtkScrolledWindow *sw;
91    void *ptr;    void *ptr;
92    
93      gdk_threads_enter ();
94    
95    ptr = NSA_GET_PTR (env, obj);    ptr = NSA_GET_PTR (env, obj);
96    
   gdk_threads_enter ();  
97    sw = GTK_SCROLLED_WINDOW(ptr);    sw = GTK_SCROLLED_WINDOW(ptr);
98    
99    hadj = gtk_scrolled_window_get_hadjustment (sw);    hadj = gtk_scrolled_window_get_hadjustment (sw);
# Line 107  Java_gnu_java_awt_peer_gtk_GtkScrollPane Line 110  Java_gnu_java_awt_peer_gtk_GtkScrollPane
110    GtkScrolledWindow *sw;    GtkScrolledWindow *sw;
111    void *ptr;    void *ptr;
112    
113      gdk_threads_enter ();
114    
115    ptr = NSA_GET_PTR (env, obj);    ptr = NSA_GET_PTR (env, obj);
116    
   gdk_threads_enter ();  
117    sw = GTK_SCROLLED_WINDOW(ptr);    sw = GTK_SCROLLED_WINDOW(ptr);
118    
119    vadj = gtk_scrolled_window_get_hadjustment (sw);    vadj = gtk_scrolled_window_get_hadjustment (sw);
# Line 128  Java_gnu_java_awt_peer_gtk_GtkScrollPane Line 132  Java_gnu_java_awt_peer_gtk_GtkScrollPane
132    jint height = 0;    jint height = 0;
133    jint spacing = 0;    jint spacing = 0;
134    
135      gdk_threads_enter ();
136    
137    ptr = NSA_GET_PTR (env, obj);    ptr = NSA_GET_PTR (env, obj);
138    
   gdk_threads_enter ();  
139    sw = GTK_SCROLLED_WINDOW (ptr);    sw = GTK_SCROLLED_WINDOW (ptr);
140    
141    gtk_widget_size_request (sw->hscrollbar, &requisition);    gtk_widget_size_request (sw->hscrollbar, &requisition);
# Line 152  Java_gnu_java_awt_peer_gtk_GtkScrollPane Line 157  Java_gnu_java_awt_peer_gtk_GtkScrollPane
157    jint width = 0;    jint width = 0;
158    jint spacing = 0;    jint spacing = 0;
159    
160      gdk_threads_enter ();
161    
162    ptr = NSA_GET_PTR (env, obj);    ptr = NSA_GET_PTR (env, obj);
163    
   gdk_threads_enter ();  
164    sw = GTK_SCROLLED_WINDOW (ptr);    sw = GTK_SCROLLED_WINDOW (ptr);
165    
166    gtk_widget_size_request (sw->vscrollbar, &requisition);    gtk_widget_size_request (sw->vscrollbar, &requisition);
# Line 172  Java_gnu_java_awt_peer_gtk_GtkScrollPane Line 178  Java_gnu_java_awt_peer_gtk_GtkScrollPane
178  {  {
179    void *ptr;    void *ptr;
180    
181      gdk_threads_enter ();
182    
183    ptr = NSA_GET_PTR (env, obj);    ptr = NSA_GET_PTR (env, obj);
184    
185    switch (policy)    switch (policy)
# Line 187  Java_gnu_java_awt_peer_gtk_GtkScrollPane Line 195  Java_gnu_java_awt_peer_gtk_GtkScrollPane
195        break;        break;
196      }      }
197    
   gdk_threads_enter ();  
198    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (ptr), policy, policy);    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (ptr), policy, policy);
199    
200    gdk_threads_leave ();    gdk_threads_leave ();
201  }  }

Legend:
Removed from v.1.9  
changed lines
  Added in v.1.10

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