Define gdk_use_mb outside USE_XIM guard. Removed unnecessary USE_XIM guard

1998-12-17  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* gdk/gdkim.c: Define gdk_use_mb outside USE_XIM guard. Removed
	unnecessary USE_XIM guard inside another. Made gdk_use_mb
	static. Compile gdk_set_locale also if not USE_XIM.
This commit is contained in:
Sebastian Wilhelmi 1998-12-17 09:15:45 +00:00 committed by Sebastian Wilhelmi
parent 2fa220504c
commit 06449bebe1
9 changed files with 58 additions and 16 deletions

View File

@ -1,3 +1,9 @@
1998-12-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gdk/gdkim.c: Define gdk_use_mb outside USE_XIM guard. Removed
unnecessary USE_XIM guard inside another. Made gdk_use_mb
static. Compile gdk_set_locale also if not USE_XIM.
Thu Dec 17 00:26:01 1998 Shawn T. Amundson <amundson@gtk.org>
* Released GTK+ 1.1.9

View File

@ -1,3 +1,9 @@
1998-12-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gdk/gdkim.c: Define gdk_use_mb outside USE_XIM guard. Removed
unnecessary USE_XIM guard inside another. Made gdk_use_mb
static. Compile gdk_set_locale also if not USE_XIM.
Thu Dec 17 00:26:01 1998 Shawn T. Amundson <amundson@gtk.org>
* Released GTK+ 1.1.9

View File

@ -1,3 +1,9 @@
1998-12-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gdk/gdkim.c: Define gdk_use_mb outside USE_XIM guard. Removed
unnecessary USE_XIM guard inside another. Made gdk_use_mb
static. Compile gdk_set_locale also if not USE_XIM.
Thu Dec 17 00:26:01 1998 Shawn T. Amundson <amundson@gtk.org>
* Released GTK+ 1.1.9

View File

@ -1,3 +1,9 @@
1998-12-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gdk/gdkim.c: Define gdk_use_mb outside USE_XIM guard. Removed
unnecessary USE_XIM guard inside another. Made gdk_use_mb
static. Compile gdk_set_locale also if not USE_XIM.
Thu Dec 17 00:26:01 1998 Shawn T. Amundson <amundson@gtk.org>
* Released GTK+ 1.1.9

View File

@ -1,3 +1,9 @@
1998-12-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gdk/gdkim.c: Define gdk_use_mb outside USE_XIM guard. Removed
unnecessary USE_XIM guard inside another. Made gdk_use_mb
static. Compile gdk_set_locale also if not USE_XIM.
Thu Dec 17 00:26:01 1998 Shawn T. Amundson <amundson@gtk.org>
* Released GTK+ 1.1.9

View File

@ -1,3 +1,9 @@
1998-12-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gdk/gdkim.c: Define gdk_use_mb outside USE_XIM guard. Removed
unnecessary USE_XIM guard inside another. Made gdk_use_mb
static. Compile gdk_set_locale also if not USE_XIM.
Thu Dec 17 00:26:01 1998 Shawn T. Amundson <amundson@gtk.org>
* Released GTK+ 1.1.9

View File

@ -1,3 +1,9 @@
1998-12-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gdk/gdkim.c: Define gdk_use_mb outside USE_XIM guard. Removed
unnecessary USE_XIM guard inside another. Made gdk_use_mb
static. Compile gdk_set_locale also if not USE_XIM.
Thu Dec 17 00:26:01 1998 Shawn T. Amundson <amundson@gtk.org>
* Released GTK+ 1.1.9

View File

@ -23,6 +23,12 @@
#include "gdki18n.h"
#include "gdkx.h"
/* If this variable is FALSE, it indicates that we should
* avoid trying to use multibyte conversion functions and
* assume everything is 1-byte per character
*/
static gboolean gdk_use_mb;
#ifdef USE_XIM
#include <stdarg.h>
@ -40,14 +46,6 @@ typedef struct {
gpointer value;
} GdkImArg;
/* If this variable is FALSE, it indicates that we should
* avoid trying to use multibyte conversion functions and
* assume everything is 1-byte per character
*/
gboolean gdk_use_mb;
#ifdef USE_XIM
static void gdk_im_instantiate_cb (Display *display,
XPointer client_data,
XPointer call_data);
@ -131,6 +129,8 @@ gdk_set_locale (void)
return setlocale (LC_ALL,NULL);
}
#ifdef USE_XIM
/*
*--------------------------------------------------------------
* gdk_im_begin

View File

@ -23,6 +23,12 @@
#include "gdki18n.h"
#include "gdkx.h"
/* If this variable is FALSE, it indicates that we should
* avoid trying to use multibyte conversion functions and
* assume everything is 1-byte per character
*/
static gboolean gdk_use_mb;
#ifdef USE_XIM
#include <stdarg.h>
@ -40,14 +46,6 @@ typedef struct {
gpointer value;
} GdkImArg;
/* If this variable is FALSE, it indicates that we should
* avoid trying to use multibyte conversion functions and
* assume everything is 1-byte per character
*/
gboolean gdk_use_mb;
#ifdef USE_XIM
static void gdk_im_instantiate_cb (Display *display,
XPointer client_data,
XPointer call_data);
@ -131,6 +129,8 @@ gdk_set_locale (void)
return setlocale (LC_ALL,NULL);
}
#ifdef USE_XIM
/*
*--------------------------------------------------------------
* gdk_im_begin