Permalink
Browse files

Remove reader conditionals for auxiliary library.

  • Loading branch information...
1 parent 49a1b47 commit d911670e187106ea6b8de019d3e24f319edac449 @Ramarren committed Jan 12, 2011
Showing with 13 additions and 33 deletions.
  1. +0 −3 cells-gtk/widgets.lisp
  2. +0 −11 features.lisp
  3. +0 −2 test-gtk/test-dialogs.lisp
  4. +0 −1 test-gtk/test-menus.lisp
  5. +13 −16 test-gtk/test-textview.lisp
View
@@ -342,7 +342,6 @@
;; this is called unless the user overwrites this routine
)
-#+libcellsgtk
(cffi:defcallback reshape-widget-handler :int ((widget :pointer) (event :pointer) (data :pointer))
(declare (ignore data event))
(trc nil "reshape" widget)
@@ -354,11 +353,9 @@
(allocated-height self) new-height))))
0)
-#+libcellsgtk
(defmethod md-awaken :after ((self widget))
(gtk-signal-connect-swap (id self) "configure-event" (cffi:get-callback 'reshape-widget-handler) :data (id self)))
-
(defmethod focus ((self widget))
(gtk-widget-grab-focus (id self)))
View
@@ -16,17 +16,6 @@
;;; drawing-area widget using OpenGL (requires libgtkglext1)
(pushnew :cells-gtk-opengl *features*)
-;;;---------------------
-;;; Two steps:
-;;;---------------------
-
-;;; Step 1 -- Do nothing. (UFFI/Hello-C had a "Step 1," CFFI doesn't.)
-
-;;; Step 2 -- If you built or downloaded the libcellsgtk library, uncomment the next line.
-
-;;; features
-(pushnew :libcellsgtk *features*)
-
;;; library path for MacPorts
#+darwin (progn
(asdf:oos 'asdf:load-op :cffi)
@@ -29,8 +29,6 @@
(mk-hbox
:kids (kids-list?
(append
- #-libcellsgtk nil
- #+libcellsgtk
(list
(mk-button :label "Query for text"
:on-clicked
View
@@ -145,7 +145,6 @@
(mk-label
:text (c? (format nil "Combo value ~a" (value (fm^ :combo)))))))
(mk-hseparator :padding 5)
- #+libcellsgtk
(mk-hbox
:kids (kids-list?
(mk-combo-box
@@ -18,20 +18,19 @@
:kids (kids-list?
(mk-text-view
:buffer (c? (buffer (upper self test-textview)))
- #+libcellsgtk :populate-popup
- #+libcellsgtk
- (c?
- (def-populate-adds
- (:menu-item :label "Mark something yellow"
- :owner self
- :on-activate
- (callback (w e d)
- (let ((buf (buffer (owner self))))
- (setf (markup buf) ; implementation idea... ;^)
- (list
- (make-instance 'color-tag :start 10 :end 20
- :name :yellow-background)))
- (apply-markup (first (markup buf)) buf))))))))))))
+ :populate-popup
+ (c?
+ (def-populate-adds
+ (:menu-item :label "Mark something yellow"
+ :owner self
+ :on-activate
+ (callback (w e d)
+ (let ((buf (buffer (owner self))))
+ (setf (markup buf) ; implementation idea... ;^)
+ (list
+ (make-instance 'color-tag :start 10 :end 20
+ :name :yellow-background)))
+ (apply-markup (first (markup buf)) buf))))))))))))
(defmethod xtv-create-tag-table ((self text-buffer))
(let ((ht (make-hash-table)))
@@ -78,5 +77,3 @@
(with-text-iters (iter)
(gtk-text-buffer-get-iter-at-offset buf iter pos)
(setf c-ptr (gtk-text-buffer-create-mark buf (symbol-name (gensym)) iter t))))))
-
-

0 comments on commit d911670

Please sign in to comment.