Generate gtk/makefile.mingw.
2000-07-25 Tor Lillqvist <tml@iki.fi> * configure.in: Generate gtk/makefile.mingw. * config.h.win32: Add GETTEXT_PACKAGE. * gdk/gdk.def * gtk/gtk.def: Updates. * gdk/gdkfont.h * gdk/gdkpixmap.h: Remove temporary Win32-only functions, we don't need them any longer. * gdk/gdkinput.h: Mark gdk_core_pointer for export/import. * gdk/win32/*.c: More work. * gdk/win32/gdkpango-win32.c: New file. * gtk/makefile.mingw.in: New file * gtk/makefile.cygwin: Removed * gtk/Makefile.am: Update accordingly. * gtk/gtkmain.c: Use gtk_win32_get_installation_directory(). * gtk/gtktextdisplay.c: No need to include pangox.h, pango.h is enough. * gtk/gtktypeutils.c: Mark glib_debug_objects for import.
This commit is contained in:
committed by
Tor Lillqvist
parent
5ac61d3eee
commit
20e675e1a3
@ -32,8 +32,6 @@
|
||||
#include "gdkwindow.h"
|
||||
#include "gdkinternals.h"
|
||||
#include "gdkprivate-win32.h"
|
||||
#include "gdkwindow-win32.h"
|
||||
#include "gdkpixmap-win32.h"
|
||||
|
||||
static gboolean gdk_window_gravity_works (void);
|
||||
static void gdk_window_set_static_win_gravity (GdkWindow *window,
|
||||
@ -157,7 +155,7 @@ gdk_window_impl_win32_get_colormap (GdkDrawable *drawable)
|
||||
if (!((GdkWindowObject *) drawable_impl->wrapper)->input_only &&
|
||||
drawable_impl->colormap == NULL)
|
||||
{
|
||||
g_assert_not_reached ();
|
||||
drawable_impl->colormap = gdk_colormap_get_system ();
|
||||
}
|
||||
|
||||
return drawable_impl->colormap;
|
||||
@ -637,7 +635,7 @@ gdk_window_foreign_new (GdkNativeWindow anid)
|
||||
draw_impl = GDK_DRAWABLE_IMPL_WIN32 (private->impl);
|
||||
draw_impl->wrapper = GDK_DRAWABLE (window);
|
||||
|
||||
private->parent = gdk_win32_handle_table_lookup (parent);
|
||||
private->parent = gdk_win32_handle_table_lookup ((GdkNativeWindow) parent);
|
||||
|
||||
parent_private = (GdkWindowObject *)private->parent;
|
||||
|
||||
@ -1638,7 +1636,7 @@ gdk_window_get_pointer (GdkWindow *window,
|
||||
ScreenToClient (hwndc, &point);
|
||||
} while (hwndc != hwnd && (hwnd = hwndc, 1)); /* Ouch! */
|
||||
|
||||
return_val = gdk_win32_handle_table_lookup (hwnd);
|
||||
return_val = gdk_win32_handle_table_lookup ((GdkNativeWindow) hwnd);
|
||||
|
||||
if (mask)
|
||||
{
|
||||
@ -1696,7 +1694,7 @@ gdk_window_at_pointer (gint *win_x,
|
||||
ScreenToClient (hwndc, &point);
|
||||
} while (hwndc != hwnd && (hwnd = hwndc, 1));
|
||||
|
||||
window = gdk_win32_handle_table_lookup (hwnd);
|
||||
window = gdk_win32_handle_table_lookup ((GdkNativeWindow) hwnd);
|
||||
|
||||
if (window && (win_x || win_y))
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user