~mdw
/
clg
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e7225d0
)
Fixed toggle-action activation bug
author
espen
<espen>
Mon, 14 Aug 2006 13:57:37 +0000
(13:57 +0000)
committer
espen
<espen>
Mon, 14 Aug 2006 13:57:37 +0000
(13:57 +0000)
gtk/gtkaction.lisp
patch
|
blob
|
blame
|
history
gtk/gtktypes.lisp
patch
|
blob
|
blame
|
history
diff --git
a/gtk/gtkaction.lisp
b/gtk/gtkaction.lisp
index
c8c80d7
..
4ffce9e
100644
(file)
--- a/
gtk/gtkaction.lisp
+++ b/
gtk/gtkaction.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: gtkaction.lisp,v 1.
9 2006-04-26 12:32:04
espen Exp $
+;; $Id: gtkaction.lisp,v 1.
10 2006-08-14 13:57:37
espen Exp $
(in-package "GTK")
(in-package "GTK")
@@
-118,7
+118,7
@@
;;; Toggle Action
;;; Toggle Action
-(defmethod initialize-instance ((action toggle-action) &rest initargs &key callback)
+(defmethod initialize-instance ((action toggle-action) &rest initargs &key callback
active
)
(remf initargs :callback)
(apply #'call-next-method action initargs)
(when callback
(remf initargs :callback)
(apply #'call-next-method action initargs)
(when callback
@@
-130,7
+130,7
@@
#'(lambda ()
(funcall function (toggle-action-active-p action))))
:object object :after after)))
#'(lambda ()
(funcall function (toggle-action-active-p action))))
:object object :after after)))
- (when
(toggle-action-active-p action)
+ (when
active
(action-activate action)))
(defbinding toggle-action-toggled () nil
(action-activate action)))
(defbinding toggle-action-toggled () nil
diff --git
a/gtk/gtktypes.lisp
b/gtk/gtktypes.lisp
index
c762663
..
1927a52
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.4
8 2006-06-23 12:25:38
espen Exp $
+;; $Id: gtktypes.lisp,v 1.4
9 2006-08-14 13:57:37
espen Exp $
(in-package "GTK")
(in-package "GTK")
@@
-998,7
+998,7
@@
:allocation :virtual
:getter "gtk_toggle_action_get_active"
:setter "gtk_toggle_action_set_active"
:allocation :virtual
:getter "gtk_toggle_action_get_active"
:setter "gtk_toggle_action_set_active"
- :initarg :active
+
;
:initarg :active
:accessor toggle-action-active-p
:type boolean)))
:accessor toggle-action-active-p
:type boolean)))