nyje
/
medit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made MooPaned compilable outside moo

master
Yevgen Muntyan 2007-04-12 10:24:21 -05:00
parent 8714029896
commit 68cf9c5f4e
5 changed files with 125 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
m4/moo-flags.m4
View File

@ -25,6 +25,8 @@ AC_DEFUN_ONCE([MOO_AC_FLAGS],[
dnl must be called after MOO_AC_PYTHON
MOO_AC_LIB
AC_DEFINE(MOO_COMPILATION, 1, [must be 1])
moo_top_src_dir=`cd $srcdir && pwd`
MOO_CFLAGS="$MOO_CFLAGS -I"$moo_top_src_dir/$1" $GTK_CFLAGS $MOO_PCRE_CFLAGS -DXDG_PREFIX=_moo_edit_xdg -DG_LOG_DOMAIN=\\\"Moo\\\""
MOO_LIBS="$MOO_LIBS $GTK_LIBS $GTHREAD_LIBS $MOO_PCRE_LIBS"

19
moo/mooutils/moobigpaned.c
View File

@ -11,9 +11,22 @@
* See COPYING file that comes with this distribution.
*/
#include "mooutils/moobigpaned.h"
#include "mooutils/moomarshals.h"
#include "mooutils/mooutils-gobject.h"
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "moobigpaned.h"
#include "moomarshals.h"
#ifdef MOO_COMPILATION
#include "mooutils-gobject.h"
#else
#if GLIB_CHECK_VERSION(2,10,0)
#define MOO_OBJECT_REF_SINK(obj) g_object_ref_sink (obj)
#else
#define MOO_OBJECT_REF_SINK(obj) gtk_object_sink (g_object_ref (obj))
#endif
#endif
static void moo_big_paned_finalize (GObject *object);

10
moo/mooutils/moobigpaned.h
View File

@ -1,7 +1,7 @@
/*
* moobigpaned.h
*
* Copyright (C) 2004-2006 by Yevgen Muntyan <muntyan@math.tamu.edu>
* Copyright (C) 2004-2007 by Yevgen Muntyan <muntyan@math.tamu.edu>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -11,11 +11,11 @@
* See COPYING file that comes with this distribution.
*/
#ifndef __MOO_BIG_PANED_H__
#define __MOO_BIG_PANED_H__
#ifndef MOO_BIG_PANED_H
#define MOO_BIG_PANED_H
#include <mooutils/moopaned.h>
#include <gtk/gtkframe.h>
#include "moopaned.h"
G_BEGIN_DECLS
@ -123,4 +123,4 @@ void moo_big_paned_set_pane_params (MooBigPaned *paned,
G_END_DECLS
#endif /* __MOO_BIG_PANED_H__ */
#endif /* MOO_BIG_PANED_H */

113
moo/mooutils/moopaned.c
View File

@ -11,15 +11,93 @@
* See COPYING file that comes with this distribution.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "moomarshals.h"
#include "moopaned.h"
#include <string.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
#ifdef MOO_COMPILATION
#include "moostock.h"
#include "mooutils-misc.h"
#include "moocompat.h"
#include "mooutils-gobject.h"
#include <string.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
#else
static GtkIconSize
_moo_get_icon_size_real_small (void)
{
static GtkIconSize size = 0;
if (!size)
size = gtk_icon_size_register ("moo-real-small", 4, 4);
return size;
}
static void
_moo_widget_set_tooltip (GtkWidget *widget,
const char *tip)
{
static GtkTooltips *tooltips;
g_return_if_fail (GTK_IS_WIDGET (widget));
if (!tooltips)
tooltips = gtk_tooltips_new ();
if (GTK_IS_TOOL_ITEM (widget))
gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (widget), tooltips, tip, NULL);
else
gtk_tooltips_set_tip (tooltips, widget, tip, tip);
}
gboolean
_moo_window_set_icon_from_stock (GtkWindow *window,
const char *stock_id)
{
GdkPixbuf *icon;
g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
g_return_val_if_fail (stock_id != NULL, FALSE);
icon = gtk_widget_render_icon (GTK_WIDGET (window), stock_id,
GTK_ICON_SIZE_BUTTON, 0);
if (icon)
{
gtk_window_set_icon (GTK_WINDOW (window), icon);
gdk_pixbuf_unref (icon);
return TRUE;
}
else
{
return FALSE;
}
}
#define MOO_ICON_SIZE_REAL_SMALL (_moo_get_icon_size_real_small ())
#define MOO_STOCK_CLOSE "moo-close"
#define MOO_STOCK_STICKY "moo-sticky"
#define MOO_STOCK_DETACH "moo-detach"
#define MOO_STOCK_ATTACH "moo-attach"
#define MOO_STOCK_KEEP_ON_TOP "moo-keep-on-top"
#if GLIB_CHECK_VERSION(2,10,0)
#define MOO_OBJECT_REF_SINK(obj) g_object_ref_sink (obj)
#else
#define MOO_OBJECT_REF_SINK(obj) gtk_object_sink (g_object_ref (obj))
#endif
#endif
#define MIN_PANE_SIZE 10
@ -468,7 +546,9 @@ moo_paned_init (MooPaned *paned)
{
GTK_WIDGET_SET_FLAGS (paned, GTK_NO_WINDOW);
#ifdef MOO_COMPILATION
_moo_stock_init ();
#endif
paned->priv = G_TYPE_INSTANCE_GET_PRIVATE (paned,
MOO_TYPE_PANED,
@ -2230,11 +2310,12 @@ static GtkWidget *moo_pane_label_get_widget (MooPaneLabel *label,
}
static GtkWidget *create_button (Pane *pane,
GtkWidget *toolbar,
const char *tip,
gboolean toggle,
const char *stock_id)
static GtkWidget *
create_button (Pane *pane,
GtkWidget *toolbar,
const char *tip,
gboolean toggle,
const char *stock_id)
{
GtkWidget *button;
GtkWidget *icon;
@ -2256,9 +2337,10 @@ static GtkWidget *create_button (Pane *pane,
return button;
}
static GtkWidget *create_frame_widget (MooPaned *paned,
Pane *pane,
gboolean embedded)
static GtkWidget *
create_frame_widget (MooPaned *paned,
Pane *pane,
gboolean embedded)
{
GtkWidget *vbox, *toolbar, *separator, *handle, *hbox = NULL, *child_holder;
@ -2369,10 +2451,11 @@ static GtkWidget *create_frame_widget (MooPaned *paned,
}
int moo_paned_insert_pane (MooPaned *paned,
GtkWidget *pane_widget,
MooPaneLabel *pane_label,
int position)
int
moo_paned_insert_pane (MooPaned *paned,
GtkWidget *pane_widget,
MooPaneLabel *pane_label,
int position)
{
GtkWidget *button, *label_widget;
Pane *pane;

8
moo/mooutils/moopaned.h
View File

@ -1,7 +1,7 @@
/*
* moopaned.h
*
* Copyright (C) 2004-2006 by Yevgen Muntyan <muntyan@math.tamu.edu>
* Copyright (C) 2004-2007 by Yevgen Muntyan <muntyan@math.tamu.edu>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -11,8 +11,8 @@
* See COPYING file that comes with this distribution.
*/
#ifndef __MOO_PANED_H__
#define __MOO_PANED_H__
#ifndef MOO_PANED_H
#define MOO_PANED_H
#include <gtk/gtkbin.h>
@ -165,4 +165,4 @@ void moo_pane_label_free (MooPaneLabel *label);
G_END_DECLS
#endif /* __MOO_PANED_H__ */
#endif /* MOO_PANED_H */