Permalink
Browse files

Replace gtk-adds-widget-window with proper GTK function (requires gtk…

…+-2.14)
  • Loading branch information...
1 parent cb7a939 commit 8aeac79f401cd75a06a8a7fa87750276a4fb656b @Ramarren committed Jan 12, 2011
Showing with 4 additions and 24 deletions.
  1. +1 −1 cells-gtk/cairo-drawing-area.lisp
  2. +0 −18 gtk-ffi/gtk-adds.c
  3. +2 −4 gtk-ffi/gtk-other.lisp
  4. +1 −1 gtk-ffi/package.lisp
@@ -651,7 +651,7 @@ anchor-point."))
;;;; -----------------------------------------------------------
(defun cairo-drawing-area-draw (self)
- (cl-cairo2::with-gtk-context (context (gtk-adds-widget-window (id self)))
+ (cl-cairo2::with-gtk-context (context (gtk-widget-get-window (id self)))
(setf (cairo-context self) context)
(mapcar #'draw (prims self))))
View
@@ -19,24 +19,6 @@ asm (".ascii \" -export:gtk_adds_widget_height\"");
asm (".ascii \" -export:gtk_adds_widget_width\"");
#endif
-
-
-int gtk_adds_widget_mapped_p (GtkWidget *wid)
-{
- return ((GTK_WIDGET_FLAGS (wid) & GTK_MAPPED) != 0) ? 1 : 0;
-}
-
-int gtk_adds_widget_visible_p (GtkWidget *wid)
-{
- return ((GTK_WIDGET_FLAGS (wid) & GTK_VISIBLE) != 0) ? 1 : 0;
-}
-
-GdkWindow *
-gtk_adds_widget_window (GtkWidget *wid)
-{
- return wid->window;
-}
-
GdkColor *
gtk_adds_color_new ()
{
View
@@ -869,7 +869,8 @@
(gtk-text-iter-copy :pointer ((iter :pointer)))
(gtk-tree-iter-copy :pointer ((iter :pointer)))
(gtk-widget-get-mapped gboolean ((widget :pointer)))
- (gtk-widget-get-visible gboolean ((widget :pointer))))
+ (gtk-widget-get-visible gboolean ((widget :pointer)))
+ (gtk-widget-get-window :pointer ((widget :pointer))))
;; not sure if this is right, but the auxiliary C code does something equivalent
@@ -888,8 +889,6 @@
;;; t3
#+libcellsgtk
(def-gtk-lib-functions :cgtk
- (gtk-adds-widget-window :pointer
- ((widget :pointer)))
(gtk-adds-color-new :pointer ())
(gtk-adds-color-set-rgb :void
((gdkcolor :pointer)
@@ -914,6 +913,5 @@
#-libcellsgtk
(eval-when (:compile-toplevel :load-toplevel :execute)
(you-need-libcellsgtk
- gtk-adds-widget-window
gtk-adds-color-new
gtk-adds-color-set-rgb))
View
@@ -118,7 +118,7 @@
#:gtk-widget-destroy #:gtk-main #:gtk-window-deiconify #:gtk-notebook-prepend-page
#:gtk-window-set-resizable #:gtk-range-set-range #:gtk-tree-store-set-cell
#:gtk-file-chooser-set-select-multiple #:gtk-menu-item-set-submenu
- #:gtk-adds-widget-window #:gdk-event-button-x #:gtk-tool-item-set-homogeneous
+ #:gtk-widget-get-window #:gdk-event-button-x #:gtk-tool-item-set-homogeneous
#:gtk-text-buffer-get-iter-at-mark #:gtk-tool-item-set-expand
#:gtk-menu-item-remove-submenu #:gtk-check-menu-item-new-with-label
#:gtk-notebook-insert-page #:gtk-tree-view-column-set-expand

0 comments on commit 8aeac79

Please sign in to comment.