Browse files

Replace auxiliary function gtk_adds_dialog_vbox with proper GTK funct…

…ion (requires >gtk+-2.14)
  • Loading branch information...
1 parent cf02ca5 commit 4863f1e6f3c0e1f2c416cafc553eaafab0fbad58 @Ramarren committed Jan 12, 2011
Showing with 5 additions and 13 deletions.
  1. +1 −1 cells-gtk/dialogs.lisp
  2. +0 −9 gtk-ffi/gtk-adds.c
  3. +4 −3 gtk-ffi/gtk-other.lisp
View
2 cells-gtk/dialogs.lisp
@@ -48,7 +48,7 @@
(defobserver content-area ((self message-dialog))
(when new-value
(trc "adding content area" self)
- (let ((vbox (gtk-adds-dialog-vbox (id self))))
+ (let ((vbox (gtk-dialog-get-content-area (id self))))
(gtk-box-pack-start vbox (id new-value) nil nil 5))))
(defobserver buttons ((self message-dialog))
View
9 gtk-ffi/gtk-adds.c
@@ -18,15 +18,6 @@ asm (".ascii \" -export:gtk_adds_g_thread_supported\"");
asm (".ascii \" -export:gtk_adds_widget_height\"");
asm (".ascii \" -export:gtk_adds_widget_width\"");
#endif
-/* Return a pointer to the vbox of a dialog.
- * Useful for adding widgets to dialogs. For example,
- * if you need a dialog with text entry capability.
- */
-GtkWidget *
-gtk_adds_dialog_vbox (GtkWidget *dialog)
-{
- return GTK_DIALOG(dialog)->vbox;
-}
/* Return a pointer to the popup_menu of a textview.
* Useful if you need to add to the default textview menu
View
7 gtk-ffi/gtk-other.lisp
@@ -863,11 +863,13 @@
(gtk-widget-create-pango-layout :pointer
((widget :pointer)
(text gtk-string))))
+;;; replacements for libcellsgtk
+(def-gtk-lib-functions :cgtk
+ (gtk-dialog-get-content-area :pointer ((dialog :pointer))))
+
;;; t3
#+libcellsgtk
(def-gtk-lib-functions :cgtk
- (gtk-adds-dialog-vbox :pointer
- ((dialog :pointer)))
(gtk-adds-text-view-popup-menu :pointer
((treeview :pointer)))
(gtk-adds-text-iter-new :pointer ())
@@ -902,7 +904,6 @@
#-libcellsgtk
(eval-when (:compile-toplevel :load-toplevel :execute)
(you-need-libcellsgtk
- gtk-adds-dialog-vbox
gtk-adds-text-view-popup-menu
gtk-adds-text-iter-new
gtk-adds-tree-iter-new

0 comments on commit 4863f1e

Please sign in to comment.