diff options
| author | Sebastian Wilhelmi <wilhelmi@ira.uka.de> | 1998-12-17 09:15:45 +0000 |
|---|---|---|
| committer | Sebastian Wilhelmi <wilhelmi@src.gnome.org> | 1998-12-17 09:15:45 +0000 |
| commit | 06449bebe1be192f5d6e56e3b6cfb7ba0f2a0175 (patch) | |
| tree | e82f521e6db8bb92f9b9fe972804fd4562fe09c9 /gdk | |
| parent | 2fa220504ca78735826beb3cbe7d29e1ec55f565 (diff) | |
| download | gtk+-06449bebe1be192f5d6e56e3b6cfb7ba0f2a0175.tar.gz | |
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.
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/gdkim.c | 16 | ||||
| -rw-r--r-- | gdk/x11/gdkim-x11.c | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/gdk/gdkim.c b/gdk/gdkim.c index 417430d0f0..c28ecea88c 100644 --- a/gdk/gdkim.c +++ b/gdk/gdkim.c @@ -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 diff --git a/gdk/x11/gdkim-x11.c b/gdk/x11/gdkim-x11.c index 417430d0f0..c28ecea88c 100644 --- a/gdk/x11/gdkim-x11.c +++ b/gdk/x11/gdkim-x11.c @@ -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 |