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

More public/private stuff

master
Yevgen Muntyan 2006-08-15 03:52:38 -05:00
parent 6273534c82
commit 696a5b20ff
13 changed files with 142 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
moo/mooapp/mooapp.c
View File

@ -1473,7 +1473,7 @@ moo_app_present (MooApp *app)
g_return_if_fail (window != NULL);
moo_window_present (window, 0);
_moo_window_present (window, 0);
}

9
moo/mooedit/mooeditor.c
View File

@ -609,14 +609,15 @@ get_top_window (MooEditor *editor)
}
list = g_slist_reverse (list);
window = moo_get_top_window (list);
window = _moo_get_top_window (list);
g_slist_free (list);
return MOO_EDIT_WINDOW (window);
}
static void file_info_list_free (GSList *list)
static void
file_info_list_free (GSList *list)
{
g_slist_foreach (list, (GFunc) moo_edit_file_info_free, NULL);
g_slist_free (list);
@ -1192,7 +1193,7 @@ moo_editor_present (MooEditor *editor,
window = moo_editor_new_window (editor);
g_return_if_fail (window != NULL);
moo_window_present (GTK_WINDOW (window), stamp);
_moo_window_present (GTK_WINDOW (window), stamp);
}
@ -1225,7 +1226,7 @@ moo_editor_set_active_doc (MooEditor *editor,
g_return_if_fail (info != NULL);
g_return_if_fail (info->window != NULL);
moo_window_present (GTK_WINDOW (info->window), 0);
_moo_window_present (GTK_WINDOW (info->window), 0);
moo_edit_window_set_active_doc (info->window, doc);
}

10
moo/mooedit/mooeditwindow.c
View File

@ -2019,9 +2019,9 @@ tab_icon_drag_data_get (GtkWidget *evbox,
if (info == TARGET_MOO_EDIT_TAB)
{
moo_selection_data_set_pointer (data,
gdk_atom_intern ("MOO_EDIT_TAB", FALSE),
edit);
_moo_selection_data_set_pointer (data,
gdk_atom_intern ("MOO_EDIT_TAB", FALSE),
edit);
}
else if (info == TARGET_URI_LIST)
{
@ -3469,7 +3469,7 @@ notebook_drag_data_recv (GtkWidget *widget,
if (data->target == moo_edit_tab_atom)
{
GtkWidget *toplevel;
MooEdit *doc = moo_selection_data_get_pointer (data, moo_edit_tab_atom);
MooEdit *doc = _moo_selection_data_get_pointer (data, moo_edit_tab_atom);
if (!doc)
goto out;
@ -3530,7 +3530,7 @@ notebook_drag_data_recv (GtkWidget *widget,
if (info == TARGET_MOO_EDIT_TAB)
{
GtkWidget *toplevel;
MooEdit *doc = moo_selection_data_get_pointer (data, moo_edit_tab_atom);
MooEdit *doc = _moo_selection_data_get_pointer (data, moo_edit_tab_atom);
if (!doc)
{

14
moo/mooedit/mootextview.c
View File

@ -1669,9 +1669,9 @@ clipboard_get_selection (G_GNUC_UNUSED GtkClipboard *clipboard,
if (info == TARGET_MOO_TEXT_VIEW)
{
moo_selection_data_set_pointer (selection_data,
gdk_atom_intern ("MOO_TEXT_VIEW", FALSE),
data);
_moo_selection_data_set_pointer (selection_data,
gdk_atom_intern ("MOO_TEXT_VIEW", FALSE),
data);
}
else if (gtk_text_buffer_get_selection_bounds (get_buffer (view), &start, &end))
{
@ -1755,9 +1755,9 @@ get_clipboard (G_GNUC_UNUSED GtkClipboard *clipboard,
if (info == TARGET_MOO_TEXT_VIEW)
{
moo_selection_data_set_pointer (selection_data,
gdk_atom_intern ("MOO_TEXT_VIEW", FALSE),
view);
_moo_selection_data_set_pointer (selection_data,
gdk_atom_intern ("MOO_TEXT_VIEW", FALSE),
view);
return;
}
@ -1901,7 +1901,7 @@ moo_text_view_paste_clipboard (GtkTextView *text_view)
GtkSelectionData *data;
if ((data = gtk_clipboard_wait_for_contents (clipboard, moo_text_view_atom)) &&
(source = moo_selection_data_get_pointer (data, moo_text_view_atom)))
(source = _moo_selection_data_get_pointer (data, moo_text_view_atom)))
{
need_paste_text = FALSE;
paste_moo_text_view_content (text_view, source);

12
moo/mooedit/plugins/fileselector/moofileselector.c
View File

@ -718,7 +718,7 @@ moo_file_selector_drop_data_received (MooFileView *fileview,
goto error;
}
doc = moo_selection_data_get_pointer (data, moo_edit_tab_atom);
doc = _moo_selection_data_get_pointer (data, moo_edit_tab_atom);
if (!MOO_IS_EDIT (doc))
{
@ -1078,7 +1078,7 @@ create_menu_item (MooFileSelector *filesel,
g_signal_connect (item, "activate", G_CALLBACK (drop_item_activated), filesel);
gtk_widget_show (item);
moo_menu_item_set_accel_label (item, accel_label);
_moo_menu_item_set_accel_label (item, accel_label);
return item;
}
@ -1103,7 +1103,7 @@ menu_key_event (GtkWidget *menu,
return FALSE;
}
mask = moo_get_modifiers (menu);
mask = _moo_get_modifiers (menu);
alternate = (mask & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) != 0;
items = g_object_get_data (G_OBJECT (menu), "moo-menu-items");
@ -1120,7 +1120,7 @@ menu_key_event (GtkWidget *menu,
g_object_set_data (G_OBJECT (item), "moo-menu-item-alternate",
GINT_TO_POINTER (alternate));
moo_menu_item_set_label (item, label, FALSE);
_moo_menu_item_set_label (item, label, FALSE);
}
return FALSE;
@ -1176,7 +1176,7 @@ create_drop_doc_menu (MooFileSelector *filesel,
item = gtk_image_menu_item_new_from_stock (GTK_STOCK_CANCEL, NULL);
gtk_widget_show (item);
moo_menu_item_set_accel_label (item, "Escape");
_moo_menu_item_set_accel_label (item, "Escape");
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
return menu;
@ -1211,7 +1211,7 @@ moo_file_selector_drop_doc (MooFileSelector *filesel,
return;
}
mods = moo_get_modifiers (widget) & (GDK_CONTROL_MASK | GDK_SHIFT_MASK | GDK_MOD1_MASK);
mods = _moo_get_modifiers (widget) & (GDK_CONTROL_MASK | GDK_SHIFT_MASK | GDK_MOD1_MASK);
if (!mods || mods & GDK_MOD1_MASK)
action = DROP_DOC_ASK;

14
moo/moofileview/moofileview.c
View File

@ -2422,9 +2422,9 @@ get_clipboard_cb (G_GNUC_UNUSED GtkClipboard *clipboard,
switch (info)
{
case CB_TARGET_CLIPBOARD:
moo_selection_data_set_pointer (selection_data,
moo_file_view_clipboard,
fileview);
_moo_selection_data_set_pointer (selection_data,
moo_file_view_clipboard,
fileview);
break;
case CB_TARGET_URI_LIST:
@ -2511,7 +2511,7 @@ file_view_paste_clipboard (MooFileView *fileview)
GList *filenames, *l;
const char *destdir;
remote = moo_selection_data_get_pointer (data, moo_file_view_clipboard);
remote = _moo_selection_data_get_pointer (data, moo_file_view_clipboard);
g_return_if_fail (remote != NULL);
cb = remote->priv->clipboard;
@ -5576,7 +5576,7 @@ moo_file_view_drop_uris (MooFileView *fileview,
// g_free (dirname);
// }
mask = moo_get_modifiers (widget);
mask = _moo_get_modifiers (widget);
#if 0
#define ACTION_NAME(ac) (ac == GDK_ACTION_DEFAULT ? "DEFAULT" : \
@ -5643,7 +5643,7 @@ moo_file_view_drop_uris (MooFileView *fileview,
GINT_TO_POINTER (action)); \
g_signal_connect (item, "activate", G_CALLBACK (drop_item_activated), fileview); \
gtk_widget_show (item); \
moo_menu_item_set_accel_label (item, accel_label); \
_moo_menu_item_set_accel_label (item, accel_label); \
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
CREATE_IT (MOO_STOCK_FILE_MOVE, GDK_ACTION_MOVE, "Shift");
@ -5657,7 +5657,7 @@ moo_file_view_drop_uris (MooFileView *fileview,
item = gtk_image_menu_item_new_from_stock (GTK_STOCK_CANCEL, NULL);
gtk_widget_show (item);
moo_menu_item_set_accel_label (item, "Escape");
_moo_menu_item_set_accel_label (item, "Escape");
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
_moo_file_view_drag_finish (fileview, context, TRUE, FALSE, time);

97
moo/moopython/pygtk/mooutils-pygtk.defs
View File

@ -1077,10 +1077,10 @@
(return-type "none")
)
(define-function reset_log_func
(c-name "moo_reset_log_func")
(return-type "none")
)
;; (define-function reset_log_func
;; (c-name "moo_reset_log_func")
;; (return-type "none")
;; )
@ -1383,35 +1383,35 @@
;; From ../mooutils/moowin.h
(define-function window_is_hidden
(c-name "moo_window_is_hidden")
(return-type "gboolean")
(parameters
'("GtkWindow*" "window")
)
)
;; (define-function window_is_hidden
;; (c-name "moo_window_is_hidden")
;; (return-type "gboolean")
;; (parameters
;; '("GtkWindow*" "window")
;; )
;; )
(define-function get_top_window
(c-name "moo_get_top_window")
(return-type "GtkWindow*")
(parameters
'("GSList*" "windows")
)
)
(define-function get_toplevel_window
(c-name "moo_get_toplevel_window")
(return-type "GtkWindow*")
)
(define-function window_set_icon_from_stock
(c-name "moo_window_set_icon_from_stock")
(return-type "gboolean")
(parameters
'("GtkWindow*" "window")
'("const-char*" "stock_id")
)
)
;; (define-function get_top_window
;; (c-name "moo_get_top_window")
;; (return-type "GtkWindow*")
;; (parameters
;; '("GSList*" "windows")
;; )
;; )
;;
;; (define-function get_toplevel_window
;; (c-name "moo_get_toplevel_window")
;; (return-type "GtkWindow*")
;; )
;;
;; (define-function window_set_icon_from_stock
;; (c-name "moo_window_set_icon_from_stock")
;; (return-type "gboolean")
;; (parameters
;; '("GtkWindow*" "window")
;; '("const-char*" "stock_id")
;; )
;; )
@ -2602,11 +2602,35 @@
)
)
(define-function make_user_data_dir
(c-name "moo_make_user_data_dir")
(return-type "gboolean")
)
(define-function get_user_data_dir
(c-name "moo_get_user_data_dir")
(return-type "char*")
)
(define-function get_user_data_file
(c-name "moo_get_user_data_file")
(return-type "char*")
(parameters
'("const-char*" "basename")
)
)
(define-function save_user_data_file
(c-name "moo_save_user_data_file")
(return-type "gboolean")
(parameters
'("const-char*" "basename")
'("const-char*" "content")
'("gssize" "len" (null-ok) (default "-1"))
'("GError**" "error")
)
)
(define-function get_data_dirs
(c-name "moo_get_data_dirs")
(return-type "char*")
@ -2616,6 +2640,15 @@
)
)
(define-function get_data_files
(c-name "moo_get_data_files")
(return-type "char*")
(parameters
'("MooDataDirType" "type")
'("guint*" "n_files")
)
)
(define-function get_data_subdirs
(c-name "moo_get_data_subdirs")
(return-type "char**")

2
moo/mooutils/moocmd.c
View File

@ -367,7 +367,7 @@ try_channel_leftover (MooCmd *cmd,
{
char **lines, **p;
lines = moo_splitlines (text);
lines = _moo_splitlines (text);
if (lines)
{

4
moo/mooutils/mooglade.c
View File

@ -568,7 +568,7 @@ set_special_props (MooGladeXML *xml,
gtk_widget_show (widget);
if (props->mask & PROP_TOOLTIP)
moo_widget_set_tooltip (widget, props->tooltip);
_moo_widget_set_tooltip (widget, props->tooltip);
if (props->mask & PROP_ENABLE_TOOLTIPS)
{
@ -1873,7 +1873,7 @@ parse_property (GParamSpec *param_spec,
}
else if (param_spec->value_type == G_TYPE_STRV)
{
char **strv = moo_splitlines (value);
char **strv = _moo_splitlines (value);
g_value_take_boxed (&param->value, strv);
}
else

4
moo/mooutils/moopaned.c
View File

@ -2246,7 +2246,7 @@ static GtkWidget *create_button (Pane *pane,
g_object_set_data (G_OBJECT (button), "moo-pane", pane);
gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE);
gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
moo_widget_set_tooltip (button, tip);
_moo_widget_set_tooltip (button, tip);
icon = gtk_image_new_from_stock (stock_id, MOO_ICON_SIZE_REAL_SMALL);
gtk_container_add (GTK_CONTAINER (button), icon);
gtk_box_pack_end (GTK_BOX (toolbar), button, FALSE, FALSE, 0);
@ -3585,7 +3585,7 @@ create_pane_window (MooPaned *paned,
if (pane->label->icon_pixbuf)
gtk_window_set_icon (window, pane->label->icon_pixbuf);
else if (pane->label->icon_stock_id)
moo_window_set_icon_from_stock (window, pane->label->icon_stock_id);
_moo_window_set_icon_from_stock (window, pane->label->icon_stock_id);
switch (paned->priv->pane_position)
{

2
moo/mooutils/moouixml.c
View File

@ -2146,7 +2146,7 @@ create_tool_item (MooUIXML *xml,
gtk_widget_show (tool_item);
if (item->tooltip)
moo_widget_set_tooltip (tool_item, item->tooltip);
_moo_widget_set_tooltip (tool_item, item->tooltip);
if (item->icon_stock_id)
gtk_tool_button_set_stock_id (GTK_TOOL_BUTTON (tool_item),
item->icon_stock_id);

54
moo/mooutils/mooutils-misc.c
View File

@ -338,7 +338,7 @@ find_by_xid (GSList *windows, XID w)
GtkWindow*
moo_get_top_window (GSList *windows)
_moo_get_top_window (GSList *windows)
{
GArray *xids;
Display *display;
@ -439,7 +439,7 @@ moo_get_top_window (GSList *windows)
gboolean
moo_window_is_hidden (GtkWindow *window)
_moo_window_is_hidden (GtkWindow *window)
{
g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
return is_minimized (GDK_WINDOW_XDISPLAY (GTK_WIDGET(window)->window),
@ -458,7 +458,7 @@ moo_window_is_hidden (GtkWindow *window)
gdk_win32_drawable_get_handle (GTK_WIDGET(w)->window)
gboolean
moo_window_is_hidden (GtkWindow *window)
_moo_window_is_hidden (GtkWindow *window)
{
HANDLE h;
WINDOWPLACEMENT info;
@ -488,7 +488,7 @@ moo_window_is_hidden (GtkWindow *window)
GtkWindow*
moo_get_top_window (GSList *windows)
_moo_get_top_window (GSList *windows)
{
GSList *l;
HWND top = NULL;
@ -500,7 +500,7 @@ moo_get_top_window (GSList *windows)
{
g_return_val_if_fail (GTK_IS_WINDOW (l->data), NULL);
if (!moo_window_is_hidden (GTK_WINDOW (l->data)))
if (!_moo_window_is_hidden (GTK_WINDOW (l->data)))
break;
}
@ -535,7 +535,7 @@ moo_get_top_window (GSList *windows)
#else /* neither X nor WIN32 ?? */
GtkWindow*
moo_get_top_window (GSList *windows)
_moo_get_top_window (GSList *windows)
{
g_return_val_if_fail (windows != NULL, NULL);
g_critical ("%s: don't know how to do it", G_STRLOC);
@ -546,8 +546,8 @@ moo_get_top_window (GSList *windows)
void
moo_window_present (GtkWindow *window,
G_GNUC_UNUSED guint32 stamp)
_moo_window_present (GtkWindow *window,
G_GNUC_UNUSED guint32 stamp)
{
g_return_if_fail (GTK_IS_WINDOW (window));
@ -569,8 +569,8 @@ moo_window_present (GtkWindow *window,
/* XXX check what gtk_window_set_icon_name() does */
gboolean
moo_window_set_icon_from_stock (GtkWindow *window,
const char *stock_id)
_moo_window_set_icon_from_stock (GtkWindow *window,
const char *stock_id)
{
GdkPixbuf *icon;
@ -594,7 +594,7 @@ moo_window_set_icon_from_stock (GtkWindow *window,
GtkWindow*
moo_get_toplevel_window (void)
_moo_get_toplevel_window (void)
{
GList *list, *l;
GSList *windows = NULL;
@ -606,7 +606,7 @@ moo_get_toplevel_window (void)
if (GTK_IS_WINDOW (l->data) && GTK_WIDGET(l->data)->window)
windows = g_slist_prepend (windows, l->data);
top = moo_get_top_window (windows);
top = _moo_get_top_window (windows);
g_list_free (list);
g_slist_free (windows);
@ -1034,9 +1034,9 @@ moo_segfault (void)
*/
void
moo_selection_data_set_pointer (GtkSelectionData *data,
GdkAtom type,
gpointer ptr)
_moo_selection_data_set_pointer (GtkSelectionData *data,
GdkAtom type,
gpointer ptr)
{
g_return_if_fail (data != NULL);
gtk_selection_data_set (data, type, 8, /* 8 bits per byte */
@ -1045,8 +1045,8 @@ moo_selection_data_set_pointer (GtkSelectionData *data,
gpointer
moo_selection_data_get_pointer (GtkSelectionData *data,
GdkAtom type)
_moo_selection_data_get_pointer (GtkSelectionData *data,
GdkAtom type)
{
GdkWindow *owner;
gpointer result = NULL;
@ -1072,7 +1072,7 @@ moo_selection_data_get_pointer (GtkSelectionData *data,
*/
GdkModifierType
moo_get_modifiers (GtkWidget *widget)
_moo_get_modifiers (GtkWidget *widget)
{
GdkModifierType mask;
GdkDisplay *display;
@ -1094,8 +1094,8 @@ moo_get_modifiers (GtkWidget *widget)
*/
void
moo_menu_item_set_accel_label (GtkWidget *menu_item,
const char *label)
_moo_menu_item_set_accel_label (GtkWidget *menu_item,
const char *label)
{
GtkWidget *accel_label;
@ -1115,9 +1115,9 @@ moo_menu_item_set_accel_label (GtkWidget *menu_item,
void
moo_menu_item_set_label (GtkWidget *item,
const char *text,
gboolean mnemonic)
_moo_menu_item_set_label (GtkWidget *item,
const char *text,
gboolean mnemonic)
{
GtkWidget *label;
@ -1485,7 +1485,7 @@ moo_data_dir_type_get_type (void)
gboolean
moo_debug_enabled (void)
_moo_debug_enabled (void)
{
static gboolean enabled;
static gboolean been_here;
@ -1501,8 +1501,8 @@ moo_debug_enabled (void)
void
moo_widget_set_tooltip (GtkWidget *widget,
const char *tip)
_moo_widget_set_tooltip (GtkWidget *widget,
const char *tip)
{
static GtkTooltips *tooltips;
@ -1519,7 +1519,7 @@ moo_widget_set_tooltip (GtkWidget *widget,
char **
moo_splitlines (const char *string)
_moo_splitlines (const char *string)
{
GPtrArray *array;
const char *line, *p;

26
moo/mooutils/mooutils-misc.h
View File

@ -25,13 +25,13 @@ gboolean moo_open_email (const char *address,
const char *body);
gboolean moo_window_is_hidden (GtkWindow *window);
void moo_window_present (GtkWindow *window,
gboolean _moo_window_is_hidden (GtkWindow *window);
void _moo_window_present (GtkWindow *window,
guint32 stamp);
GtkWindow *moo_get_top_window (GSList *windows);
GtkWindow *moo_get_toplevel_window (void);
GtkWindow *_moo_get_top_window (GSList *windows);
GtkWindow *_moo_get_toplevel_window (void);
gboolean moo_window_set_icon_from_stock (GtkWindow *window,
gboolean _moo_window_set_icon_from_stock (GtkWindow *window,
const char *stock_id);
void moo_log_window_show (void);
@ -48,7 +48,7 @@ void moo_reset_log_func (void);
void moo_segfault (void);
gboolean moo_debug_enabled (void) G_GNUC_CONST;
gboolean _moo_debug_enabled (void) G_GNUC_CONST;
void _moo_disable_win32_error_message(void);
void _moo_enable_win32_error_message (void);
@ -86,24 +86,24 @@ char **moo_get_data_subdirs (const char *subdir,
#define moo_get_data_files moo_get_data_subdirs
void moo_selection_data_set_pointer (GtkSelectionData *data,
void _moo_selection_data_set_pointer (GtkSelectionData *data,
GdkAtom type,
gpointer ptr);
gpointer moo_selection_data_get_pointer (GtkSelectionData *data,
gpointer _moo_selection_data_get_pointer (GtkSelectionData *data,
GdkAtom type);
GdkModifierType moo_get_modifiers (GtkWidget *widget);
GdkModifierType _moo_get_modifiers (GtkWidget *widget);
void moo_menu_item_set_accel_label (GtkWidget *menu_item,
void _moo_menu_item_set_accel_label (GtkWidget *menu_item,
const char *label);
void moo_menu_item_set_label (GtkWidget *menu_item,
void _moo_menu_item_set_label (GtkWidget *menu_item,
const char *label,
gboolean mnemonic);
void moo_widget_set_tooltip (GtkWidget *widget,
void _moo_widget_set_tooltip (GtkWidget *widget,
const char *tip);
char **moo_splitlines (const char *string);
char **_moo_splitlines (const char *string);
G_END_DECLS