+Mon Oct 4 11:57:11 PDT 1999 Manish Singh <yosh@gimp.org>
+
+ * configure.in: correct checking for BeOS check
+
+ * gdk/gdktypes.h
+ * gtk/fnmatch.c
+ * gtk/gtkfilesel.c
+ * gtk/gtkitemfactory.c
+ * gtk/gtkmain.[ch]
+ * gtk/gtkrc.c: use G_OS_WIN32 and G_HAVE_CYGWIN #defines
+
Mon Oct 4 16:16:53 1999 Pablo Saratxaga <pablo@mandrakesoft.com>
* gtk/gtkrc.{bg,iso88591[345]}: add gtkrc files for some new charset
+Mon Oct 4 11:57:11 PDT 1999 Manish Singh <yosh@gimp.org>
+
+ * configure.in: correct checking for BeOS check
+
+ * gdk/gdktypes.h
+ * gtk/fnmatch.c
+ * gtk/gtkfilesel.c
+ * gtk/gtkitemfactory.c
+ * gtk/gtkmain.[ch]
+ * gtk/gtkrc.c: use G_OS_WIN32 and G_HAVE_CYGWIN #defines
+
Mon Oct 4 16:16:53 1999 Pablo Saratxaga <pablo@mandrakesoft.com>
* gtk/gtkrc.{bg,iso88591[345]}: add gtkrc files for some new charset
+Mon Oct 4 11:57:11 PDT 1999 Manish Singh <yosh@gimp.org>
+
+ * configure.in: correct checking for BeOS check
+
+ * gdk/gdktypes.h
+ * gtk/fnmatch.c
+ * gtk/gtkfilesel.c
+ * gtk/gtkitemfactory.c
+ * gtk/gtkmain.[ch]
+ * gtk/gtkrc.c: use G_OS_WIN32 and G_HAVE_CYGWIN #defines
+
Mon Oct 4 16:16:53 1999 Pablo Saratxaga <pablo@mandrakesoft.com>
* gtk/gtkrc.{bg,iso88591[345]}: add gtkrc files for some new charset
+Mon Oct 4 11:57:11 PDT 1999 Manish Singh <yosh@gimp.org>
+
+ * configure.in: correct checking for BeOS check
+
+ * gdk/gdktypes.h
+ * gtk/fnmatch.c
+ * gtk/gtkfilesel.c
+ * gtk/gtkitemfactory.c
+ * gtk/gtkmain.[ch]
+ * gtk/gtkrc.c: use G_OS_WIN32 and G_HAVE_CYGWIN #defines
+
Mon Oct 4 16:16:53 1999 Pablo Saratxaga <pablo@mandrakesoft.com>
* gtk/gtkrc.{bg,iso88591[345]}: add gtkrc files for some new charset
+Mon Oct 4 11:57:11 PDT 1999 Manish Singh <yosh@gimp.org>
+
+ * configure.in: correct checking for BeOS check
+
+ * gdk/gdktypes.h
+ * gtk/fnmatch.c
+ * gtk/gtkfilesel.c
+ * gtk/gtkitemfactory.c
+ * gtk/gtkmain.[ch]
+ * gtk/gtkrc.c: use G_OS_WIN32 and G_HAVE_CYGWIN #defines
+
Mon Oct 4 16:16:53 1999 Pablo Saratxaga <pablo@mandrakesoft.com>
* gtk/gtkrc.{bg,iso88591[345]}: add gtkrc files for some new charset
+Mon Oct 4 11:57:11 PDT 1999 Manish Singh <yosh@gimp.org>
+
+ * configure.in: correct checking for BeOS check
+
+ * gdk/gdktypes.h
+ * gtk/fnmatch.c
+ * gtk/gtkfilesel.c
+ * gtk/gtkitemfactory.c
+ * gtk/gtkmain.[ch]
+ * gtk/gtkrc.c: use G_OS_WIN32 and G_HAVE_CYGWIN #defines
+
Mon Oct 4 16:16:53 1999 Pablo Saratxaga <pablo@mandrakesoft.com>
* gtk/gtkrc.{bg,iso88591[345]}: add gtkrc files for some new charset
+Mon Oct 4 11:57:11 PDT 1999 Manish Singh <yosh@gimp.org>
+
+ * configure.in: correct checking for BeOS check
+
+ * gdk/gdktypes.h
+ * gtk/fnmatch.c
+ * gtk/gtkfilesel.c
+ * gtk/gtkitemfactory.c
+ * gtk/gtkmain.[ch]
+ * gtk/gtkrc.c: use G_OS_WIN32 and G_HAVE_CYGWIN #defines
+
Mon Oct 4 16:16:53 1999 Pablo Saratxaga <pablo@mandrakesoft.com>
* gtk/gtkrc.{bg,iso88591[345]}: add gtkrc files for some new charset
AC_MSG_CHECKING(for the BeOS)
case $host in
*-*-beos*)
+ AC_MSG_RESULT(yes)
GTK_LIBS_EXTRA="-L\$(top_builddir_full)/gdk/.libs -lgdk"
MATH_LIB=
;;
- default)
+ *)
+ AC_MSG_RESULT(no)
;;
esac
AC_SUBST(MATH_LIB)
*/
#include <glib.h>
-#ifdef NATIVE_WIN32
+#ifdef G_OS_WIN32
# ifdef GDK_COMPILATION
# define GDKVAR __declspec(dllexport)
# else
#endif
#include "fnmatch.h"
-/* We need glib.h for G_DIR_SEPARATOR, WIN32 and NATIVE_WIN32 */
+/* We need glib.h for G_DIR_SEPARATOR and G_OS_WIN32 */
#include <glib.h>
#include <ctype.h>
register char c;
/* Note that this evalutes C many times. */
-#ifndef WIN32
+#if !defined(G_OS_WIN32) && !defined(G_HAVE_CYGWIN)
#define FOLD(c) ((flags & FNM_CASEFOLD) && isupper (c) ? tolower (c) : (c))
#else
#define FOLD(c) (tolower (c))
(n == string || ((flags & FNM_FILE_NAME) && n[-1] == G_DIR_SEPARATOR)))
return FNM_NOMATCH;
break;
-#ifndef NATIVE_WIN32
+#ifndef G_OS_WIN32
case '\\':
if (!(flags & FNM_NOESCAPE))
{
return 0;
{
-#ifndef NATIVE_WIN32
+#ifndef G_OS_WIN32
char c1 = (!(flags & FNM_NOESCAPE) && c == '\\') ? *p : c;
#else
char c1 = c;
for (;;)
{
register char cstart = c, cend = c;
-#ifndef NATIVE_WIN32
+#ifndef G_OS_WIN32
if (!(flags & FNM_NOESCAPE) && c == '\\')
cstart = cend = *p++;
#endif
if (c == '-' && *p != ']')
{
cend = *p++;
-#ifndef NATIVE_WIN32
+#ifndef G_OS_WIN32
if (!(flags & FNM_NOESCAPE) && cend == '\\')
cend = *p++;
#endif
return FNM_NOMATCH;
c = *p++;
-#ifndef NATIVE_WIN32
+#ifndef G_OS_WIN32
if (!(flags & FNM_NOESCAPE) && c == '\\')
/* XXX 1003.2d11 is unclear if this is right. */
++p;
#include "gtkdialog.h"
#include "gtkintl.h"
-#ifdef WIN32
+#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#define STRICT
#include <windows.h>
-#ifdef NATIVE_WIN32
+#ifdef G_OS_WIN32
#include <direct.h>
#include <io.h>
#define mkdir(p,m) _mkdir(p)
#define S_ISDIR(mode) ((mode)&_S_IFDIR)
#endif
-#endif /* NATIVE_WIN32 */
+#endif /* G_OS_WIN32 */
-#endif /* WIN32 */
+#endif /* G_OS_WIN32 || G_HAVE_CYGWIN */
#define DIR_LIST_WIDTH 180
#define DIR_LIST_HEIGHT 180
static CompletionDir* open_ref_dir (gchar* text_to_complete,
gchar** remaining_text,
CompletionState* cmpl_state);
-#ifndef WIN32
+#if !defined(G_OS_WIN32) && !defined(G_HAVE_CYGWIN)
static gboolean check_dir (gchar *dir_name,
struct stat *result,
gboolean *stat_subdirs);
/* Saves errno when something cmpl does fails. */
static gint cmpl_errno;
-#ifdef __CYGWIN32__
+#ifdef G_HAVE_CYGWIN
/*
* Take the path currently in the file selection
* entry field and translate as necessary from
g_return_val_if_fail (filesel != NULL, nothing);
g_return_val_if_fail (GTK_IS_FILE_SELECTION (filesel), nothing);
-#ifdef __CYGWIN32__
+#ifdef G_HAVE_CYGWIN
translate_win32_path(filesel);
#endif
text = gtk_entry_get_text (GTK_ENTRY (filesel->selection_entry));
if (fs->fileop_dialog)
return;
-#ifdef __CYGWIN32__
+#ifdef G_HAVE_CYGWIN
translate_win32_path(fs);
#endif
if (event->keyval == GDK_Tab)
{
fs = GTK_FILE_SELECTION (user_data);
-#ifdef __CYGWIN32__
+#ifdef G_HAVE_CYGWIN
translate_win32_path(fs);
#endif
text = gtk_entry_get_text (GTK_ENTRY (fs->selection_entry));
/* another small hack to catch the full path */
if (i != dir_len)
current_dir[i + 1] = '\0';
-#ifdef __CYGWIN32__
+#ifdef G_HAVE_CYGWIN
if (!strcmp(current_dir, "//"))
continue;
#endif
gtk_clist_get_text (GTK_CLIST (fs->file_list), row, 0, &temp);
filename = g_strdup (temp);
-#ifdef __CYGWIN32__
+#ifdef G_HAVE_CYGWIN
/* Check to see if the selection was a drive selector */
if (isalpha(filename[0]) && (filename[1] == ':')) {
/* It is... map it to a CYGWIN32 drive */
g_free(filename);
filename = g_strdup(temp_filename);
}
-#endif /* CYGWIN32 */
+#endif /* G_HAVE_CYGWIN */
if (filename)
{
}
}
-#ifdef WIN32
+#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
static void
win32_gtk_add_drives_to_dir_list(GtkWidget *the_dir_list)
poss = cmpl_next_completion (cmpl_state);
}
-#ifdef WIN32
+#if defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
/* For Windows, add drives as potential selections */
win32_gtk_add_drives_to_dir_list (fs->dir_list);
#endif
first_slash = strchr(text_to_complete, G_DIR_SEPARATOR);
-#ifdef __CYGWIN32__
+#ifdef G_HAVE_CYGWIN
if (text_to_complete[0] == '/' && text_to_complete[1] == '/')
{
char root_dir[5];
return sent;
}
-#ifndef WIN32
+#if !defined(G_OS_WIN32) && !defined(G_HAVE_CYGWIN)
static gboolean
check_dir(gchar *dir_name, struct stat *result, gboolean *stat_subdirs)
CompletionDirSent *sent;
GList* cdsl;
-#ifndef WIN32
+#if !defined(G_OS_WIN32) && !defined(G_HAVE_CYGWIN)
if (!check_dir (dir_name, &sbuf, &stat_subdirs))
return NULL;
return FALSE;
}
-#ifndef NATIVE_WIN32 /* No inode numbers on Win32 */
+#ifndef G_OS_WIN32 /* No inode numbers on Win32 */
if (parbuf.st_ino == sbuf->st_ino && parbuf.st_dev == sbuf->st_dev)
/* it wasn't a link */
return TRUE;
return TRUE;
}
-#ifndef NATIVE_WIN32
+#ifndef G_OS_WIN32
static gchar*
find_parent_dir_fullname(gchar* dirname)
#endif
-#ifdef WIN32
+#ifdef defined(G_OS_WIN32) || defined(G_HAVE_CYGWIN)
#define FOLD(c) (tolower(c))
#else
#define FOLD(c) (c)
static gint
compare_cmpl_dir(const void* a, const void* b)
{
-#ifndef WIN32
+#if !defined(G_OS_WIN32) && !defined(G_HAVE_CYGWIN)
return strcmp((((CompletionDirEntry*)a))->entry_name,
(((CompletionDirEntry*)b))->entry_name);
#else
#endif
#include <stdio.h>
-#ifdef NATIVE_WIN32
+#ifdef G_OS_WIN32
#include <io.h> /* For _open and _close */
#ifndef S_ISREG
}
#ifdef ENABLE_NLS
-#ifndef NATIVE_WIN32
+#ifndef G_OS_WIN32
bindtextdomain("gtk+", GTK_LOCALEDIR);
#else
{
}
g_slist_free (gtk_modules);
-#ifndef NATIVE_WIN32
+#ifndef G_OS_WIN32
/* No use warning on Win32, there aren't any non-devel versions anyhow... */
g_warning ("" "YOU ARE USING THE DEVEL BRANCH 1.3.x OF GTK+ WHICH IS CURRENTLY\n"
" UNDER HEAVY DEVELOPMENT AND FREQUENTLY INTRODUCES INSTABILITIES.\n"
/* Gtk version.
*/
-#ifdef NATIVE_WIN32
+#ifdef G_OS_WIN32
#ifdef GTK_COMPILATION
#define GTKMAIN_C_VAR __declspec(dllexport)
#else
#define lstat stat
#endif
-#ifdef NATIVE_WIN32
+#ifdef G_OS_WIN32
#include <io.h>
#endif
/* RC file handling */
-#ifdef NATIVE_WIN32
+#ifdef G_OS_WIN32
gchar *
-get_gtk_sysconf_directory ()
+get_gtk_sysconf_directory (void)
{
static gchar gtk_sysconf_dir[200];
gchar win_dir[100];
}
static gchar *
-get_themes_directory ()
+get_themes_directory (void)
{
/* We really should fetch this from the Registry. The GIMP
* installation program stores the Themes installation
{
gchar *var, *path;
-#ifndef NATIVE_WIN32
+#ifndef G_OS_WIN32
var = getenv("GTK_DATA_PREFIX");
if (var)
path = g_strdup_printf("%s%s", var, "/share/themes");
{
gchar *var, *path;
-#ifndef NATIVE_WIN32
+#ifndef G_OS_WIN32
var = getenv("GTK_EXE_PREFIX");
if (var)
path = g_strdup_printf("%s%s", var, "/lib/gtk/themes/engines");
gchar *var, *path;
gint n;
-#ifndef NATIVE_WIN32
+#ifndef G_OS_WIN32
var = getenv("GTK_DATA_PREFIX");
if (var)
path = g_strdup_printf("%s%s", var, "/share/gtk/themes");
if (n >= GTK_RC_MAX_MODULE_PATHS - 1)
return;
-#ifndef NATIVE_WIN32
+#ifndef G_OS_WIN32
var = getenv("GTK_EXE_PREFIX");
if (var)
path = g_strdup_printf("%s%s", var, "/lib/gtk/themes/engines");
var = g_get_home_dir ();
if (var)
{
-#ifndef NATIVE_WIN32
+#ifndef G_OS_WIN32
path = g_strdup_printf ("%s%s", var, "/.gtk/lib/themes/engines");
#else
path = g_strdup_printf ("%s%s", var, "\\_gtk\\themes\\engines");
}
else
{
-#ifndef NATIVE_WIN32
+#ifndef G_OS_WIN32
str = g_strdup (GTK_SYSCONFDIR G_DIR_SEPARATOR_S "gtk" G_DIR_SEPARATOR_S "gtkrc");
#else
str = g_strdup_printf ("%s\\gtkrc", get_gtk_sysconf_directory ());