From: Philipp Brüschweiler <blei42@gmail.com>
Date: Thu, 22 Jul 2010 21:51:17 +0000 (+0200)
Subject: Merge branch 'gtk' into gtk-image-loader
X-Git-Tag: 0.97~4241^2~1^2~3
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=926d1540c5d2d0314eb369781d92000da611a18f

Merge branch 'gtk' into gtk-image-loader

Conflicts:
	basis/glib/ffi/ffi.factor
	basis/ui/backend/gtk/gtk.factor
---

926d1540c5d2d0314eb369781d92000da611a18f
diff --cc basis/glib/ffi/ffi.factor
index a0dc3a3fdb,d7b265004e..f5af540dfa
--- a/basis/glib/ffi/ffi.factor
+++ b/basis/glib/ffi/ffi.factor
@@@ -1,8 -1,8 +1,9 @@@
  ! Copyright (C) 2009 Anton Gorenko.
  ! See http://factorcode.org/license.txt for BSD license.
  USING: accessors alien alien.c-types alien.destructors
- alien.libraries alien.strings alien.syntax combinators gir
- io.encodings.utf8 kernel system vocabs.parser words ;
 -alien.libraries alien.syntax combinators compiler.units
 -gobject-introspection kernel system vocabs.parser words ;
++alien.libraries alien.strings alien.syntax combinators
++gobject-introspection io.encodings.utf8 kernel system
++vocabs.parser words ;
  IN: glib.ffi
  
  <<
diff --cc basis/ui/backend/gtk/gtk.factor
index 57b406f6fd,441e02a04f..fe72c6ddf5
--- a/basis/ui/backend/gtk/gtk.factor
+++ b/basis/ui/backend/gtk/gtk.factor
@@@ -1,19 -1,15 +1,16 @@@
  ! Copyright (C) 2010 Anton Gorenko, Philipp Brüschweiler.
  ! See http://factorcode.org/license.txt for BSD license.
  USING: accessors alien.accessors alien.c-types alien.data
 -alien.strings arrays assocs classes.struct command-line
 -destructors gdk.ffi gdk.gl.ffi glib.ffi gobject.ffi gtk.ffi
 -gtk.gl.ffi io.backend io.backend.unix.multiplexers
 -io.encodings.utf8 io.thread kernel libc literals locals math
 -math.bitwise math.order math.vectors namespaces sequences
 -strings system threads ui ui.backend ui.clipboards ui.commands
 -ui.event-loop ui.gadgets ui.gadgets.editors ui.gadgets.menus
 -ui.gadgets.private ui.gadgets.worlds ui.gestures
 -ui.pixel-formats ui.pixel-formats.private ui.private ;
 +alien.strings alien.syntax arrays assocs classes.struct
 +command-line destructors gdk.ffi gdk.gl.ffi glib.ffi
 +gobject.ffi gtk.ffi gtk.gl.ffi io.backend
 +io.backend.unix.multiplexers io.encodings.utf8 io.thread kernel
 +libc literals locals math math.bitwise math.order math.vectors
 +namespaces sequences strings system threads ui ui.backend
 +ui.clipboards ui.commands ui.event-loop ui.gadgets
- ui.gadgets.menus ui.gadgets.private ui.gadgets.worlds
- ui.gestures ui.pixel-formats ui.pixel-formats.private
- ui.private ;
- RENAME: windows ui.private => ui:windows
- EXCLUDE: ui.gadgets.editors => change-caret ;
- RENAME: change-caret ui.gadgets.editors => editors:change-caret
++ui.gadgets.editors ui.gadgets.menus ui.gadgets.private
++ui.gadgets.worlds ui.gestures ui.pixel-formats
++ui.pixel-formats.private ui.private ;
  IN: ui.backend.gtk
  
  SINGLETON: gtk-ui-backend