* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
-#include <gtk/gtk.h>
+#include <gtk/gtkx.h>
#include "gtkspinbutton.h"
+#include "gtkmain.h"
+#include "gtkbox.h"
+#include "gtklabel.h"
+#include "gtkbutton.h"
+#include "gtktextview.h"
+#include "gtkrange.h"
#include <locale.h>
#include <string.h>
* gtk_test_init:
* @argcp: Address of the <parameter>argc</parameter> parameter of the
* main() function. Changed if any arguments were handled.
- * @argvp: Address of the <parameter>argv</parameter> parameter of main().
+ * @argvp: (inout) (array length=argcp): Address of the
+ * <parameter>argv</parameter> parameter of main().
* Any parameters understood by g_test_init() or gtk_init() are
* stripped before return.
- * @Varargs: currently unused
+ * @...: currently unused
*
* This function is used to initialize a GTK+ test program.
*
* - this function could install a mock object around GtkSettings
*/
g_setenv ("GTK_MODULES", "", TRUE);
- g_setenv ("GTK2_RC_FILES", "/dev/null", TRUE);
gtk_disable_setlocale();
setlocale (LC_ALL, "C");
g_test_bug_base ("http://bugzilla.gnome.org/show_bug.cgi?id=%s");
}
/**
- * gtk_test_widget_send_key
+ * gtk_test_widget_send_key:
* @widget: Widget to generate a key press and release on.
* @keyval: A Gdk keyboard value.
* @modifiers: Keyboard modifiers the event is setup with.
* particular because the mouse pointer is warped to the key press
* location, see gdk_test_simulate_key() for details.
*
- * Returns: wether all actions neccessary for the key event simulation were carried out successfully.
+ * Returns: whether all actions neccessary for the key event simulation were carried out successfully.
*
* Since: 2.14
**/
}
/**
- * gtk_test_widget_click
+ * gtk_test_widget_click:
* @widget: Widget to generate a button click on.
* @button: Number of the pointer button for the event, usually 1, 2 or 3.
* @modifiers: Keyboard modifiers the event is setup with.
* particular because the mouse pointer is warped to the button click
* location, see gdk_test_simulate_button() for details.
*
- * Returns: wether all actions neccessary for the button click simulation were carried out successfully.
+ * Returns: whether all actions neccessary for the button click simulation were carried out successfully.
*
* Since: 2.14
**/
}
/**
- * gtk_test_spin_button_click
+ * gtk_test_spin_button_click:
* @spinner: valid GtkSpinButton widget.
* @button: Number of the pointer button for the event, usually 1, 2 or 3.
* @upwards: %TRUE for upwards arrow click, %FALSE for downwards arrow click.
* spin button arrow areas, usually leading to an increase or decrease of
* spin button's value.
*
- * Returns: wether all actions neccessary for the button click simulation were carried out successfully.
+ * Returns: whether all actions neccessary for the button click simulation were carried out successfully.
*
* Since: 2.14
**/
guint button,
gboolean upwards)
{
- GdkWindow *panel;
+ GdkWindow *down_panel = NULL, *up_panel = NULL, *panel;
gboolean b1res = FALSE, b2res = FALSE;
- panel = _gtk_spin_button_get_panel (spinner);
+ _gtk_spin_button_get_panels (spinner, &down_panel, &up_panel);
+
+ panel = (upwards) ? up_panel : down_panel;
if (panel)
{
- gint width, pos;
- width = gdk_window_get_width (panel);
- pos = upwards ? 0 : gdk_window_get_height (panel) - 1;
- b1res = gdk_test_simulate_button (panel, width - 1, pos, button, 0, GDK_BUTTON_PRESS);
- b2res = gdk_test_simulate_button (panel, width - 1, pos, button, 0, GDK_BUTTON_RELEASE);
+ gint width = gdk_window_get_width (panel);
+ b1res = gdk_test_simulate_button (panel, width - 1, 1, button, 0, GDK_BUTTON_PRESS);
+ b2res = gdk_test_simulate_button (panel, width - 1, 1, button, 0, GDK_BUTTON_RELEASE);
}
return b1res && b2res;
}
/**
- * gtk_test_find_label
+ * gtk_test_find_label:
* @widget: Valid label or container widget.
* @label_pattern: Shell-glob pattern to match a label string.
*
* so this function is genrally only useful in test programs with
* predetermined locales, see gtk_test_init() for more details.
*
- * Returns: a GtkLabel widget if any is found.
+ * Returns: (transfer none): a GtkLabel widget if any is found.
*
* Since: 2.14
**/
}
/**
- * gtk_test_find_sibling
+ * gtk_test_find_sibling:
* @base_widget: Valid widget, part of a widget hierarchy
* @widget_type: Type of a aearched for sibling widget
*
* @base_widget will be returned.
* The general purpose of this function is to find the most likely "action"
* widget, relative to another labeling widget. Such as finding a
- * button or text entry widget, given it's corresponding label widget.
+ * button or text entry widget, given its corresponding label widget.
*
- * Returns: a widget of type @widget_type if any is found.
+ * Returns: (transfer none): a widget of type @widget_type if any is found.
*
* Since: 2.14
**/
}
/**
- * gtk_test_find_widget
+ * gtk_test_find_widget:
* @widget: Container widget, usually a GtkWindow.
* @label_pattern: Shell-glob pattern to match a label string.
* @widget_type: Type of a aearched for label sibling widget.
* gtk_test_widget_click() for possible caveats involving the search of
* such widgets and synthesizing widget events.
*
- * Returns: a valid widget if any is found or %NULL.
+ * Returns: (transfer none): a valid widget if any is found or %NULL.
*
* Since: 2.14
**/
}
/**
- * gtk_test_slider_set_perc
+ * gtk_test_slider_set_perc:
* @widget: valid widget pointer.
* @percentage: value between 0 and 100.
*
else if (GTK_IS_SPIN_BUTTON (widget))
adjustment = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget));
if (adjustment)
- gtk_adjustment_set_value (adjustment, adjustment->lower + (adjustment->upper - adjustment->lower - adjustment->page_size) * percentage * 0.01);
+ gtk_adjustment_set_value (adjustment,
+ gtk_adjustment_get_lower (adjustment)
+ + (gtk_adjustment_get_upper (adjustment)
+ - gtk_adjustment_get_lower (adjustment)
+ - gtk_adjustment_get_page_size (adjustment))
+ * percentage * 0.01);
}
/**
- * gtk_test_slider_get_value
+ * gtk_test_slider_get_value:
* @widget: valid widget pointer.
*
* Retrive the literal adjustment value for GtkRange based
* of the adjustment belonging to @widget, and is not a percentage
* as passed in to gtk_test_slider_set_perc().
*
- * Returns: adjustment->value for an adjustment belonging to @widget.
+ * Returns: gtk_adjustment_get_value (adjustment) for an adjustment belonging to @widget.
*
* Since: 2.14
**/
adjustment = gtk_range_get_adjustment (GTK_RANGE (widget));
else if (GTK_IS_SPIN_BUTTON (widget))
adjustment = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget));
- return adjustment ? adjustment->value : 0;
+ return adjustment ? gtk_adjustment_get_value (adjustment) : 0;
}
/**
- * gtk_test_text_set
+ * gtk_test_text_set:
* @widget: valid widget pointer.
* @string: a 0-terminated C string
*
}
/**
- * gtk_test_text_get
+ * gtk_test_text_get:
* @widget: valid widget pointer.
*
* Retrive the text string of @widget if it is a GtkLabel,
}
/**
- * gtk_test_create_widget
+ * gtk_test_create_widget:
* @widget_type: a valid widget type.
* @first_property_name: (allow-none): Name of first property to set or %NULL
- * @Varargs: value to set the first property to, followed by more
+ * @...: value to set the first property to, followed by more
* name-value pairs, terminated by %NULL
*
* This function wraps g_object_new() for widget types.
* g_object_ref_sink() them (to keep them alive across a running test)
* and set them up for destruction during the next test teardown phase.
*
- * Returns: a newly created widget.
+ * Returns: (transfer none): a newly created widget.
*
* Since: 2.14
*/
}
/**
- * gtk_test_display_button_window
+ * gtk_test_display_button_window:
* @window_title: Title of the window to be displayed.
* @dialog_text: Text inside the window to be displayed.
* @...: %NULL terminated list of (const char *label, int *nump) pairs.
* The window will quit any running gtk_main()-loop when destroyed, and it
* will automatically be destroyed upon test function teardown.
*
- * Returns: a widget pointer to the newly created GtkWindow.
+ * Returns: (transfer full): a widget pointer to the newly created GtkWindow.
*
* Since: 2.14
**/
{
va_list var_args;
GtkWidget *window = gtk_test_create_widget (GTK_TYPE_WINDOW, "title", window_title, NULL);
- GtkWidget *vbox = gtk_test_create_widget (GTK_TYPE_VBOX, "parent", window, NULL);
+ GtkWidget *vbox = gtk_test_create_widget (GTK_TYPE_BOX, "parent", window, "orientation", GTK_ORIENTATION_VERTICAL, NULL);
const char *arg1;
gtk_test_create_widget (GTK_TYPE_LABEL, "label", dialog_text, "parent", vbox, NULL);
g_signal_connect (window, "destroy", G_CALLBACK (try_main_quit), NULL);
}
/**
- * gtk_test_create_simple_window
+ * gtk_test_create_simple_window:
* @window_title: Title of the window to be displayed.
* @dialog_text: Text inside the window to be displayed.
*
* The window will quit any running gtk_main()-loop when destroyed, and it
* will automatically be destroyed upon test function teardown.
*
- * Returns: a widget pointer to the newly created GtkWindow.
+ * Returns: (transfer none): a widget pointer to the newly created GtkWindow.
*
* Since: 2.14
**/
const gchar *dialog_text)
{
GtkWidget *window = gtk_test_create_widget (GTK_TYPE_WINDOW, "title", window_title, NULL);
- GtkWidget *vbox = gtk_test_create_widget (GTK_TYPE_VBOX, "parent", window, NULL);
+ GtkWidget *vbox = gtk_test_create_widget (GTK_TYPE_BOX, "parent", window, "orientation", GTK_ORIENTATION_VERTICAL, NULL);
gtk_test_create_widget (GTK_TYPE_LABEL, "label", dialog_text, "parent", vbox, NULL);
g_signal_connect (window, "destroy", G_CALLBACK (try_main_quit), NULL);
gtk_widget_show_all (vbox);
static guint n_all_registered_types = 0;
/**
- * gtk_test_list_all_types
+ * gtk_test_list_all_types:
* @n_types: location to store number of types
- * @returns: 0-terminated array of type ids
*
* Return the type ids that have been registered after
* calling gtk_test_register_all_types().
*
+ * Returns: (array length=n_types zero-terminated=1) (transfer none):
+ * 0-terminated array of type ids
+ *
* Since: 2.14
- **/
+ */
const GType*
gtk_test_list_all_types (guint *n_types)
{
}
/**
- * gtk_test_register_all_types
+ * gtk_test_register_all_types:
*
* Force registration of all core Gtk+ and Gdk object types.
* This allowes to refer to any of those object types via
projects / ~andy / gtk / blobdiff