2008-04-15 13:21:13 <timj@imendio.com>

[hildon] / src / hildon-window.h

diff --git a/src/hildon-window.h b/src/hildon-window.h
index 5a14220..36e58f9 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
@@ -22,60 +22,58 @@
  *
  */
 
+#ifndef                                         __HILDON_WINDOW_H__
+#define                                         __HILDON_WINDOW_H__
 
-#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 <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                                        "hildon-defines.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() )
-#define HILDON_WINDOW(obj) \
-    (GTK_CHECK_CAST (obj, HILDON_TYPE_WINDOW, HildonWindow))
-#define HILDON_WINDOW_CLASS(klass) \
-    (GTK_CHECK_CLASS_CAST ((klass),\
-     HILDON_TYPE_WINDOW, HildonWindowClass))
-#define HILDON_IS_WINDOW(obj) (GTK_CHECK_TYPE (obj, HILDON_TYPE_WINDOW))
-#define HILDON_IS_WINDOW_CLASS(klass) \
-    (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_WINDOW))
+#define                                         HILDON_TYPE_WINDOW \
+                                                (hildon_window_get_type())
 
-typedef struct _HildonWindow      HildonWindow;
-typedef struct _HildonWindowClass HildonWindowClass;
+#define                                         HILDON_WINDOW(obj) \
+                                                (GTK_CHECK_CAST (obj, HILDON_TYPE_WINDOW, HildonWindow))
 
-/**
- * HildonWindowPrivate:
- *
- * This structure contains just internal data.
- * It should not be accessed directly.
- */
-typedef struct _HildonWindowPrivate HildonWindowPrivate;
+#define                                         HILDON_WINDOW_CLASS(klass) \
+                                                (GTK_CHECK_CLASS_CAST ((klass),\
+                                                HILDON_TYPE_WINDOW, HildonWindowClass))
 
-struct _HildonWindow
-{
-    GtkWindow parent;
+#define                                         HILDON_IS_WINDOW(obj) \
+                                                (GTK_CHECK_TYPE (obj, HILDON_TYPE_WINDOW))
 
-    /*private*/
-    HildonWindowPrivate *priv;
-};
+#define                                         HILDON_IS_WINDOW_CLASS(klass) \
+                                                (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_WINDOW))
+
+#define                                         HILDON_WINDOW_GET_CLASS(obj) \
+                                                ((HildonWindowClass *) G_OBJECT_GET_CLASS(obj))
 
-enum
+typedef struct                                  _HildonWindow HildonWindow;
+
+typedef struct                                  _HildonWindowClass HildonWindowClass;
+
+typedef enum
+{
+    HILDON_WINDOW_CO_COPY,
+    HILDON_WINDOW_CO_CUT,
+    HILDON_WINDOW_CO_PASTE
+}                                               HildonWindowClipboardOperation;
+
+struct                                          _HildonWindow
 {
-  HILDON_WINDOW_CO_COPY,
-  HILDON_WINDOW_CO_CUT,
-  HILDON_WINDOW_CO_PASTE
+    GtkWindow parent;
 };
 
-struct _HildonWindowClass
+struct                                          _HildonWindowClass
 {
     GtkWindowClass parent_class;
 
@@ -87,26 +85,40 @@ struct _HildonWindowClass
     void (*_hildon_reserved3)(void);
 };
 
+GType G_GNUC_CONST
+hildon_window_get_type                          (void);
 
-GType       hildon_window_get_type          (void);
+GtkWidget*
+hildon_window_new                               (void);
 
-GtkWidget * hildon_window_new               (void);
+void        
+hildon_window_add_with_scrollbar                (HildonWindow *self,
+                                                 GtkWidget    *child);
 
-void        hildon_window_add_with_scrollbar(HildonWindow *self,
-                                             GtkWidget    *child);
+GtkMenu*    
+hildon_window_get_menu                          (HildonWindow *self);
 
-GtkMenu *   hildon_window_get_menu          (HildonWindow *self);
-void        hildon_window_set_menu          (HildonWindow *self,
-                                             GtkMenu      *menu);
+void
+hildon_window_set_main_menu                     (HildonWindow *self,
+                                                GtkMenu      *menu);
 
-void        hildon_window_add_toolbar       (HildonWindow *self,
-                                             GtkToolbar   *toolbar);
+#ifndef HILDON_DISABLE_DEPRECATED
+void        
+hildon_window_set_menu                          (HildonWindow *self,
+                                                 GtkMenu      *menu);
+#endif
 
-void        hildon_window_remove_toolbar    (HildonWindow *self,
-                                             GtkToolbar   *toolbar);
+void    
+hildon_window_add_toolbar                       (HildonWindow *self,
+                                                 GtkToolbar   *toolbar);
 
-gboolean    hildon_window_get_is_topmost    (HildonWindow *self);
+void        
+hildon_window_remove_toolbar                    (HildonWindow *self,
+                                                 GtkToolbar   *toolbar);
 
+gboolean    
+hildon_window_get_is_topmost                    (HildonWindow *self);
 
 G_END_DECLS
-#endif /* __HILDON_WINDOW_H__ */
+
+#endif                                          /* __HILDON_WINDOW_H__ */