com gtk/php-gtk: Fixing bug #36238: GtkColorButton wasn't phpish: ext/gtk+/gtk.overrides

Commit:    186c08c8008898d0b52e7667c4302e79d046b902
Author:    Christian Weiske <[email protected]>         Wed, 1 Feb 2006 06:14:58 +0000
Parents:   166717aa8da01ead7cc616c347b5a2d614bd89c2
Branches:  master

Link:       http://git.php.net/?p=gtk/php-gtk.git;a=commitdiff;h=186c08c8008898d0b52e7667c4302e79d046b902

Log:
Fixing bug #36238:
GtkColorButton wasn't phpish

Bugs:
https://bugs.php.net/36238

Changed paths:
  M  ext/gtk+/gtk.overrides


Diff:
186c08c8008898d0b52e7667c4302e79d046b902
diff --git a/ext/gtk+/gtk.overrides b/ext/gtk+/gtk.overrides
index 928f0f4..ef4fbbf 100644
--- a/ext/gtk+/gtk.overrides
+++ b/ext/gtk+/gtk.overrides
@@ -976,9 +976,10 @@ PHP_METHOD
 %% }}}
 
 
-%% {{{ GtkColorSelection
+%% {{{ GtkColorButton
+
 %%
-override gtk_color_selection_get_current_color
+override gtk_color_button_get_color
 PHP_METHOD
 {
 
@@ -991,9 +992,28 @@ PHP_METHOD
         return;
     }
 
-    gtk_color_selection_get_current_color(GTK_COLOR_SELECTION(PHPG_GOBJECT(this_ptr)), &color);
+    gtk_color_button_get_color(GTK_COLOR_BUTTON(PHPG_GOBJECT(this_ptr)), &color);
     phpg_gboxed_new(&return_value, GDK_TYPE_COLOR, &color, TRUE, TRUE TSRMLS_CC);
+}
+
+%% }}}
+
 
+%% {{{ GtkColorSelection
+%%
+override gtk_color_selection_get_current_color
+PHP_METHOD
+{
+    GdkColor color = { 0 , 0 , 0 , 0 };
+
+    NOT_STATIC_METHOD();
+
+    if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "")) {
+        return;
+    }
+
+    gtk_color_selection_get_current_color(GTK_COLOR_SELECTION(PHPG_GOBJECT(this_ptr)), &color);
+    phpg_gboxed_new(&return_value, GDK_TYPE_COLOR, &color, TRUE, TRUE TSRMLS_CC);
 }
 
 %%
@@ -1003,13 +1023,13 @@ PHP_METHOD
 
     GdkColor color = { 0 , 0 , 0 , 0 };
 
-    if (ZEND_NUM_ARGS() > 0) {
-        php_error(E_WARNING, "%s::%s() requires 0 arguments, %d given",
-                  get_active_class_name(NULL TSRMLS_CC),
-                  get_active_function_name(TSRMLS_C), ZEND_NUM_ARGS());
+    NOT_STATIC_METHOD();
+
+    if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "")) {
         return;
     }
 
+
     gtk_color_selection_get_previous_color(GTK_COLOR_SELECTION(PHPG_GOBJECT(this_ptr)), &color);
     phpg_gboxed_new(&return_value, GDK_TYPE_COLOR, &color, TRUE, TRUE TSRMLS_CC);