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 b5825c0..c4a82b6 100644 (file)
--- a/src/hildon-window.h
+++ b/src/hildon-window.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of hildon-libs
+ * This file is a part of hildon
  *
  * Copyright (C) 2006 Nokia Corporation, all rights reserved.
  *
@@ -8,7 +8,7 @@
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
  * as published by the Free Software Foundation; version 2.1 of
- * the License.
+ * the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -25,18 +25,11 @@
 #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
 
-#define                                         HILDON_WINDOW_LONG_PRESS_TIME 1500 /* in ms */
+#define                                         HILDON_WINDOW_LONG_PRESS_TIME 800 /* in ms */
 
 #define                                         HILDON_TYPE_WINDOW \
                                                 (hildon_window_get_type())
@@ -61,8 +54,6 @@ typedef struct                                  _HildonWindow HildonWindow;
 
 typedef struct                                  _HildonWindowClass HildonWindowClass;
 
-typedef struct                                  _HildonWindowPrivate HildonWindowPrivate;
-
 typedef enum
 {
     HILDON_WINDOW_CO_COPY,
@@ -81,13 +72,13 @@ 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       
+GType G_GNUC_CONST
 hildon_window_get_type                          (void);
 
 GtkWidget*
@@ -100,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,