Commit bc94033d authored by Hans Breuer's avatar Hans Breuer Committed by Hans Breuer

new file

2002-02-27  Hans Breuer  <hans@breuer.org>

	* demos/gtk-demo/makefile.msc.in : new file

	* gdk-pixbuf/gtk-pixbuf.rc.in : new file to include
	  version resource
	* gdk-pixbuf/makefile.msc : create and use gdk-pixbuf.res

	* gdk/win32/gdkkeys-win32.c : handle undefined LANG_URDU,
	(gdk_keyval_name) : fix endless looping

	* gtk/gtkfilesel.c : translate_win32_path() static
	* gtk/queryimmodules : print_escaped(), query_module() static

	* gtk/makefile.msc.in : added gtkkeyhash, build gtk-win32.res

	* gtk/stock-icons/makefile.msc : regenerated from directory
	listing (almost all filenames changed)
parent 20eda0e6
2002-02-27 Hans Breuer <hans@breuer.org>
* demos/gtk-demo/makefile.msc.in : new file
* gdk-pixbuf/gtk-pixbuf.rc.in : new file to include
version resource
* gdk-pixbuf/makefile.msc : create and use gdk-pixbuf.res
* gdk/win32/gdkkeys-win32.c : handle undefined LANG_URDU,
(gdk_keyval_name) : fix endless looping
* gtk/gtkfilesel.c : translate_win32_path() static
* gtk/queryimmodules : print_escaped(), query_module() static
* gtk/makefile.msc.in : added gtkkeyhash, build gtk-win32.res
* gtk/stock-icons/makefile.msc : regenerated from directory
listing (almost all filenames changed)
Wed Feb 27 10:34:46 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrange.c (gtk_range_set_range): After computing
......
2002-02-27 Hans Breuer <hans@breuer.org>
* demos/gtk-demo/makefile.msc.in : new file
* gdk-pixbuf/gtk-pixbuf.rc.in : new file to include
version resource
* gdk-pixbuf/makefile.msc : create and use gdk-pixbuf.res
* gdk/win32/gdkkeys-win32.c : handle undefined LANG_URDU,
(gdk_keyval_name) : fix endless looping
* gtk/gtkfilesel.c : translate_win32_path() static
* gtk/queryimmodules : print_escaped(), query_module() static
* gtk/makefile.msc.in : added gtkkeyhash, build gtk-win32.res
* gtk/stock-icons/makefile.msc : regenerated from directory
listing (almost all filenames changed)
Wed Feb 27 10:34:46 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrange.c (gtk_range_set_range): After computing
......
2002-02-27 Hans Breuer <hans@breuer.org>
* demos/gtk-demo/makefile.msc.in : new file
* gdk-pixbuf/gtk-pixbuf.rc.in : new file to include
version resource
* gdk-pixbuf/makefile.msc : create and use gdk-pixbuf.res
* gdk/win32/gdkkeys-win32.c : handle undefined LANG_URDU,
(gdk_keyval_name) : fix endless looping
* gtk/gtkfilesel.c : translate_win32_path() static
* gtk/queryimmodules : print_escaped(), query_module() static
* gtk/makefile.msc.in : added gtkkeyhash, build gtk-win32.res
* gtk/stock-icons/makefile.msc : regenerated from directory
listing (almost all filenames changed)
Wed Feb 27 10:34:46 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrange.c (gtk_range_set_range): After computing
......
2002-02-27 Hans Breuer <hans@breuer.org>
* demos/gtk-demo/makefile.msc.in : new file
* gdk-pixbuf/gtk-pixbuf.rc.in : new file to include
version resource
* gdk-pixbuf/makefile.msc : create and use gdk-pixbuf.res
* gdk/win32/gdkkeys-win32.c : handle undefined LANG_URDU,
(gdk_keyval_name) : fix endless looping
* gtk/gtkfilesel.c : translate_win32_path() static
* gtk/queryimmodules : print_escaped(), query_module() static
* gtk/makefile.msc.in : added gtkkeyhash, build gtk-win32.res
* gtk/stock-icons/makefile.msc : regenerated from directory
listing (almost all filenames changed)
Wed Feb 27 10:34:46 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrange.c (gtk_range_set_range): After computing
......
2002-02-27 Hans Breuer <hans@breuer.org>
* demos/gtk-demo/makefile.msc.in : new file
* gdk-pixbuf/gtk-pixbuf.rc.in : new file to include
version resource
* gdk-pixbuf/makefile.msc : create and use gdk-pixbuf.res
* gdk/win32/gdkkeys-win32.c : handle undefined LANG_URDU,
(gdk_keyval_name) : fix endless looping
* gtk/gtkfilesel.c : translate_win32_path() static
* gtk/queryimmodules : print_escaped(), query_module() static
* gtk/makefile.msc.in : added gtkkeyhash, build gtk-win32.res
* gtk/stock-icons/makefile.msc : regenerated from directory
listing (almost all filenames changed)
Wed Feb 27 10:34:46 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrange.c (gtk_range_set_range): After computing
......
2002-02-27 Hans Breuer <hans@breuer.org>
* demos/gtk-demo/makefile.msc.in : new file
* gdk-pixbuf/gtk-pixbuf.rc.in : new file to include
version resource
* gdk-pixbuf/makefile.msc : create and use gdk-pixbuf.res
* gdk/win32/gdkkeys-win32.c : handle undefined LANG_URDU,
(gdk_keyval_name) : fix endless looping
* gtk/gtkfilesel.c : translate_win32_path() static
* gtk/queryimmodules : print_escaped(), query_module() static
* gtk/makefile.msc.in : added gtkkeyhash, build gtk-win32.res
* gtk/stock-icons/makefile.msc : regenerated from directory
listing (almost all filenames changed)
Wed Feb 27 10:34:46 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrange.c (gtk_range_set_range): After computing
......
2002-02-27 Hans Breuer <hans@breuer.org>
* demos/gtk-demo/makefile.msc.in : new file
* gdk-pixbuf/gtk-pixbuf.rc.in : new file to include
version resource
* gdk-pixbuf/makefile.msc : create and use gdk-pixbuf.res
* gdk/win32/gdkkeys-win32.c : handle undefined LANG_URDU,
(gdk_keyval_name) : fix endless looping
* gtk/gtkfilesel.c : translate_win32_path() static
* gtk/queryimmodules : print_escaped(), query_module() static
* gtk/makefile.msc.in : added gtkkeyhash, build gtk-win32.res
* gtk/stock-icons/makefile.msc : regenerated from directory
listing (almost all filenames changed)
Wed Feb 27 10:34:46 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkrange.c (gtk_range_set_range): After computing
......
## Makefile for building the gtk test apps with Microsoft C
## Use: nmake -f makefile.msc
## There is no install target, you have to decide where and
## how to install for yourself.
TOP = ..\..\..
!INCLUDE $(TOP)/glib/build/win32/make.msc
!IFNDEF PERL
PERL = perl
!ENDIF
################################################################
# Possibly override versions from build/win32/module.defs
GTK_VER = @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@
GDK_PIXBUF_VER = @GDK_PIXBUF_MAJOR@.@GDK_PIXBUF_MINOR@
GDK_LIBS = ../../gdk/gdk-win32-$(GTK_VER).lib
GTK_LIBS = ../../gtk/gtk-win32-$(GTK_VER).lib
GDK_PIXBUF_LIBS = ../../gdk-pixbuf/gdk_pixbuf-$(GDK_PIXBUF_VER).lib
INCLUDES = -FImsvc_recommended_pragmas.h -I . -I ../.. -I ../../gdk -I ../../gdk-pixbuf -I ../../gtk
DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) $(INTL_CFLAGS) $(ATK_CFLAGS)
LDFLAGS = /link /machine:ix86 $(LINKDEBUG)
DEFINES = -DG_LOG_DOMAIN=\"GtkDemo\" -DGTK_VERSION=\"$(GTK_VER)\" \
-DDEMOCODEDIR=\".\"
TOUCH = copy makefile.msc+nul
all : \
demos.h \
gtk-demo.exe
## These should be in the order you want them to appear in the
## demo app, which means alphabetized by demo title, not filename
DEMOS = \
appwindow.c \
button_box.c \
colorsel.c \
dialog.c \
drawingarea.c \
editable_cells.c \
images.c \
item_factory.c \
list_store.c \
menus.c \
panes.c \
pixbufs.c \
sizegroup.c \
stock_browser.c \
textview.c \
tree_store.c \
demos.h: $(DEMOS) geninclude.pl
$(PERL) geninclude.pl $(DEMOS) > demos.h
OBJECTS = \
appwindow.obj \
button_box.obj \
colorsel.obj \
dialog.obj \
drawingarea.obj \
editable_cells.obj \
images.obj \
item_factory.obj \
list_store.obj \
menus.obj \
panes.obj \
pixbufs.obj \
sizegroup.obj \
stock_browser.obj \
textview.obj \
tree_store.obj \
main.obj \
gtk-demo.exe : demos.h $(OBJECTS)
$(CC) $(CFLAGS) -Fegtk-demo.exe $(OBJECTS) $(GTK_LIBS) $(GDK_LIBS) $(GDK_PIXBUF_LIBS) $(PANGO_LIBS) $(GLIB_LIBS) $(LDFLAGS)
#include <winver.h>
VS_VERSION_INFO VERSIONINFO
FILEVERSION @GTK_MAJOR_VERSION@,@GTK_MINOR_VERSION@,@GTK_MICRO_VERSION@,BUILDNUMBER
PRODUCTVERSION @GTK_MAJOR_VERSION@,@GTK_MINOR_VERSION@,@GTK_MICRO_VERSION@,0
FILEFLAGSMASK 0
FILEFLAGS 0
FILEOS VOS__WINDOWS32
FILETYPE VFT_DLL
FILESUBTYPE VFT2_UNKNOWN
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904B0"
BEGIN
VALUE "CompanyName", "The GTK developer community"
VALUE "FileDescription", "GIMP Toolkit"
VALUE "FileVersion", "@GTK_VERSION@.BUILDNUMBER"
VALUE "InternalName", "libgdk-pixbuf-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@"
VALUE "LegalCopyright", "Copyright (C) 1999 The Free Software Foundation. Modified by the GTK+ Team and others 1999-2002."
VALUE "OriginalFilename", "libgdk-pixbuf-@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll"
VALUE "ProductName", "GTK+"
VALUE "ProductVersion", "@GTK_VERSION@"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
......@@ -89,11 +89,14 @@ all : \
gdk-pixbuf-csource.exe \
test-gdk-pixbuf.exe
gtk-pixbuf.res : gtk-pixbuf.rc
rc -DBUILDNUMBER=0 -r -fo gtk-pixbuf.res gtk-pixbuf.rc
$(PACKAGE)-$(PKG_VER)s.lib : $(OBJECTS)
lib /out:$(PACKAGE)-$(PKG_VER)s.lib $(OBJECTS) pixops\pixops.lib
$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def
$(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:$(PACKAGE).def
$(PACKAGE)-$(PKG_VER).dll : $(OBJECTS) $(PACKAGE).def gtk-pixbuf.res
$(CC) $(CFLAGS) -LD -Fe$(PACKAGE)-$(PKG_VER).dll $(OBJECTS) $(PKG_LINK) user32.lib advapi32.lib wsock32.lib gtk-pixbuf.res $(LDFLAGS) /def:$(PACKAGE).def
make-inline-pixbuf.exe : make-inline-pixbuf.c
$(CC) $(PKG_CFLAGS) -Femake-inline-pixbuf.exe make-inline-pixbuf.c $(PKG_LINK) $(PACKAGE)-$(PKG_VER).lib
......
......@@ -299,7 +299,9 @@ gdk_keymap_get_direction (GdkKeymap *keymap)
case LANG_HEBREW:
case LANG_ARABIC:
/* Not 100% sure about these */
#ifdef LANG_URDU
case LANG_URDU:
#endif
case LANG_FARSI:
/* Others? */
return PANGO_DIRECTION_RTL;
......@@ -1971,11 +1973,9 @@ gdk_keyval_name (guint keyval)
if (found != NULL)
{
while (found > gdk_keys_by_keyval)
{
if ((found - 1)->keyval == keyval)
keyval--;
}
while ((found > gdk_keys_by_keyval) &&
((found - 1)->keyval == keyval))
found--;
return (gchar *) found->name;
}
......
......@@ -437,7 +437,7 @@ static gint cmpl_errno;
* Return a boolean value concerning whether a
* translation had to be made.
*/
int
static int
translate_win32_path (GtkFileSelection *filesel)
{
int updated = 0;
......
......@@ -25,14 +25,16 @@ GTK_BINARY_VERSION = @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@LT_CURRENT@
PERL = perl
AWK = gawk
INCLUDES = -FImsvc_recommended_pragmas.h -I . -I .. -I ../gdk -I ../gdk-pixbuf -DPANGO_ENABLE_BACKEND
INCLUDES = -FImsvc_recommended_pragmas.h -I . -I .. -I ../gdk -I ../gdk-pixbuf
DEPCFLAGS = $(PANGO_CFLAGS) $(GLIB_CFLAGS) $(LIBICONV_CFLAGS) \
$(INTL_CFLAGS) $(ATK_CFLAGS)
LDFLAGS = $(ATK_LIBS) /link /machine:ix86 $(LINKDEBUG)
# Some files use near as an identifier
# Don't define GTK_COMPILATION here, because it's for gtk-x.x.dll only
DEFINES = $(G_DEBUGGING) -DGTK_DISABLE_COMPAT_H -DG_LOG_DOMAIN=\"Gtk\" -Dnear=xxnear \
-DGTK_VERSION=\"$(GTK_VER)\" -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"
-DPANGO_ENABLE_BACKEND \
-DGTK_VERSION=\"$(GTK_VER)\" -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \
-DGTK_HOST=\"win32\"
TOUCH = copy makefile.msc+nul
......@@ -113,6 +115,7 @@ gtk_OBJECTS = \
gtkinvisible.obj \
gtkitem.obj \
gtkitemfactory.obj \
gtkkeyhash.obj \
gtklabel.obj \
gtklayout.obj \
gtklist.obj \
......
......@@ -41,7 +41,7 @@
#include "gtk/gtkrc.h"
#include "gtk/gtkimmodule.h"
void
static void
print_escaped (const char *str)
{
char *tmp = g_strescape (str, NULL);
......@@ -49,7 +49,7 @@ print_escaped (const char *str)
g_free (tmp);
}
gboolean
static gboolean
query_module (const char *dir, const char *name)
{
void (*list) (const GtkIMContextInfo ***contexts,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment