revert that last set_locale change, it was bogus

* app/main.c: revert that last set_locale change, it was bogus

* app/gdisplay.c: don't update menu sensitivities when flushing
immediately, so that painting isn't slowed by it

-Yosh
This commit is contained in:
Manish Singh 1999-09-27 22:12:44 +00:00
parent 002aa905db
commit dbc143a61e
5 changed files with 21 additions and 5 deletions

View File

@ -1,3 +1,10 @@
Mon Sep 27 15:07:03 PDT 1999 Manish Singh <yosh@gimp.org>
* app/main.c: revert that last set_locale change, it was bogus
* app/gdisplay.c: don't update menu sensitivities when flushing
immediately, so that painting isn't slowed by it
1999-09-27 Michael Natterer <mitch@gimp.org>
* app/Makefile.am

View File

@ -684,7 +684,7 @@ gdisplay_flush_whenever (GDisplay *gdisp, gboolean now)
qmask_buttons_update (gdisp);
/* ensure the consistency of the tear-off menus */
if (gimp_context_get_display (gimp_context_get_user ()) == gdisp)
if (!now && gimp_context_get_display (gimp_context_get_user ()) == gdisp)
gdisplay_set_menu_sensitivity (gdisp);
}
@ -1604,6 +1604,8 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
gint lind = -1;
gint lnum = -1;
g_print ("boo\n");
if (gdisp)
{
fs = (gimage_floating_sel (gdisp->gimage) != NULL);

View File

@ -684,7 +684,7 @@ gdisplay_flush_whenever (GDisplay *gdisp, gboolean now)
qmask_buttons_update (gdisp);
/* ensure the consistency of the tear-off menus */
if (gimp_context_get_display (gimp_context_get_user ()) == gdisp)
if (!now && gimp_context_get_display (gimp_context_get_user ()) == gdisp)
gdisplay_set_menu_sensitivity (gdisp);
}
@ -1604,6 +1604,8 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
gint lind = -1;
gint lnum = -1;
g_print ("boo\n");
if (gdisp)
{
fs = (gimage_floating_sel (gdisp->gimage) != NULL);

View File

@ -684,7 +684,7 @@ gdisplay_flush_whenever (GDisplay *gdisp, gboolean now)
qmask_buttons_update (gdisp);
/* ensure the consistency of the tear-off menus */
if (gimp_context_get_display (gimp_context_get_user ()) == gdisp)
if (!now && gimp_context_get_display (gimp_context_get_user ()) == gdisp)
gdisplay_set_menu_sensitivity (gdisp);
}
@ -1604,6 +1604,8 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
gint lind = -1;
gint lnum = -1;
g_print ("boo\n");
if (gdisp)
{
fs = (gimage_floating_sel (gdisp->gimage) != NULL);

View File

@ -118,10 +118,13 @@ main (int argc, char **argv)
/* Initialize variables */
prog_name = argv[0];
/* Initialize i18n support */
INIT_LOCALE("gimp");
gtk_init (&argc, &argv);
/* Initialize i18n support */
INIT_LOCALE("gimp");
setlocale(LC_NUMERIC, "C"); /* gtk seems to zap this during init.. */
#ifdef HAVE_PUTENV
display_name = gdk_get_display ();