dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app: remove gimpdisplay-utils.[ch], move its only function to gimpdisplay.[ch]

This commit is contained in:
Michael Natterer 2012-02-11 17:57:27 +01:00
parent 4ec7def1d0
commit f70bc837fa
7 changed files with 50 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/actions/windows-actions.c
View File

@ -42,7 +42,6 @@
#include "widgets/gimphelp-ids.h" #include "widgets/gimphelp-ids.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
#include "display/gimpdisplay-utils.h"
#include "dialogs/dialogs.h" #include "dialogs/dialogs.h"

2
app/display/Makefile.am
View File

@ -75,8 +75,6 @@ libappdisplay_a_sources = \
gimpdisplay-foreach.h \ gimpdisplay-foreach.h \
gimpdisplay-handlers.c \ gimpdisplay-handlers.c \
gimpdisplay-handlers.h \ gimpdisplay-handlers.h \
gimpdisplay-utils.c \
gimpdisplay-utils.h \
gimpdisplayshell.c \ gimpdisplayshell.c \
gimpdisplayshell.h \ gimpdisplayshell.h \
gimpdisplayshell-appearance.c \ gimpdisplayshell-appearance.c \

48
app/display/gimpdisplay-utils.c
View File

@ -1,48 +0,0 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* gimpdisplay-utils.c
* Copyright (C) 2011 Martin Nordholts <martinn@src.gnome.org>
*
* 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* Utility functions for the display module (not only the GimpDisplay
* class).
*/
#include "config.h"
#include <gtk/gtk.h>
#include "display-types.h"
#include "gimpdisplay-utils.h"
#include "gimpdisplay.h"
/**
* gimp_display_get_action_name:
* @display:
*
* Returns: The action name for the given display. The action name
* depends on the display ID. The result must be freed with g_free().
**/
gchar *
gimp_display_get_action_name (GimpDisplay *display)
{
return g_strdup_printf ("windows-display-%04d",
gimp_display_get_ID (display));
}

28
app/display/gimpdisplay-utils.h
View File

@ -1,28 +0,0 @@
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* gimpdisplay-utils.h
* Copyright (C) 2011 Martin Nordholts <martinn@src.gnome.org>
*
* 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __GIMP_DISPLAY_UTILS_H__
#define __GIMP_DISPLAY_UTILS_H__
gchar * gimp_display_get_action_name (GimpDisplay *display);
#endif /* __GIMP_ACTIONS_UTILS_H__ */

16
app/display/gimpdisplay.c
View File

@ -586,6 +586,22 @@ gimp_display_get_by_ID (Gimp *gimp,
return NULL; return NULL;
} }
/**
* gimp_display_get_action_name:
* @display:
*
* Returns: The action name for the given display. The action name
* depends on the display ID. The result must be freed with g_free().
**/
gchar *
gimp_display_get_action_name (GimpDisplay *display)
{
g_return_val_if_fail (GIMP_IS_DISPLAY (display), NULL);
return g_strdup_printf ("windows-display-%04d",
gimp_display_get_ID (display));
}
Gimp * Gimp *
gimp_display_get_gimp (GimpDisplay *display) gimp_display_get_gimp (GimpDisplay *display)
{ {

66
app/display/gimpdisplay.h
View File

@ -47,47 +47,49 @@ struct _GimpDisplayClass
}; };
GType gimp_display_get_type (void) G_GNUC_CONST; GType gimp_display_get_type (void) G_GNUC_CONST;
GimpDisplay * gimp_display_new (Gimp *gimp, GimpDisplay * gimp_display_new (Gimp *gimp,
GimpImage *image, GimpImage *image,
GimpUnit unit, GimpUnit unit,
gdouble scale, gdouble scale,
GimpMenuFactory *menu_factory, GimpMenuFactory *menu_factory,
GimpUIManager *popup_manager, GimpUIManager *popup_manager,
GimpDialogFactory *dialog_factory); GimpDialogFactory *dialog_factory);
void gimp_display_delete (GimpDisplay *display); void gimp_display_delete (GimpDisplay *display);
void gimp_display_close (GimpDisplay *display); void gimp_display_close (GimpDisplay *display);
gint gimp_display_get_ID (GimpDisplay *display); gint gimp_display_get_ID (GimpDisplay *display);
GimpDisplay * gimp_display_get_by_ID (Gimp *gimp, GimpDisplay * gimp_display_get_by_ID (Gimp *gimp,
gint ID); gint ID);
Gimp * gimp_display_get_gimp (GimpDisplay *display); gchar * gimp_display_get_action_name (GimpDisplay *display);
GimpImage * gimp_display_get_image (GimpDisplay *display); Gimp * gimp_display_get_gimp (GimpDisplay *display);
void gimp_display_set_image (GimpDisplay *display,
GimpImage *image);
gint gimp_display_get_instance (GimpDisplay *display); GimpImage * gimp_display_get_image (GimpDisplay *display);
void gimp_display_set_image (GimpDisplay *display,
GimpImage *image);
GimpDisplayShell * gimp_display_get_shell (GimpDisplay *display); gint gimp_display_get_instance (GimpDisplay *display);
void gimp_display_empty (GimpDisplay *display); GimpDisplayShell * gimp_display_get_shell (GimpDisplay *display);
void gimp_display_fill (GimpDisplay *display,
GimpImage *image,
GimpUnit unit,
gdouble scale);
void gimp_display_update_area (GimpDisplay *display, void gimp_display_empty (GimpDisplay *display);
gboolean now, void gimp_display_fill (GimpDisplay *display,
gint x, GimpImage *image,
gint y, GimpUnit unit,
gint w, gdouble scale);
gint h);
void gimp_display_flush (GimpDisplay *display); void gimp_display_update_area (GimpDisplay *display,
void gimp_display_flush_now (GimpDisplay *display); gboolean now,
gint x,
gint y,
gint w,
gint h);
void gimp_display_flush (GimpDisplay *display);
void gimp_display_flush_now (GimpDisplay *display);
#endif /* __GIMP_DISPLAY_H__ */ #endif /* __GIMP_DISPLAY_H__ */

1
app/menus/windows-menu.c
View File

@ -40,7 +40,6 @@
#include "widgets/gimpuimanager.h" #include "widgets/gimpuimanager.h"
#include "display/gimpdisplay.h" #include "display/gimpdisplay.h"
#include "display/gimpdisplay-utils.h"
#include "dialogs/dialogs.h" #include "dialogs/dialogs.h"