com gtk/php-gtk: Fixing the things Tom Rogers found: ext/gtk+/gdk.overrides ext/gtk+/gtk.overrides

Commit:    a23c4312d6ac7f91302628e0ba25fa62c908244a
Author:    Christian Weiske <[email protected]>         Fri, 27 Jan 2006 05:52:12 +0000
Parents:   2ee426d7e55d953c9c13d3c0642d7a1f3be5e8d4
Branches:  master

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

Log:
Fixing the things Tom Rogers found

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


Diff:
a23c4312d6ac7f91302628e0ba25fa62c908244a
diff --git a/ext/gtk+/gdk.overrides b/ext/gtk+/gdk.overrides
index bc83669..732b82d 100644
--- a/ext/gtk+/gdk.overrides
+++ b/ext/gtk+/gdk.overrides
@@ -289,7 +289,7 @@ PHP_METHOD
     GdkWindow *window;
     zval *php_window = NULL;
 
-    NO_STATIC_METHOD();
+    NOT_STATIC_METHOD();
 
     if (!php_gtk_parse_args(ZEND_NUM_ARGS(), ""))
         return;
@@ -873,7 +873,7 @@ PHP_METHOD
     GdkAxisUse axis_use;
     gdouble value;
 
-    NO_STATIC_METHOD();
+    NOT_STATIC_METHOD();
 
     if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "V", &php_axis_use))
         return;
@@ -895,7 +895,7 @@ PHP_METHOD
 {
     gdouble x_win, y_win;
 
-    NO_STATIC_METHOD();
+    NOT_STATIC_METHOD();
 
     if (!php_gtk_parse_args(ZEND_NUM_ARGS(), ""))
         return;
@@ -914,7 +914,7 @@ PHP_METHOD
 {
     gdouble x_win, y_win;
 
-    NO_STATIC_METHOD();
+    NOT_STATIC_METHOD();
 
     if (!php_gtk_parse_args(ZEND_NUM_ARGS(), ""))
         return;
@@ -933,7 +933,7 @@ PHP_METHOD
 {
     GdkModifierType state = 0;
 
-    NO_STATIC_METHOD();
+    NOT_STATIC_METHOD();
 
     if (!php_gtk_parse_args(ZEND_NUM_ARGS(), ""))
         return;
diff --git a/ext/gtk+/gtk.overrides b/ext/gtk+/gtk.overrides
index 2eeaf6a..928f0f4 100644
--- a/ext/gtk+/gtk.overrides
+++ b/ext/gtk+/gtk.overrides
@@ -1091,6 +1091,7 @@ PHP_METHOD
     zval *buttons = NULL;
     GtkDialogFlags flags = 0;
     GObject *wrapped_obj;
+    zval **text, **response;
 
     if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "|uNVa", &title, &free_title, &php_parent, gtkwindow_ce, &php_flags, &buttons)) {
         PHPG_THROW_CONSTRUCT_EXCEPTION(GtkDialog);
@@ -1131,7 +1132,6 @@ PHP_METHOD
     }
 
     if (buttons) {
-        zval **text, **response;
 
         if (zend_hash_num_elements(Z_ARRVAL_P(buttons)) % 2) {
             php_error(E_WARNING, "%s::%s(): button list has to contain pairs of items",
@@ -1173,13 +1173,13 @@ override gtk_dialog_add_buttons
 PHP_METHOD
 {
     zval *buttons = NULL;
+    zval **text, **response;
 
     NOT_STATIC_METHOD();
 
     if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "a", &buttons))
         return;
 
-    zval **text, **response;
 
     if (zend_hash_num_elements(Z_ARRVAL_P(buttons)) % 2) {
         php_error(E_WARNING, "%s::%s(): button list has to contain pairs of items",
@@ -1427,6 +1427,7 @@ PHP_METHOD
     GtkFileChooserAction action = GTK_FILE_CHOOSER_ACTION_OPEN;
     GObject *wrapped_obj;
     int n = 0;
+    zval **text, **response;
 
     if (!php_gtk_parse_args(ZEND_NUM_ARGS(), "|uNVau", &title, &free_title, &php_parent,
                             gtkwindow_ce, &php_action, &buttons, &backend, &free_backend)) {
@@ -1470,7 +1471,6 @@ PHP_METHOD
     }
 
     if (buttons) {
-        zval **text, **response;
 
         if (zend_hash_num_elements(Z_ARRVAL_P(buttons)) % 2) {
             php_error(E_WARNING, "%s::%s(): button list has to contain pairs of items",