Bug fix for COLOR-SELECTION

diff --git a/gtk/gtk.lisp b/gtk/gtk.lisp
index 6ba484dafc3d3b2c5b69792cb235c98e495c807d..e53ff46f815e29840810d72d7d25d3e60994a741 100644 (file)
--- a/gtk/gtk.lisp
+++ b/gtk/gtk.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 

-;; $Id: gtk.lisp,v 1.87 2008-01-02 15:57:57 espen Exp $
+;; $Id: gtk.lisp,v 1.88 2008-01-10 22:11:15 espen Exp $

 
 
 (in-package "GTK")
 
 
 (in-package "GTK")


@@ -706,10 +706,13 @@ (defbinding check-menu-item-toggled () nil
 
 ;;; Color selection
 
 
 ;;; Color selection
 

-(defbinding (color-selection-is-adjusting-p
-            "gtk_color_selection_is_adjusting") () boolean
+(defbinding color-selection-is-adjusting-p () boolean

   (colorsel color-selection))
 
   (colorsel color-selection))
 

+(defbinding (color-selection-previous-color
+            "gtk_color_selection_get_previous_color") () nil
+  (colorsel color-selection)
+  ((make-instance 'gdk:color) gdk:color :in/return))

 
 
 ;;; Color selection dialog -- no functions
 
 
 ;;; Color selection dialog -- no functions

diff --git a/gtk/gtktypes.lisp b/gtk/gtktypes.lisp
index a26a0cd703c56c14b29ca69730676c992b5b7d5f..908eb0b4a1609f5c3887c3e9bee0615d9a3660e7 100644 (file)
--- a/gtk/gtktypes.lisp
+++ b/gtk/gtktypes.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 

-;; $Id: gtktypes.lisp,v 1.61 2008-01-02 16:00:22 espen Exp $
+;; $Id: gtktypes.lisp,v 1.62 2008-01-10 22:11:15 espen Exp $

 
 (in-package "GTK")
 
 
 (in-package "GTK")
 


@@ -1058,16 +1058,16 @@     (default-height :merge t :unbound -1)))
    ((previous-alpha
      :allocation :virtual
      :getter "gtk_color_selection_get_previous_alpha"
    ((previous-alpha
      :allocation :virtual
      :getter "gtk_color_selection_get_previous_alpha"

-     :setter "gtk_color_selection_get_previous_alpha"
+     :setter "gtk_color_selection_set_previous_alpha"

      :initarg :previous-alpha
      :accessor color-selection-previous-alpha
      :type (unsigned 16))
     (previous-color
      :allocation :virtual
      :initarg :previous-alpha
      :accessor color-selection-previous-alpha
      :type (unsigned 16))
     (previous-color
      :allocation :virtual

-     :getter "gtk_color_selection_get_previous_color"
-     :setter "gtk_color_selection_get_previous_color"
+     :getter color-selection-previous-color
+     :setter "gtk_color_selection_set_previous_color"

      :initarg :previous-color
      :initarg :previous-color

-     :accessor color-selection-previous-color
+     :writer (setf color-selection-previous-color)

      :type gdk:color)))
 
   ("GtkFontSelection"
      :type gdk:color)))
 
   ("GtkFontSelection"