[maemo-commits] [maemo-commits] r10527 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-03-13 15:04:42 +0200 (Tue, 13 Mar 2007)
New Revision: 10527

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkbutton.c
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkbutton.h
Log:
	* gtk/gtkbutton.[ch]:

	Remove hildon_gtk_button_set_depressed,
	osso_gtk_button_set_detail_from_attach_flags and the
	OssoGtkButtonAttachFlags type from the header
	files.
	Hardcode the number of items of the enum in the
	C file so we don't depend on its definition. Yay hacks.


Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-03-13 13:04:06 UTC (rev 10526)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-03-13 13:04:42 UTC (rev 10527)
@@ -1,5 +1,16 @@
 2007-03-13  Xan Lopez  <xan.lopez at nokia.com>
 
+	* gtk/gtkbutton.[ch]:
+
+	Remove hildon_gtk_button_set_depressed,
+	osso_gtk_button_set_detail_from_attach_flags and the
+	OssoGtkButtonAttachFlags type from the header
+	files.
+	Hardcode the number of items of the enum in the
+	C file so we don't depend on its definition. Yay hacks.
+	
+2007-03-13  Xan Lopez  <xan.lopez at nokia.com>
+
 	* gtk/gtkrc.c:
 	* gtk/gtkstyle.h:
 

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkbutton.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkbutton.c	2007-03-13 13:04:06 UTC (rev 10526)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkbutton.c	2007-03-13 13:04:42 UTC (rev 10527)
@@ -2122,7 +2122,7 @@
 
 #ifdef MAEMO_CHANGES
 
-const gchar *osso_gtk_button_attach_details [OSSO_GTK_BUTTON_ATTACH_ENUM_END] =
+const gchar *osso_gtk_button_attach_details [1 << 4] =
   { "osso_button",
     "osso_button_n",
     "osso_button_e",

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkbutton.h
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkbutton.h	2007-03-13 13:04:06 UTC (rev 10526)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtkbutton.h	2007-03-13 13:04:42 UTC (rev 10527)
@@ -134,24 +134,6 @@
 					    const gchar   *main_detail,
 					    const gchar   *default_detail);
 
-#ifdef MAEMO_CHANGES
-void hildon_gtk_button_set_depressed       (GtkButton     *button,
-                                            gboolean       depressed);
-
-typedef enum {
-  OSSO_GTK_BUTTON_ATTACH_NORTH =    1 << 0,
-  OSSO_GTK_BUTTON_ATTACH_EAST =     1 << 1,
-  OSSO_GTK_BUTTON_ATTACH_SOUTH =    1 << 2,
-  OSSO_GTK_BUTTON_ATTACH_WEST =     1 << 3,
-  OSSO_GTK_BUTTON_ATTACH_ENUM_END = 1 << 4
-} OssoGtkButtonAttachFlags;
-
-extern const gchar *osso_gtk_button_attach_details [OSSO_GTK_BUTTON_ATTACH_ENUM_END];
-
-void osso_gtk_button_set_detail_from_attach_flags (GtkButton *button,
-                                                   OssoGtkButtonAttachFlags flags);
-#endif /* MAEMO_CHANGES */
-
 G_END_DECLS
 
 #endif /* __GTK_BUTTON_H__ */