diff --git a/unix/OLD_uipriv_unix.h b/unix/OLD_uipriv_unix.h new file mode 100644 index 00000000..94f97fae --- /dev/null +++ b/unix/OLD_uipriv_unix.h @@ -0,0 +1,45 @@ +#define gtkXMargin 12 +#define gtkYMargin 12 +#define gtkXPadding 12 +#define gtkYPadding 6 + +// menu.c +extern GtkWidget *makeMenubar(uiWindow *); +extern void freeMenubar(GtkWidget *); +extern void uninitMenus(void); + +// alloc.c +extern void initAlloc(void); +extern void uninitAlloc(void); + +// util.c +extern void setMargined(GtkContainer *, int); + +// child.c +extern struct child *newChild(uiControl *child, uiControl *parent, GtkContainer *parentContainer); +extern struct child *newChildWithBox(uiControl *child, uiControl *parent, GtkContainer *parentContainer, int margined); +extern void childRemove(struct child *c); +extern void childDestroy(struct child *c); +extern GtkWidget *childWidget(struct child *c); +extern int childFlag(struct child *c); +extern void childSetFlag(struct child *c, int flag); +extern GtkWidget *childBox(struct child *c); +extern void childSetMargined(struct child *c, int margined); + +// draw.c +extern uiDrawContext *newContext(cairo_t *cr, GtkStyleContext *style); +extern void freeContext(uiDrawContext *); + +// image.c +/*TODO remove this*/typedef struct uiImage uiImage; +extern cairo_surface_t *imageAppropriateSurface(uiImage *i, GtkWidget *w); + +// cellrendererbutton.c +extern GtkCellRenderer *newCellRendererButton(void); + +// future.c +extern void loadFutures(void); +extern PangoAttribute *FUTURE_pango_attr_font_features_new(const gchar *features); +extern PangoAttribute *FUTURE_pango_attr_foreground_alpha_new(guint16 alpha); +extern PangoAttribute *FUTURE_pango_attr_background_alpha_new(guint16 alpha); +extern gboolean FUTURE_gtk_widget_path_iter_set_object_name(GtkWidgetPath *path, gint pos, const char *name); diff --git a/unix/uipriv_unix.h b/unix/uipriv_unix.h index 43ed144b..7d2a3e0e 100644 --- a/unix/uipriv_unix.h +++ b/unix/uipriv_unix.h @@ -14,48 +14,4 @@ #include "../ui_unix.h" #include "../common/uipriv.h" -#define gtkXMargin 12 -#define gtkYMargin 12 -#define gtkXPadding 12 -#define gtkYPadding 6 - -// menu.c -extern GtkWidget *makeMenubar(uiWindow *); -extern void freeMenubar(GtkWidget *); -extern void uninitMenus(void); - -// alloc.c -extern void initAlloc(void); -extern void uninitAlloc(void); - -// util.c -extern void setMargined(GtkContainer *, int); - -// child.c -extern struct child *newChild(uiControl *child, uiControl *parent, GtkContainer *parentContainer); -extern struct child *newChildWithBox(uiControl *child, uiControl *parent, GtkContainer *parentContainer, int margined); -extern void childRemove(struct child *c); -extern void childDestroy(struct child *c); -extern GtkWidget *childWidget(struct child *c); -extern int childFlag(struct child *c); -extern void childSetFlag(struct child *c, int flag); -extern GtkWidget *childBox(struct child *c); -extern void childSetMargined(struct child *c, int margined); - -// draw.c -extern uiDrawContext *newContext(cairo_t *cr, GtkStyleContext *style); -extern void freeContext(uiDrawContext *); - -// image.c -/*TODO remove this*/typedef struct uiImage uiImage; -extern cairo_surface_t *imageAppropriateSurface(uiImage *i, GtkWidget *w); - -// cellrendererbutton.c -extern GtkCellRenderer *newCellRendererButton(void); - -// future.c -extern void loadFutures(void); -extern PangoAttribute *FUTURE_pango_attr_font_features_new(const gchar *features); -extern PangoAttribute *FUTURE_pango_attr_foreground_alpha_new(guint16 alpha); -extern PangoAttribute *FUTURE_pango_attr_background_alpha_new(guint16 alpha); -extern gboolean FUTURE_gtk_widget_path_iter_set_object_name(GtkWidgetPath *path, gint pos, const char *name); +#include "OLD_uipriv_unix.h"