Use util_clip_triangle() in pan_item_tri_new()

[geeqie.git] / src / bar.h

diff --git a/src/bar.h b/src/bar.h
index 7e4d7c2..bfa6350 100644 (file)
--- a/src/bar.h
+++ b/src/bar.h
@@ -22,31 +22,35 @@
 #ifndef BAR_H
 #define BAR_H
 
-typedef enum {
+#include <gdk/gdk.h>
+#include <glib.h>
+#include <gtk/gtk.h>
+
+struct FileData;
+struct LayoutWindow;
+
+enum PaneType {
        PANE_UNDEF = 0,
        PANE_COMMENT,
        PANE_EXIF,
        PANE_HISTOGRAM,
        PANE_KEYWORDS,
-       PANE_GPS
-} PaneType;
-
-typedef struct _PaneData PaneData;
-
-struct _PaneData {
-       /* filled in by pane */
-       void (*pane_set_fd)(GtkWidget *pane, FileData *fd);
-       void (*pane_notify_selection)(GtkWidget *pane, gint count);
-       gint (*pane_event)(GtkWidget *pane, GdkEvent *event);
-       void (*pane_write_config)(GtkWidget *pane, GString *outstr, gint indent);
-       GtkWidget *title;
-       gboolean expanded;
-       gchar *id;
-       PaneType type;
-
-       /* filled in by bar */
-       GtkWidget *bar;
-       LayoutWindow *lw;
+       PANE_GPS,
+       PANE_RATING
+};
+
+struct PaneData {
+       void (*pane_set_fd)(GtkWidget *pane, FileData *fd); /**< filled in by pane */
+       void (*pane_notify_selection)(GtkWidget *pane, gint count); /**< filled in by pane */
+       gint (*pane_event)(GtkWidget *pane, GdkEvent *event); /**< filled in by pane */
+       void (*pane_write_config)(GtkWidget *pane, GString *outstr, gint indent); /**< filled in by pane */
+       GtkWidget *title; /**< filled in by pane */
+       gboolean expanded; /**< filled in by pane */
+       gchar *id; /**< filled in by pane */
+       PaneType type; /**< filled in by pane */
+
+       GtkWidget *bar; /**< filled in by bar */
+       LayoutWindow *lw; /**< filled in by bar */
 };
 
 
@@ -54,7 +58,7 @@ struct _PaneData {
 
 GtkWidget *bar_new(LayoutWindow *lw);
 GtkWidget *bar_new_from_config(LayoutWindow *lw, const gchar **attribute_names, const gchar **attribute_values);
-GtkWidget *bar_update_from_config(GtkWidget *bar, const gchar **attribute_names, const gchar **attribute_values);
+GtkWidget *bar_update_from_config(GtkWidget *bar, const gchar **attribute_names, const gchar **attribute_values, LayoutWindow *lw, gboolean startup);
 
 void bar_close(GtkWidget *bar);
 
@@ -71,12 +75,9 @@ void bar_set_fd(GtkWidget *bar, FileData *fd);
 void bar_notify_selection(GtkWidget *bar, gint count);
 gboolean bar_event(GtkWidget *bar, GdkEvent *event);
 
-gint bar_get_width(GtkWidget *bar);
-
 GtkWidget *bar_pane_expander_title(const gchar *title);
 void bar_update_expander(GtkWidget *pane);
 gboolean bar_pane_translate_title(PaneType type, const gchar *id, gchar **title);
-const gchar *bar_pane_get_default_config(const gchar *id);
 
 #endif
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */