Fixed win32 build and distcheck

master
Yevgen Muntyan 2007-09-02 15:43:21 -05:00
parent a555299a89
commit 4aa71dc607
7 changed files with 20 additions and 10 deletions

View File

@ -52,6 +52,7 @@ mooutils_include_headers = \
moouixml.h \
mooundo.h \
mooutils-fs.h \
mooutils-debug.h \
mooutils-gobject.h \
mooutils-misc.h \
moowindow.h

View File

@ -115,12 +115,14 @@ static void moo_prefs_dialog_init (MooPrefsDialog *dialog)
gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
GTK_STOCK_HELP, GTK_RESPONSE_HELP,
GTK_STOCK_APPLY, GTK_RESPONSE_APPLY,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
#if GTK_MINOR_VERSION >= 6
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
GTK_RESPONSE_HELP,
GTK_RESPONSE_OK,
GTK_RESPONSE_CANCEL,
GTK_RESPONSE_APPLY,
@ -354,11 +356,15 @@ moo_prefs_dialog_run (MooPrefsDialog *dialog,
static void
moo_prefs_dialog_response (GtkDialog *dialog,
int response)
moo_prefs_dialog_response (GtkDialog *dialog,
int response)
{
switch (response)
{
case GTK_RESPONSE_HELP:
g_print ("Help!\n");
break;
case GTK_RESPONSE_APPLY:
g_signal_emit_by_name (dialog, "apply");
break;

View File

@ -1097,7 +1097,7 @@ _moo_get_pid_string (void)
#ifdef __WIN32__
moo_pid_string = g_strdup_printf ("%ld", GetCurrentProcessId ());
#else
moo_pid_string = g_strdup_printf ("%d", getpid ());
moo_pid_string = g_strdup_printf ("%ld", (long) getpid ());
#endif
}
@ -1823,25 +1823,23 @@ _moo_strv_reverse (char **str_array)
}
#if defined(__WIN32__)
#if defined(__WIN32__) && !defined(MOO_DEBUG_ENABLED)
static guint saved_win32_error_mode;
#endif
void
moo_disable_win32_error_message (void)
{
#if defined(__WIN32__)
if (!_moo_debug_enabled ())
saved_win32_error_mode = SetErrorMode (SEM_NOOPENFILEERRORBOX | SEM_FAILCRITICALERRORS);
#if defined(__WIN32__) && !defined(MOO_DEBUG_ENABLED)
saved_win32_error_mode = SetErrorMode (SEM_NOOPENFILEERRORBOX | SEM_FAILCRITICALERRORS);
#endif
}
void
moo_enable_win32_error_message (void)
{
#if defined(__WIN32__)
if (!_moo_debug_enabled ())
SetErrorMode (saved_win32_error_mode);
#if defined(__WIN32__) && !defined(MOO_DEBUG_ENABLED)
SetErrorMode (saved_win32_error_mode);
#endif
}

View File

@ -14,6 +14,7 @@
#include "config.h"
#include "mooutils/mooutils-thread.h"
#include "mooutils/mooutils-misc.h"
#include "mooutils/mooutils-debug.h"
#include <stdio.h>
#include <errno.h>

View File

@ -3,6 +3,7 @@ moo/mooedit/gtksourceview/upstream/gtksourcelanguage-parser-2.c
moo/mooedit/gtksourceview/upstream/gtksourcelanguagemanager.c
moo/mooedit/gtksourceview/upstream/gtksourcestylemanager.c
moo/mooedit/gtksourceview/upstream/gtksourcestylescheme.c
moo/mooedit/gtksourceview/upstream/gtksourcelanguage.c
moo/mooedit/language-specs/ada.lang
moo/mooedit/language-specs/awk.lang

View File

@ -98,6 +98,7 @@ moo/mooedit/gtksourceview/gtksourcestyle-mangled.c
moo/mooedit/gtksourceview/gtksourcestylemanager-mangled.c
moo/mooedit/gtksourceview/gtksourcestylescheme-mangled.c
moo/mooedit/gtksourceview/gtksourcestylescheme-noxml-mangled.c
moo/mooedit/gtksourceview/gtksourcelanguage-mangled.c
moo/mooedit/glade/mooeditprefs-file.glade
moo/mooedit/glade/mooeditprefs-general.glade
moo/mooedit/glade/mooeditprefs-langs.glade

View File

@ -116,6 +116,7 @@ moo/mooedit/gtksourceview/upstream/gtksourcelanguagemanager.c
moo/mooedit/gtksourceview/upstream/gtksourcestylemanager.c
moo/mooedit/gtksourceview/upstream/gtksourcestylescheme.c
moo/mooedit/gtksourceview/upstream/gtksourcestyle.c
moo/mooedit/gtksourceview/upstream/gtksourcelanguage.c
moo/mooedit/gtksourceview/upstream/gtksourcestylescheme-noxml.c
moo/mooedit/gtksourceview/gtksourcecontextengine-mangled.c
moo/mooedit/gtksourceview/gtksourcelanguage-parser-2-mangled.c
@ -124,3 +125,4 @@ moo/mooedit/gtksourceview/gtksourcestyle-mangled.c
moo/mooedit/gtksourceview/gtksourcestylemanager-mangled.c
moo/mooedit/gtksourceview/gtksourcestylescheme-mangled.c
moo/mooedit/gtksourceview/gtksourcestylescheme-noxml-mangled.c
moo/mooedit/gtksourceview/gtksourcelanguage-mangled.c