forked from AuroraMiddleware/gtk
disable USE_MMX for msvc build cause the assembler doesn't fit and is out
2001-03-31 Hans Breuer <hans@breuer.org> * config.h.win32.in : disable USE_MMX for msvc build cause the assembler doesn't fit and is out of my scope. Disable USE_GMODULE for msvc build as wel. The right way to share binaries on win32 would be to use libtiff.dll etc. To reduce installation hassles IMO it's better to include all fileformats builtin to gdk-pixbuf * gdk-pixbuf/makefile.msc : new file * gdk/gdk.def : updated * gdk/win32/gdkevents-win32.c : don't erase the background if .no_bg is set. It improves the scrolling (e.g. of testgtk main buttons * gdk/win32/gdkgeometry-win32.c : added comment about the above * gdk/win32/gdkwindow-win32.c : added three new functions like the X version. Only one is implemented, because the other two "gdk_window_begin_(resize|move)_drag" got no docs and appear to be default behaviour on win32 anyway ... * gtk/gtk.def : updated * gtk/makefile.msc.in : update for new files, use glib-genmarshal from where it was built and add an additional rule to automagically build gtkmarshal.[hc] * gtk/gtkfilesel.c (open_new_dir) : don't increase n_entries before array access for the current entry isn't finished * gtk/gtktreeitem.c (gtk_tree_item_subtree_button_click) : use g_return_val_if_fail * gtk/testgtk.c (window_controls) : don't use the *wrong* size for the static array, but let the compiler calculate it. It makes me wonder if gcc isn't capable to catch bugs like this ...
This commit is contained in:
Hans Breuer
Hans Breuer
parent
3b68d7db89
commit
6ff97d2e0b
39
ChangeLog
39
ChangeLog
@ -1,3 +1,42 @@
|
||||
2001-03-31 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* config.h.win32.in : disable USE_MMX for msvc build cause
|
||||
the assembler doesn't fit and is out of my scope. Disable
|
||||
USE_GMODULE for msvc build as wel. The right way to share
|
||||
binaries on win32 would be to use libtiff.dll etc. To reduce
|
||||
installation hassles IMO it's better to include all fileformats
|
||||
builtin to gdk-pixbuf
|
||||
|
||||
* gdk-pixbuf/makefile.msc : new file
|
||||
|
||||
* gdk/gdk.def : updated
|
||||
|
||||
* gdk/win32/gdkevents-win32.c : don't erase the background if
|
||||
.no_bg is set. It improves the scrolling (e.g. of testgtk main
|
||||
buttons
|
||||
* gdk/win32/gdkgeometry-win32.c : added comment about the above
|
||||
|
||||
* gdk/win32/gdkwindow-win32.c : added three new functions like
|
||||
the X version. Only one is implemented, because the other two
|
||||
"gdk_window_begin_(resize|move)_drag" got no docs and appear to
|
||||
be default behaviour on win32 anyway ...
|
||||
|
||||
* gtk/gtk.def : updated
|
||||
|
||||
* gtk/makefile.msc.in : update for new files, use glib-genmarshal
|
||||
from where it was built and add an additional rule to automagically
|
||||
build gtkmarshal.[hc]
|
||||
|
||||
* gtk/gtkfilesel.c (open_new_dir) : don't increase n_entries
|
||||
before array access for the current entry isn't finished
|
||||
|
||||
* gtk/gtktreeitem.c (gtk_tree_item_subtree_button_click) :
|
||||
use g_return_val_if_fail
|
||||
|
||||
* gtk/testgtk.c (window_controls) : don't use the *wrong* size
|
||||
for the static array, but let the compiler calculate it. It
|
||||
makes me wonder if gcc isn't capable to catch bugs like this ...
|
||||
|
||||
2001-03-31 James Henstridge <james@daa.com.au>
|
||||
|
||||
* gtk/gtkwidget.c (gtk_widget_size_adjust): fix use of magic
|
||||
|
||||
@ -1,3 +1,42 @@
|
||||
2001-03-31 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* config.h.win32.in : disable USE_MMX for msvc build cause
|
||||
the assembler doesn't fit and is out of my scope. Disable
|
||||
USE_GMODULE for msvc build as wel. The right way to share
|
||||
binaries on win32 would be to use libtiff.dll etc. To reduce
|
||||
installation hassles IMO it's better to include all fileformats
|
||||
builtin to gdk-pixbuf
|
||||
|
||||
* gdk-pixbuf/makefile.msc : new file
|
||||
|
||||
* gdk/gdk.def : updated
|
||||
|
||||
* gdk/win32/gdkevents-win32.c : don't erase the background if
|
||||
.no_bg is set. It improves the scrolling (e.g. of testgtk main
|
||||
buttons
|
||||
* gdk/win32/gdkgeometry-win32.c : added comment about the above
|
||||
|
||||
* gdk/win32/gdkwindow-win32.c : added three new functions like
|
||||
the X version. Only one is implemented, because the other two
|
||||
"gdk_window_begin_(resize|move)_drag" got no docs and appear to
|
||||
be default behaviour on win32 anyway ...
|
||||
|
||||
* gtk/gtk.def : updated
|
||||
|
||||
* gtk/makefile.msc.in : update for new files, use glib-genmarshal
|
||||
from where it was built and add an additional rule to automagically
|
||||
build gtkmarshal.[hc]
|
||||
|
||||
* gtk/gtkfilesel.c (open_new_dir) : don't increase n_entries
|
||||
before array access for the current entry isn't finished
|
||||
|
||||
* gtk/gtktreeitem.c (gtk_tree_item_subtree_button_click) :
|
||||
use g_return_val_if_fail
|
||||
|
||||
* gtk/testgtk.c (window_controls) : don't use the *wrong* size
|
||||
for the static array, but let the compiler calculate it. It
|
||||
makes me wonder if gcc isn't capable to catch bugs like this ...
|
||||
|
||||
2001-03-31 James Henstridge <james@daa.com.au>
|
||||
|
||||
* gtk/gtkwidget.c (gtk_widget_size_adjust): fix use of magic
|
||||
|
||||
@ -1,3 +1,42 @@
|
||||
2001-03-31 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* config.h.win32.in : disable USE_MMX for msvc build cause
|
||||
the assembler doesn't fit and is out of my scope. Disable
|
||||
USE_GMODULE for msvc build as wel. The right way to share
|
||||
binaries on win32 would be to use libtiff.dll etc. To reduce
|
||||
installation hassles IMO it's better to include all fileformats
|
||||
builtin to gdk-pixbuf
|
||||
|
||||
* gdk-pixbuf/makefile.msc : new file
|
||||
|
||||
* gdk/gdk.def : updated
|
||||
|
||||
* gdk/win32/gdkevents-win32.c : don't erase the background if
|
||||
.no_bg is set. It improves the scrolling (e.g. of testgtk main
|
||||
buttons
|
||||
* gdk/win32/gdkgeometry-win32.c : added comment about the above
|
||||
|
||||
* gdk/win32/gdkwindow-win32.c : added three new functions like
|
||||
the X version. Only one is implemented, because the other two
|
||||
"gdk_window_begin_(resize|move)_drag" got no docs and appear to
|
||||
be default behaviour on win32 anyway ...
|
||||
|
||||
* gtk/gtk.def : updated
|
||||
|
||||
* gtk/makefile.msc.in : update for new files, use glib-genmarshal
|
||||
from where it was built and add an additional rule to automagically
|
||||
build gtkmarshal.[hc]
|
||||
|
||||
* gtk/gtkfilesel.c (open_new_dir) : don't increase n_entries
|
||||
before array access for the current entry isn't finished
|
||||
|
||||
* gtk/gtktreeitem.c (gtk_tree_item_subtree_button_click) :
|
||||
use g_return_val_if_fail
|
||||
|
||||
* gtk/testgtk.c (window_controls) : don't use the *wrong* size
|
||||
for the static array, but let the compiler calculate it. It
|
||||
makes me wonder if gcc isn't capable to catch bugs like this ...
|
||||
|
||||
2001-03-31 James Henstridge <james@daa.com.au>
|
||||
|
||||
* gtk/gtkwidget.c (gtk_widget_size_adjust): fix use of magic
|
||||
|
||||
@ -1,3 +1,42 @@
|
||||
2001-03-31 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* config.h.win32.in : disable USE_MMX for msvc build cause
|
||||
the assembler doesn't fit and is out of my scope. Disable
|
||||
USE_GMODULE for msvc build as wel. The right way to share
|
||||
binaries on win32 would be to use libtiff.dll etc. To reduce
|
||||
installation hassles IMO it's better to include all fileformats
|
||||
builtin to gdk-pixbuf
|
||||
|
||||
* gdk-pixbuf/makefile.msc : new file
|
||||
|
||||
* gdk/gdk.def : updated
|
||||
|
||||
* gdk/win32/gdkevents-win32.c : don't erase the background if
|
||||
.no_bg is set. It improves the scrolling (e.g. of testgtk main
|
||||
buttons
|
||||
* gdk/win32/gdkgeometry-win32.c : added comment about the above
|
||||
|
||||
* gdk/win32/gdkwindow-win32.c : added three new functions like
|
||||
the X version. Only one is implemented, because the other two
|
||||
"gdk_window_begin_(resize|move)_drag" got no docs and appear to
|
||||
be default behaviour on win32 anyway ...
|
||||
|
||||
* gtk/gtk.def : updated
|
||||
|
||||
* gtk/makefile.msc.in : update for new files, use glib-genmarshal
|
||||
from where it was built and add an additional rule to automagically
|
||||
build gtkmarshal.[hc]
|
||||
|
||||
* gtk/gtkfilesel.c (open_new_dir) : don't increase n_entries
|
||||
before array access for the current entry isn't finished
|
||||
|
||||
* gtk/gtktreeitem.c (gtk_tree_item_subtree_button_click) :
|
||||
use g_return_val_if_fail
|
||||
|
||||
* gtk/testgtk.c (window_controls) : don't use the *wrong* size
|
||||
for the static array, but let the compiler calculate it. It
|
||||
makes me wonder if gcc isn't capable to catch bugs like this ...
|
||||
|
||||
2001-03-31 James Henstridge <james@daa.com.au>
|
||||
|
||||
* gtk/gtkwidget.c (gtk_widget_size_adjust): fix use of magic
|
||||
|
||||
@ -1,3 +1,42 @@
|
||||
2001-03-31 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* config.h.win32.in : disable USE_MMX for msvc build cause
|
||||
the assembler doesn't fit and is out of my scope. Disable
|
||||
USE_GMODULE for msvc build as wel. The right way to share
|
||||
binaries on win32 would be to use libtiff.dll etc. To reduce
|
||||
installation hassles IMO it's better to include all fileformats
|
||||
builtin to gdk-pixbuf
|
||||
|
||||
* gdk-pixbuf/makefile.msc : new file
|
||||
|
||||
* gdk/gdk.def : updated
|
||||
|
||||
* gdk/win32/gdkevents-win32.c : don't erase the background if
|
||||
.no_bg is set. It improves the scrolling (e.g. of testgtk main
|
||||
buttons
|
||||
* gdk/win32/gdkgeometry-win32.c : added comment about the above
|
||||
|
||||
* gdk/win32/gdkwindow-win32.c : added three new functions like
|
||||
the X version. Only one is implemented, because the other two
|
||||
"gdk_window_begin_(resize|move)_drag" got no docs and appear to
|
||||
be default behaviour on win32 anyway ...
|
||||
|
||||
* gtk/gtk.def : updated
|
||||
|
||||
* gtk/makefile.msc.in : update for new files, use glib-genmarshal
|
||||
from where it was built and add an additional rule to automagically
|
||||
build gtkmarshal.[hc]
|
||||
|
||||
* gtk/gtkfilesel.c (open_new_dir) : don't increase n_entries
|
||||
before array access for the current entry isn't finished
|
||||
|
||||
* gtk/gtktreeitem.c (gtk_tree_item_subtree_button_click) :
|
||||
use g_return_val_if_fail
|
||||
|
||||
* gtk/testgtk.c (window_controls) : don't use the *wrong* size
|
||||
for the static array, but let the compiler calculate it. It
|
||||
makes me wonder if gcc isn't capable to catch bugs like this ...
|
||||
|
||||
2001-03-31 James Henstridge <james@daa.com.au>
|
||||
|
||||
* gtk/gtkwidget.c (gtk_widget_size_adjust): fix use of magic
|
||||
|
||||
@ -1,3 +1,42 @@
|
||||
2001-03-31 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* config.h.win32.in : disable USE_MMX for msvc build cause
|
||||
the assembler doesn't fit and is out of my scope. Disable
|
||||
USE_GMODULE for msvc build as wel. The right way to share
|
||||
binaries on win32 would be to use libtiff.dll etc. To reduce
|
||||
installation hassles IMO it's better to include all fileformats
|
||||
builtin to gdk-pixbuf
|
||||
|
||||
* gdk-pixbuf/makefile.msc : new file
|
||||
|
||||
* gdk/gdk.def : updated
|
||||
|
||||
* gdk/win32/gdkevents-win32.c : don't erase the background if
|
||||
.no_bg is set. It improves the scrolling (e.g. of testgtk main
|
||||
buttons
|
||||
* gdk/win32/gdkgeometry-win32.c : added comment about the above
|
||||
|
||||
* gdk/win32/gdkwindow-win32.c : added three new functions like
|
||||
the X version. Only one is implemented, because the other two
|
||||
"gdk_window_begin_(resize|move)_drag" got no docs and appear to
|
||||
be default behaviour on win32 anyway ...
|
||||
|
||||
* gtk/gtk.def : updated
|
||||
|
||||
* gtk/makefile.msc.in : update for new files, use glib-genmarshal
|
||||
from where it was built and add an additional rule to automagically
|
||||
build gtkmarshal.[hc]
|
||||
|
||||
* gtk/gtkfilesel.c (open_new_dir) : don't increase n_entries
|
||||
before array access for the current entry isn't finished
|
||||
|
||||
* gtk/gtktreeitem.c (gtk_tree_item_subtree_button_click) :
|
||||
use g_return_val_if_fail
|
||||
|
||||
* gtk/testgtk.c (window_controls) : don't use the *wrong* size
|
||||
for the static array, but let the compiler calculate it. It
|
||||
makes me wonder if gcc isn't capable to catch bugs like this ...
|
||||
|
||||
2001-03-31 James Henstridge <james@daa.com.au>
|
||||
|
||||
* gtk/gtkwidget.c (gtk_widget_size_adjust): fix use of magic
|
||||
|
||||
@ -1,3 +1,42 @@
|
||||
2001-03-31 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* config.h.win32.in : disable USE_MMX for msvc build cause
|
||||
the assembler doesn't fit and is out of my scope. Disable
|
||||
USE_GMODULE for msvc build as wel. The right way to share
|
||||
binaries on win32 would be to use libtiff.dll etc. To reduce
|
||||
installation hassles IMO it's better to include all fileformats
|
||||
builtin to gdk-pixbuf
|
||||
|
||||
* gdk-pixbuf/makefile.msc : new file
|
||||
|
||||
* gdk/gdk.def : updated
|
||||
|
||||
* gdk/win32/gdkevents-win32.c : don't erase the background if
|
||||
.no_bg is set. It improves the scrolling (e.g. of testgtk main
|
||||
buttons
|
||||
* gdk/win32/gdkgeometry-win32.c : added comment about the above
|
||||
|
||||
* gdk/win32/gdkwindow-win32.c : added three new functions like
|
||||
the X version. Only one is implemented, because the other two
|
||||
"gdk_window_begin_(resize|move)_drag" got no docs and appear to
|
||||
be default behaviour on win32 anyway ...
|
||||
|
||||
* gtk/gtk.def : updated
|
||||
|
||||
* gtk/makefile.msc.in : update for new files, use glib-genmarshal
|
||||
from where it was built and add an additional rule to automagically
|
||||
build gtkmarshal.[hc]
|
||||
|
||||
* gtk/gtkfilesel.c (open_new_dir) : don't increase n_entries
|
||||
before array access for the current entry isn't finished
|
||||
|
||||
* gtk/gtktreeitem.c (gtk_tree_item_subtree_button_click) :
|
||||
use g_return_val_if_fail
|
||||
|
||||
* gtk/testgtk.c (window_controls) : don't use the *wrong* size
|
||||
for the static array, but let the compiler calculate it. It
|
||||
makes me wonder if gcc isn't capable to catch bugs like this ...
|
||||
|
||||
2001-03-31 James Henstridge <james@daa.com.au>
|
||||
|
||||
* gtk/gtkwidget.c (gtk_widget_size_adjust): fix use of magic
|
||||
|
||||
@ -193,8 +193,10 @@
|
||||
*/
|
||||
/* #define HAVE_DIMM_H 1 */
|
||||
|
||||
#ifndef _MSC_VER
|
||||
#define USE_GMODULE 1
|
||||
#define USE_MMX 1
|
||||
#endif
|
||||
|
||||
/* #undef HAVE_SIGSETJMP */
|
||||
|
||||
|
||||
89
gdk-pixbuf/makefile.msc
Normal file
89
gdk-pixbuf/makefile.msc
Normal file
@ -0,0 +1,89 @@
|
||||
TOP = ..\..
|
||||
PRJ_TOP = ..
|
||||
PACKAGE = gdk_pixbuf
|
||||
PKG_VER = $(GDK_PIXBUF_VER)
|
||||
|
||||
!INCLUDE $(TOP)/build/win32/make.msc
|
||||
|
||||
GDK_PIXBUF_VER = 1.3
|
||||
|
||||
# force inclusion of gdk-pixbuf-io-include.h
|
||||
# to get _working_ include modules ...
|
||||
|
||||
PKG_CFLAGS = -I. -I.. $(GLIB_CFLAGS) \
|
||||
-FIgdk-pixbuf-io-include.h \
|
||||
$(JPEG_CFLAGS) $(PNG_CFLAGS) $(TIFF_CFLAGS) $(INTL_CFLAGS) \
|
||||
-UUSE_GMODULE # use built-in
|
||||
# -DUSE_GMODULE -DPIXBUF_LIBDIR=\".\"
|
||||
|
||||
|
||||
PKG_LINK = $(GLIB_LIBS) \
|
||||
$(JPEG_LIBS) $(PNG_LIBS) $(TIFF_LIBS) $(INTL_LIBS) \
|
||||
pixops\pixops.lib
|
||||
|
||||
OBJECTS = \
|
||||
gdk-pixbuf-animation.obj \
|
||||
gdk-pixbuf-data.obj \
|
||||
gdk-pixbuf-io.obj \
|
||||
gdk-pixbuf-loader.obj \
|
||||
gdk-pixbuf-scale.obj \
|
||||
gdk-pixbuf-util.obj \
|
||||
gdk-pixbuf.obj \
|
||||
io-bmp.obj \
|
||||
io-wbmp.obj \
|
||||
io-gif.obj \
|
||||
io-ico.obj \
|
||||
io-png.obj \
|
||||
io-pnm.obj \
|
||||
io-ras.obj \
|
||||
io-tiff.obj \
|
||||
io-xpm.obj \
|
||||
io-jpeg.obj \
|
||||
|
||||
gdk-pixbuf-marshal.h: gdk-pixbuf-marshal.list
|
||||
..\..\glib\gobject\glib-genmarshal --prefix=gdk_pixbuf_marshal gdk-pixbuf-marshal.list --header >gdk-pixbuf-marshal.h
|
||||
|
||||
gdk-pixbuf-marshal.c: gdk-pixbuf-marshal.list
|
||||
..\..\glib\gobject\glib-genmarshal --prefix=gdk_pixbuf_marshal gdk-pixbuf-marshal.list --body >gdk-pixbuf-marshal.c
|
||||
|
||||
## common stuff
|
||||
|
||||
# cl -? describes the options
|
||||
CC = cl -G5 -GF $(OPTIMIZE) -W3 -nologo
|
||||
|
||||
# No general LDFLAGS needed
|
||||
LDFLAGS = /link $(LINKDEBUG)
|
||||
INSTALL = copy
|
||||
|
||||
CFLAGS = -I. -DHAVE_CONFIG_H
|
||||
|
||||
## targets
|
||||
all : \
|
||||
$(PRJ_TOP)\config.h \
|
||||
gdk-pixbuf-marshal.c \
|
||||
gdk-pixbuf-marshal.h \
|
||||
$(PACKAGE)-$(PKG_VER).dll \
|
||||
make-inline-pixbuf.exe \
|
||||
test-gdk-pixbuf.exe
|
||||
|
||||
$(PACKAGE).lib : $(OBJECTS)
|
||||
lib /out:$(PACKAGE).lib $(OBJECTS)
|
||||
|
||||
$(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
|
||||
|
||||
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
|
||||
|
||||
test-gdk-pixbuf.exe : test-gdk-pixbuf.c
|
||||
$(CC) $(PKG_CFLAGS) -Fetest-gdk-pixbuf.exe test-gdk-pixbuf.c $(PKG_LINK) $(PACKAGE)-$(PKG_VER).lib
|
||||
|
||||
$(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
|
||||
copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
|
||||
|
||||
.c.obj :
|
||||
$(CC) $(CFLAGS) -GD -c $(PKG_CFLAGS) $<
|
||||
|
||||
clean::
|
||||
del config.h
|
||||
|
||||
@ -376,3 +376,7 @@ EXPORTS
|
||||
gdk_window_stick
|
||||
gdk_window_unmaximize
|
||||
gdk_window_unstick
|
||||
gdk_window_begin_move_drag
|
||||
gdk_window_begin_resize_drag
|
||||
gdk_window_constrain_size
|
||||
gdk_window_get_frame_extents
|
||||
|
||||
@ -2512,6 +2512,14 @@ gdk_event_translate (GdkEvent *event,
|
||||
if (GDK_WINDOW_OBJECT (window)->input_only)
|
||||
break;
|
||||
|
||||
if (GDK_WINDOW_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl)->position_info.no_bg)
|
||||
{
|
||||
/* improves scolling effect, e.g. main buttons of testgtk */
|
||||
*ret_val_flagp = TRUE;
|
||||
*ret_valp = 1;
|
||||
break;
|
||||
}
|
||||
|
||||
colormap = GDK_DRAWABLE_IMPL_WIN32 (GDK_WINDOW_OBJECT (window)->impl)->colormap;
|
||||
if (colormap)
|
||||
colormap_private = GDK_COLORMAP_PRIVATE_DATA (colormap);
|
||||
|
||||
@ -808,8 +808,12 @@ gdk_window_tmp_unset_bg (GdkWindow *window)
|
||||
|
||||
impl->position_info.no_bg = TRUE;
|
||||
|
||||
/*
|
||||
* The X version sets background = None to avoid updateing for a moment.
|
||||
* Not sure if this could really emulate it.
|
||||
*/
|
||||
if (obj->bg_pixmap != GDK_NO_BG)
|
||||
/* ??? */;
|
||||
/* handled in WM_ERASEBKGRND proceesing */;
|
||||
}
|
||||
|
||||
static void
|
||||
|
||||
@ -832,7 +832,7 @@ gdk_window_show (GdkWindow *window)
|
||||
}
|
||||
else
|
||||
{
|
||||
GdkWindow *parent = private->parent;
|
||||
GdkWindow *parent = GDK_WINDOW (private->parent);
|
||||
|
||||
ShowWindow (GDK_WINDOW_HWND (window), SW_SHOWNORMAL);
|
||||
ShowWindow (GDK_WINDOW_HWND (window), SW_RESTORE);
|
||||
@ -1705,6 +1705,39 @@ gdk_window_get_root_origin (GdkWindow *window,
|
||||
pt.x, pt.y));
|
||||
}
|
||||
|
||||
void
|
||||
gdk_window_get_frame_extents (GdkWindow *window,
|
||||
GdkRectangle *rect)
|
||||
{
|
||||
GdkWindowObject *private;
|
||||
HWND hwnd;
|
||||
RECT r;
|
||||
|
||||
rect->x = 0;
|
||||
rect->y = 0;
|
||||
rect->width = 1;
|
||||
rect->height = 1;
|
||||
|
||||
if (GDK_WINDOW_DESTROYED (window))
|
||||
return;
|
||||
|
||||
hwnd = GDK_WINDOW_HWND (window);
|
||||
/* find the frame window */
|
||||
while (HWND_DESKTOP != GetParent (hwnd))
|
||||
{
|
||||
hwnd = GetParent (hwnd);
|
||||
g_return_if_fail (NULL != hwnd);
|
||||
}
|
||||
|
||||
if (GetWindowRect (hwnd, &r))
|
||||
WIN32_API_FAILED ("GetWindowRect");
|
||||
|
||||
rect->x = r.left;
|
||||
rect->y = r.right;
|
||||
rect->width = r.right - r.left;
|
||||
rect->height = r.bottom - r.top;
|
||||
}
|
||||
|
||||
GdkWindow*
|
||||
gdk_window_get_pointer (GdkWindow *window,
|
||||
gint *x,
|
||||
@ -2442,3 +2475,34 @@ gdk_window_shape_combine_region (GdkWindow *window,
|
||||
|
||||
/* XXX: even on X implemented conditional ... */
|
||||
}
|
||||
|
||||
void
|
||||
gdk_window_begin_resize_drag (GdkWindow *window,
|
||||
GdkWindowEdge edge,
|
||||
gint button,
|
||||
gint root_x,
|
||||
gint root_y,
|
||||
guint32 timestamp)
|
||||
{
|
||||
g_return_if_fail (GDK_IS_WINDOW (window));
|
||||
|
||||
if (GDK_WINDOW_DESTROYED (window))
|
||||
return;
|
||||
|
||||
/* XXX: isn't all this default on win32 ... */
|
||||
}
|
||||
|
||||
void
|
||||
gdk_window_begin_move_drag (GdkWindow *window,
|
||||
gint button,
|
||||
gint root_x,
|
||||
gint root_y,
|
||||
guint32 timestamp)
|
||||
{
|
||||
g_return_if_fail (GDK_IS_WINDOW (window));
|
||||
|
||||
if (GDK_WINDOW_DESTROYED (window))
|
||||
return;
|
||||
|
||||
/* XXX: isn't all this default on win32 ... */
|
||||
}
|
||||
24
gtk/gtk.def
24
gtk/gtk.def
@ -220,9 +220,9 @@ EXPORTS
|
||||
gtk_button_get_type
|
||||
gtk_button_leave
|
||||
gtk_button_new
|
||||
gtk_button_new_accel
|
||||
gtk_button_new_stock
|
||||
gtk_button_new_from_stock
|
||||
gtk_button_new_with_label
|
||||
gtk_button_new_with_mnemonic
|
||||
gtk_button_pressed
|
||||
gtk_button_released
|
||||
gtk_button_set_relief
|
||||
@ -250,6 +250,7 @@ EXPORTS
|
||||
gtk_check_button_get_type
|
||||
gtk_check_button_new
|
||||
gtk_check_button_new_with_label
|
||||
gtk_check_button_new_with_mnemonic
|
||||
gtk_check_menu_item_get_type
|
||||
gtk_check_menu_item_new
|
||||
gtk_check_menu_item_new_with_label
|
||||
@ -376,6 +377,7 @@ EXPORTS
|
||||
gtk_container_remove
|
||||
gtk_container_resize_children
|
||||
gtk_container_set_border_width
|
||||
gtk_container_set_focus_chain
|
||||
gtk_container_set_focus_child
|
||||
gtk_container_set_focus_hadjustment
|
||||
gtk_container_set_focus_vadjustment
|
||||
@ -608,6 +610,7 @@ EXPORTS
|
||||
gtk_image_get_storage_type
|
||||
gtk_image_get_type
|
||||
gtk_image_menu_item_new
|
||||
gtk_image_menu_item_new_from_stock
|
||||
gtk_image_new
|
||||
gtk_image_new_from_file
|
||||
gtk_image_new_from_icon_set
|
||||
@ -671,13 +674,15 @@ EXPORTS
|
||||
gtk_key_snooper_install
|
||||
gtk_key_snooper_remove
|
||||
gtk_label_get
|
||||
gtk_label_get_mnemonic_keyval
|
||||
gtk_label_get_type
|
||||
gtk_label_new
|
||||
gtk_label_new_with_mnemonic
|
||||
gtk_label_parse_uline
|
||||
gtk_label_set_justify
|
||||
gtk_label_set_line_wrap
|
||||
gtk_label_set_markup
|
||||
gtk_label_set_markup_with_accel
|
||||
gtk_label_set_markup_with_mnemonic
|
||||
gtk_label_set_pattern
|
||||
gtk_label_set_selectable
|
||||
gtk_label_set_selectable
|
||||
@ -736,7 +741,6 @@ EXPORTS
|
||||
gtk_marshal_BOOLEAN__OBJECT_STRING_STRING_BOXED
|
||||
gtk_marshal_BOOLEAN__VOID
|
||||
gtk_marshal_ENUM__ENUM
|
||||
gtk_marshal_INT__OBJECT_BOXED_BOXED
|
||||
gtk_marshal_INT__POINTER
|
||||
gtk_marshal_VOID__BOOLEAN
|
||||
gtk_marshal_VOID__BOXED
|
||||
@ -775,7 +779,6 @@ EXPORTS
|
||||
gtk_menu_bar_prepend
|
||||
gtk_menu_bar_set_shadow_type
|
||||
gtk_menu_detach
|
||||
gtk_menu_ensure_uline_accel_group
|
||||
gtk_menu_factory_add_entries
|
||||
gtk_menu_factory_add_subfactory
|
||||
gtk_menu_factory_destroy
|
||||
@ -788,7 +791,6 @@ EXPORTS
|
||||
gtk_menu_get_active
|
||||
gtk_menu_get_attach_widget
|
||||
gtk_menu_get_type
|
||||
gtk_menu_get_uline_accel_group
|
||||
gtk_menu_item_activate
|
||||
gtk_menu_item_configure
|
||||
gtk_menu_item_deselect
|
||||
@ -1094,6 +1096,7 @@ EXPORTS
|
||||
gtk_spin_button_get_value_as_float
|
||||
gtk_spin_button_get_value_as_int
|
||||
gtk_spin_button_new
|
||||
gtk_spin_button_new_with_range
|
||||
gtk_spin_button_set_adjustment
|
||||
gtk_spin_button_set_digits
|
||||
gtk_spin_button_set_numeric
|
||||
@ -1280,6 +1283,7 @@ EXPORTS
|
||||
gtk_toolbar_insert_element
|
||||
gtk_toolbar_insert_item
|
||||
gtk_toolbar_insert_space
|
||||
gtk_toolbar_insert_stock
|
||||
gtk_toolbar_insert_widget
|
||||
gtk_toolbar_new
|
||||
gtk_toolbar_prepend_element
|
||||
@ -1287,6 +1291,7 @@ EXPORTS
|
||||
gtk_toolbar_prepend_space
|
||||
gtk_toolbar_prepend_widget
|
||||
gtk_toolbar_set_button_relief
|
||||
gtk_toolbar_set_icon_size
|
||||
gtk_toolbar_set_orientation
|
||||
gtk_toolbar_set_space_size
|
||||
gtk_toolbar_set_space_style
|
||||
@ -1360,7 +1365,6 @@ EXPORTS
|
||||
gtk_tree_store_prepend
|
||||
gtk_tree_store_remove
|
||||
gtk_tree_store_set
|
||||
gtk_tree_store_set_cell
|
||||
gtk_tree_store_set_column_type
|
||||
gtk_tree_store_set_n_columns
|
||||
gtk_tree_store_set_valist
|
||||
@ -1553,7 +1557,7 @@ EXPORTS
|
||||
gtk_window_add_accel_group
|
||||
gtk_window_add_embedded_xid
|
||||
gtk_window_deiconify
|
||||
gtk_window_get_default_accel_group
|
||||
gtk_window_get_location
|
||||
gtk_window_get_type
|
||||
gtk_window_iconify
|
||||
gtk_window_maximize
|
||||
@ -1566,12 +1570,16 @@ EXPORTS
|
||||
gtk_window_set_default_size
|
||||
gtk_window_set_focus
|
||||
gtk_window_set_geometry_hints
|
||||
gtk_window_set_gravity
|
||||
gtk_window_set_location
|
||||
gtk_window_set_modal
|
||||
gtk_window_set_policy
|
||||
gtk_window_set_position
|
||||
gtk_window_set_size
|
||||
gtk_window_set_title
|
||||
gtk_window_set_transient_for
|
||||
gtk_window_set_wmclass
|
||||
gtk_window_stick
|
||||
gtk_window_unmaximize
|
||||
gtk_window_unstick
|
||||
|
||||
|
||||
@ -2417,7 +2417,6 @@ open_new_dir (gchar *dir_name,
|
||||
g_warning (_("The filename %s couldn't be converted to UTF-8. Try setting the environment variable G_BROKEN_FILENAMES."), dirent_ptr->d_name);
|
||||
continue;
|
||||
}
|
||||
n_entries++;
|
||||
|
||||
g_string_assign (path, sys_dir_name);
|
||||
if (path->str[path->len-1] != G_DIR_SEPARATOR)
|
||||
@ -2438,6 +2437,8 @@ open_new_dir (gchar *dir_name,
|
||||
}
|
||||
else
|
||||
sent->entries[n_entries].is_dir = 1;
|
||||
|
||||
n_entries++;
|
||||
}
|
||||
sent->entry_count = n_entries;
|
||||
|
||||
|
||||
@ -177,8 +177,8 @@ gtk_tree_item_subtree_button_click (GtkWidget *widget)
|
||||
{
|
||||
GtkTreeItem* item;
|
||||
|
||||
g_return_if_fail (widget != NULL);
|
||||
g_return_if_fail (GTK_IS_EVENT_BOX (widget));
|
||||
g_return_val_if_fail (widget != NULL, FALSE);
|
||||
g_return_val_if_fail (GTK_IS_EVENT_BOX (widget), FALSE);
|
||||
|
||||
item = (GtkTreeItem*) gtk_object_get_user_data (GTK_OBJECT (widget));
|
||||
if (!GTK_WIDGET_IS_SENSITIVE (item))
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
## There is no install target, you have to decide where and
|
||||
## how to install for yourself.
|
||||
|
||||
TOP = ../..
|
||||
TOP = ..\..
|
||||
!INCLUDE $(TOP)/build/win32/make.msc
|
||||
|
||||
################################################################
|
||||
@ -116,6 +116,7 @@ gtk_OBJECTS = \
|
||||
gtklayout.obj \
|
||||
gtklist.obj \
|
||||
gtklistitem.obj \
|
||||
gtkliststore.obj \
|
||||
gtkmain.obj \
|
||||
gtkmenu.obj \
|
||||
gtkmenubar.obj \
|
||||
@ -147,6 +148,7 @@ gtk_OBJECTS = \
|
||||
gtkselection.obj \
|
||||
gtkseparator.obj \
|
||||
gtkseparatormenuitem.obj \
|
||||
gtksettings.obj \
|
||||
gtksignal.obj \
|
||||
gtksocket.obj \
|
||||
gtkspinbutton.obj \
|
||||
@ -178,9 +180,10 @@ gtk_OBJECTS = \
|
||||
gtktreednd.obj \
|
||||
gtktreeitem.obj \
|
||||
gtktreemodel.obj \
|
||||
gtktreemodelsimple.obj \
|
||||
# gtktreemodelsimple.obj \
|
||||
gtktreemodelsort.obj \
|
||||
gtktreeselection.obj \
|
||||
gtktreesortable.obj \
|
||||
gtktreestore.obj \
|
||||
gtktreeview.obj \
|
||||
gtktreeviewcolumn.obj \
|
||||
@ -351,7 +354,6 @@ gdk_headers = \
|
||||
..\gdk\gdkevents.h \
|
||||
..\gdk\gdkfont.h \
|
||||
..\gdk\gdkgc.h \
|
||||
..\gdk\gdkim.h \
|
||||
..\gdk\gdkimage.h \
|
||||
..\gdk\gdkinput.h \
|
||||
..\gdk\gdkpixmap.h \
|
||||
@ -396,10 +398,13 @@ gtktypebuiltins_evals.c: makeenums.pl gtk.defs
|
||||
$(PERL) makeenums.pl arrays $(gtk_public_h_sources) $(gdk_headers) >gtktypebuiltins_evals.c
|
||||
|
||||
gtkmarshal.h : gtkmarshal.list
|
||||
glib-genmarshal --prefix=gtk_marshal gtkmarshal.list --header >gtkmarshal.h
|
||||
$(GLIB)\gobject\glib-genmarshal --prefix=gtk_marshal gtkmarshal.list --header >gtkmarshal.h
|
||||
|
||||
gtkmarshal.c : gtkmarshal.list
|
||||
glib-genmarshal --prefix=gtk_marshal gtkmarshal.list --body >gtkmarshal.c
|
||||
$(GLIB)\gobject\glib-genmarshal --prefix=gtk_marshal gtkmarshal.list --body >gtkmarshal.c
|
||||
|
||||
gtksignal.obj : gtksignal.c gtkmarshal.c gtkmarshal.h
|
||||
$(CC) $(CFLAGS) -GD -c -DGTK_COMPILATION -DG_LOG_DOMAIN=\"Gtk\" gtksignal.c
|
||||
|
||||
#
|
||||
# Linking:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user