2008-11-25 Alberto Garcia <agarcia@igalia.com>

[hildon] / src / hildon-window.h

diff --git a/src/hildon-window.h b/src/hildon-window.h
index 7ff7dab..c4a82b6 100644 (file)
--- a/src/hildon-window.h
+++ b/src/hildon-window.h
@@ -25,14 +25,7 @@
 #ifndef                                         __HILDON_WINDOW_H__
 #define                                         __HILDON_WINDOW_H__
 
-#include                                        <glib.h>
-#include                                        <glib-object.h>
-#include                                        <gtk/gtkwindow.h>
-#include                                        <gtk/gtkmenu.h>
-#include                                        <gtk/gtktoolbar.h>
-#include                                        <gdk/gdkx.h>
-
-#include                                        "hildon-defines.h"
+#include                                        <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
@@ -79,10 +72,10 @@ struct                                          _HildonWindowClass
 
     /* opera hacks for clip board operation */
     void (*clipboard_operation)(HildonWindow *hwindow, int operation);
+    gboolean (*toggle_menu)(HildonWindow * self, guint button, guint32 time);
     /* Padding for future extension */
     void (*_hildon_reserved1)(void);
     void (*_hildon_reserved2)(void);
-    void (*_hildon_reserved3)(void);
 };
 
 GType G_GNUC_CONST
@@ -98,9 +91,15 @@ hildon_window_add_with_scrollbar                (HildonWindow *self,
 GtkMenu*    
 hildon_window_get_menu                          (HildonWindow *self);
 
+void
+hildon_window_set_main_menu                     (HildonWindow *self,
+                                                GtkMenu      *menu);
+
+#ifndef HILDON_DISABLE_DEPRECATED
 void        
 hildon_window_set_menu                          (HildonWindow *self,
                                                  GtkMenu      *menu);
+#endif
 
 void    
 hildon_window_add_toolbar                       (HildonWindow *self,