AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Warn if you try to add a tool item to a toolbar using the deprecated API.

Browse Source 
Sat Jul 24 21:38:12 2004  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gtk/gtktoolbar.c (internal_insert_element): Warn if you try to
	add a tool item to a toolbar using the deprecated API.
This commit is contained in:
Soeren Sandmann 2004-07-24 19:42:44 +00:00 committed by Søren Sandmann Pedersen
parent d0a5b4e0c8
commit 92295447cb
5 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sat Jul 24 21:38:12 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (internal_insert_element): Warn if you try to
add a tool item to a toolbar using the deprecated API.
Fri Jul 23 13:04:10 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkdnd.c (gtk_drag_dest_set): Create the change to

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
Sat Jul 24 21:38:12 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (internal_insert_element): Warn if you try to
add a tool item to a toolbar using the deprecated API.
Fri Jul 23 13:04:10 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkdnd.c (gtk_drag_dest_set): Create the change to

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
Sat Jul 24 21:38:12 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (internal_insert_element): Warn if you try to
add a tool item to a toolbar using the deprecated API.
Fri Jul 23 13:04:10 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkdnd.c (gtk_drag_dest_set): Create the change to

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
Sat Jul 24 21:38:12 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (internal_insert_element): Warn if you try to
add a tool item to a toolbar using the deprecated API.
Fri Jul 23 13:04:10 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkdnd.c (gtk_drag_dest_set): Create the change to

13
gtk/gtktoolbar.c
View File

@ -72,6 +72,10 @@ typedef struct _ToolbarContent ToolbarContent;
*/
#define SLIDE_SPEED 600 /* How fast the items slide, in pixels per second */
#define MIXED_API_WARNING \
"Mixing deprecated and non-deprecated GtkToolbar API is not allowed"
/* Properties */
enum {
PROP_0,
@ -3595,6 +3599,8 @@ internal_insert_element (GtkToolbar *toolbar,
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
else if (type != GTK_TOOLBAR_CHILD_RADIOBUTTON)
g_return_val_if_fail (widget == NULL, NULL);
if (GTK_IS_TOOL_ITEM (widget))
g_warning (MIXED_API_WARNING);
if (!gtk_toolbar_check_old_api (toolbar))
return NULL;
@ -4586,9 +4592,6 @@ get_shadow_type (GtkToolbar *toolbar)
/*
* API checks
*/
#define mixed_api_warning \
"mixing deprecated and non-deprecated GtkToolbar API is not allowed"
static gboolean
gtk_toolbar_check_old_api (GtkToolbar *toolbar)
{
@ -4596,7 +4599,7 @@ gtk_toolbar_check_old_api (GtkToolbar *toolbar)
if (priv->api_mode == NEW_API)
{
g_warning (mixed_api_warning);
g_warning (MIXED_API_WARNING);
return FALSE;
}
@ -4611,7 +4614,7 @@ gtk_toolbar_check_new_api (GtkToolbar *toolbar)
if (priv->api_mode == OLD_API)
{
g_warning (mixed_api_warning);
g_warning (MIXED_API_WARNING);
return FALSE;
}