mirror of https://github.com/GNOME/gimp.git
Build with GSEAL_ENABLE and #undef it where accessors are missing
This commit is contained in:
parent
fcd346a227
commit
8cee9c66a7
|
@ -734,20 +734,23 @@ gimp_brush_select_preview_update (GtkWidget *preview,
|
||||||
const guchar *mask_data)
|
const guchar *mask_data)
|
||||||
{
|
{
|
||||||
GimpPreviewArea *area = GIMP_PREVIEW_AREA (preview);
|
GimpPreviewArea *area = GIMP_PREVIEW_AREA (preview);
|
||||||
|
GtkAllocation allocation;
|
||||||
gint x, y;
|
gint x, y;
|
||||||
gint width, height;
|
gint width, height;
|
||||||
|
|
||||||
width = MIN (brush_width, preview->allocation.width);
|
gtk_widget_get_allocation (preview, &allocation);
|
||||||
height = MIN (brush_height, preview->allocation.height);
|
|
||||||
|
|
||||||
x = ((preview->allocation.width - width) / 2);
|
width = MIN (brush_width, allocation.width);
|
||||||
y = ((preview->allocation.height - height) / 2);
|
height = MIN (brush_height, allocation.height);
|
||||||
|
|
||||||
|
x = ((allocation.width - width) / 2);
|
||||||
|
y = ((allocation.height - height) / 2);
|
||||||
|
|
||||||
if (x || y)
|
if (x || y)
|
||||||
gimp_preview_area_fill (area,
|
gimp_preview_area_fill (area,
|
||||||
0, 0,
|
0, 0,
|
||||||
preview->allocation.width,
|
allocation.width,
|
||||||
preview->allocation.height,
|
allocation.height,
|
||||||
0xFF, 0xFF, 0xFF);
|
0xFF, 0xFF, 0xFF);
|
||||||
|
|
||||||
gimp_brush_select_preview_draw (area,
|
gimp_brush_select_preview_draw (area,
|
||||||
|
|
|
@ -531,7 +531,7 @@ gimp_gradient_select_preview_expose (GtkWidget *widget,
|
||||||
guchar *buf = ((y / GIMP_CHECK_SIZE_SM) & 1) ? odd : even;
|
guchar *buf = ((y / GIMP_CHECK_SIZE_SM) & 1) ? odd : even;
|
||||||
|
|
||||||
gdk_draw_rgb_image_dithalign (gtk_widget_get_window (widget),
|
gdk_draw_rgb_image_dithalign (gtk_widget_get_window (widget),
|
||||||
style->fg_gc[widget->state],
|
style->fg_gc[gtk_widget_get_state (widget)],
|
||||||
event->area.x, y,
|
event->area.x, y,
|
||||||
event->area.width, 1,
|
event->area.width, 1,
|
||||||
GDK_RGB_DITHER_MAX,
|
GDK_RGB_DITHER_MAX,
|
||||||
|
|
|
@ -21,6 +21,8 @@
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
|
#undef GSEAL_ENABLE
|
||||||
|
|
||||||
#include <gtk/gtk.h>
|
#include <gtk/gtk.h>
|
||||||
|
|
||||||
#ifdef GDK_WINDOWING_WIN32
|
#ifdef GDK_WINDOWING_WIN32
|
||||||
|
@ -107,7 +109,7 @@ gimp_progress_bar_start (const gchar *message,
|
||||||
gtk_progress_bar_set_text (GTK_PROGRESS_BAR (bar), message ? message : " ");
|
gtk_progress_bar_set_text (GTK_PROGRESS_BAR (bar), message ? message : " ");
|
||||||
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (bar), 0.0);
|
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (bar), 0.0);
|
||||||
|
|
||||||
if (GTK_WIDGET_DRAWABLE (bar))
|
if (gtk_widget_is_drawable (GTK_WIDGET (bar)))
|
||||||
while (gtk_events_pending ())
|
while (gtk_events_pending ())
|
||||||
gtk_main_iteration ();
|
gtk_main_iteration ();
|
||||||
}
|
}
|
||||||
|
@ -120,7 +122,7 @@ gimp_progress_bar_end (gpointer user_data)
|
||||||
gtk_progress_bar_set_text (GTK_PROGRESS_BAR (bar), " ");
|
gtk_progress_bar_set_text (GTK_PROGRESS_BAR (bar), " ");
|
||||||
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (bar), 0.0);
|
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (bar), 0.0);
|
||||||
|
|
||||||
if (GTK_WIDGET_DRAWABLE (bar))
|
if (gtk_widget_is_drawable (GTK_WIDGET (bar)))
|
||||||
while (gtk_events_pending ())
|
while (gtk_events_pending ())
|
||||||
gtk_main_iteration ();
|
gtk_main_iteration ();
|
||||||
}
|
}
|
||||||
|
@ -133,7 +135,7 @@ gimp_progress_bar_set_text (const gchar *message,
|
||||||
|
|
||||||
gtk_progress_bar_set_text (GTK_PROGRESS_BAR (bar), message ? message : " ");
|
gtk_progress_bar_set_text (GTK_PROGRESS_BAR (bar), message ? message : " ");
|
||||||
|
|
||||||
if (GTK_WIDGET_DRAWABLE (bar))
|
if (gtk_widget_is_drawable (GTK_WIDGET (bar)))
|
||||||
while (gtk_events_pending ())
|
while (gtk_events_pending ())
|
||||||
gtk_main_iteration ();
|
gtk_main_iteration ();
|
||||||
}
|
}
|
||||||
|
@ -149,7 +151,7 @@ gimp_progress_bar_set_value (gdouble percentage,
|
||||||
else
|
else
|
||||||
gtk_progress_bar_pulse (GTK_PROGRESS_BAR (bar));
|
gtk_progress_bar_pulse (GTK_PROGRESS_BAR (bar));
|
||||||
|
|
||||||
if (GTK_WIDGET_DRAWABLE (bar))
|
if (gtk_widget_is_drawable (GTK_WIDGET (bar)))
|
||||||
while (gtk_events_pending ())
|
while (gtk_events_pending ())
|
||||||
gtk_main_iteration ();
|
gtk_main_iteration ();
|
||||||
}
|
}
|
||||||
|
@ -161,7 +163,7 @@ gimp_progress_bar_pulse (gpointer user_data)
|
||||||
|
|
||||||
gtk_progress_bar_pulse (GTK_PROGRESS_BAR (bar));
|
gtk_progress_bar_pulse (GTK_PROGRESS_BAR (bar));
|
||||||
|
|
||||||
if (GTK_WIDGET_DRAWABLE (bar))
|
if (gtk_widget_is_drawable (GTK_WIDGET (bar)))
|
||||||
while (gtk_events_pending ())
|
while (gtk_events_pending ())
|
||||||
gtk_main_iteration ();
|
gtk_main_iteration ();
|
||||||
}
|
}
|
||||||
|
@ -178,12 +180,12 @@ gimp_window_get_native (GtkWindow *window)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef GDK_WINDOWING_WIN32
|
#ifdef GDK_WINDOWING_WIN32
|
||||||
if (window && GTK_WIDGET_REALIZED (window))
|
if (window && GTK_WIDGET_REALIZED (GTK_WIDGET (window)))
|
||||||
return GDK_WINDOW_HWND (gtk_widget_get_window (GTK_WIDGET (window)));
|
return GDK_WINDOW_HWND (gtk_widget_get_window (GTK_WIDGET (window)));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef GDK_WINDOWING_X11
|
#ifdef GDK_WINDOWING_X11
|
||||||
if (window && GTK_WIDGET_REALIZED (window))
|
if (window && GTK_WIDGET_REALIZED (GTK_WIDGET (window)))
|
||||||
return GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (window)));
|
return GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (window)));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -18,6 +18,8 @@
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
|
#undef GSEAL_ENABLE
|
||||||
|
|
||||||
#include <gtk/gtk.h>
|
#include <gtk/gtk.h>
|
||||||
|
|
||||||
#include "libgimpmodule/gimpmodule.h"
|
#include "libgimpmodule/gimpmodule.h"
|
||||||
|
@ -290,7 +292,7 @@ gimp_window_set_transient_for (GtkWindow *window,
|
||||||
if (! parent)
|
if (! parent)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (GTK_WIDGET_REALIZED (window))
|
if (GTK_WIDGET_REALIZED (GTK_WIDGET (window)))
|
||||||
gdk_window_set_transient_for (gtk_widget_get_window (GTK_WIDGET (window)),
|
gdk_window_set_transient_for (gtk_widget_get_window (GTK_WIDGET (window)),
|
||||||
parent);
|
parent);
|
||||||
|
|
||||||
|
|
|
@ -21,6 +21,8 @@
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
|
#undef GSEAL_ENABLE
|
||||||
|
|
||||||
#include <gtk/gtk.h>
|
#include <gtk/gtk.h>
|
||||||
|
|
||||||
#include "libgimpwidgets/gimpwidgets.h"
|
#include "libgimpwidgets/gimpwidgets.h"
|
||||||
|
|
Loading…
Reference in New Issue