forked from AuroraMiddleware/gtk
Add missing entries, needed by gtk.
2002-11-16 Tor Lillqvist <tml@iki.fi> * gdk/gdk.def: Add missing entries, needed by gtk. * gdk/win32/gdkcolor-win32.c (gdk_screen_get_system_colormap): Remove g_return_val_if_fail call. This function is called from gdk_display_open() with the _gdk_screen it just created, but when gdk_screen_get_default() still returns NULL. * gdk/win32/gdkdisplay-win32.c * gdk/win32/gdkscreen-win32.c: Make more like the linux-fb versions. For instance, don't call gdk_display_manager_set_default_display() from gdk_display_open(). * gdk/win32/gdkglobals-win32.c: Move _gdk_display, _gdk_screen and _gdk_parent_root here. * gdk/win32/gdkinput.c (gdk_display_list_devices): New function. * gdk/win32/gdkmain-win32.c (gdk_get_display): New function. * gdk/win32/gdkvisual-win32.c (gdk_screen_get_system_visual): Don't require that the screen parameter is non-NULL. It can be, and the linux-fb version doesn't check either. * gdk/win32/gdkwindow-win32.c (gdk_window_set_skip_taskbar_hint, gdk_window_set_skip_pager_hint, gdk_window_fullscreen, gdk_window_unfullscreen): Implement as no-ops.
This commit is contained in:
Tor Lillqvist
Tor Lillqvist
parent
3b4728be1d
commit
36a56b08e5
34
ChangeLog
34
ChangeLog
@ -1,3 +1,34 @@
|
||||
2002-11-16 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* gdk/gdk.def: Add missing entries, needed by gtk.
|
||||
|
||||
* gdk/win32/gdkcolor-win32.c (gdk_screen_get_system_colormap):
|
||||
Remove g_return_val_if_fail call. This function is called from
|
||||
gdk_display_open() with the _gdk_screen it just created, but when
|
||||
gdk_screen_get_default() still returns NULL.
|
||||
|
||||
* gdk/win32/gdkdisplay-win32.c
|
||||
* gdk/win32/gdkscreen-win32.c: Make more like the linux-fb
|
||||
versions. For instance, don't call
|
||||
gdk_display_manager_set_default_display() from gdk_display_open().
|
||||
|
||||
* gdk/win32/gdkglobals-win32.c: Move _gdk_display, _gdk_screen and
|
||||
_gdk_parent_root here.
|
||||
|
||||
* gdk/win32/gdkinput.c (gdk_display_list_devices): New function.
|
||||
|
||||
* gdk/win32/gdkmain-win32.c (gdk_get_display): New function.
|
||||
|
||||
* gdk/win32/gdkvisual-win32.c (gdk_screen_get_system_visual):
|
||||
Don't require that the screen parameter is non-NULL. It can be,
|
||||
and the linux-fb version doesn't check either.
|
||||
|
||||
* gdk/win32/gdkwindow-win32.c (gdk_window_set_skip_taskbar_hint,
|
||||
gdk_window_set_skip_pager_hint, gdk_window_fullscreen,
|
||||
gdk_window_unfullscreen): Implement as no-ops.
|
||||
|
||||
* gtk/gtk.def: Remove obsolete entries.
|
||||
|
||||
Fri Nov 15 19:12:56 2002 Jonathan Blandford <jrb@gnome.org>
|
||||
|
||||
* gtk/gtksettings.c: Allow g_object_set to work with GtkSettings.
|
||||
@ -18,8 +49,7 @@ Fri Nov 15 19:12:56 2002 Jonathan Blandford <jrb@gnome.org>
|
||||
Seems to work fine, now the check marks show up in check buttons,
|
||||
the stippled background and stippled text in gtk-demo's Text
|
||||
Widget look as they should, and GtkText's line wrap arrow shows
|
||||
correctly instead of an ugly rectangle. [This refers to the stable
|
||||
branch, haven't actually checked HEAD.]
|
||||
correctly instead of an ugly rectangle.
|
||||
|
||||
The implementation does do a lot of pixmap handling and blitting
|
||||
back and forth, especially on Win9x. But performance is hopefully
|
||||
|
||||
@ -1,3 +1,34 @@
|
||||
2002-11-16 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* gdk/gdk.def: Add missing entries, needed by gtk.
|
||||
|
||||
* gdk/win32/gdkcolor-win32.c (gdk_screen_get_system_colormap):
|
||||
Remove g_return_val_if_fail call. This function is called from
|
||||
gdk_display_open() with the _gdk_screen it just created, but when
|
||||
gdk_screen_get_default() still returns NULL.
|
||||
|
||||
* gdk/win32/gdkdisplay-win32.c
|
||||
* gdk/win32/gdkscreen-win32.c: Make more like the linux-fb
|
||||
versions. For instance, don't call
|
||||
gdk_display_manager_set_default_display() from gdk_display_open().
|
||||
|
||||
* gdk/win32/gdkglobals-win32.c: Move _gdk_display, _gdk_screen and
|
||||
_gdk_parent_root here.
|
||||
|
||||
* gdk/win32/gdkinput.c (gdk_display_list_devices): New function.
|
||||
|
||||
* gdk/win32/gdkmain-win32.c (gdk_get_display): New function.
|
||||
|
||||
* gdk/win32/gdkvisual-win32.c (gdk_screen_get_system_visual):
|
||||
Don't require that the screen parameter is non-NULL. It can be,
|
||||
and the linux-fb version doesn't check either.
|
||||
|
||||
* gdk/win32/gdkwindow-win32.c (gdk_window_set_skip_taskbar_hint,
|
||||
gdk_window_set_skip_pager_hint, gdk_window_fullscreen,
|
||||
gdk_window_unfullscreen): Implement as no-ops.
|
||||
|
||||
* gtk/gtk.def: Remove obsolete entries.
|
||||
|
||||
Fri Nov 15 19:12:56 2002 Jonathan Blandford <jrb@gnome.org>
|
||||
|
||||
* gtk/gtksettings.c: Allow g_object_set to work with GtkSettings.
|
||||
@ -18,8 +49,7 @@ Fri Nov 15 19:12:56 2002 Jonathan Blandford <jrb@gnome.org>
|
||||
Seems to work fine, now the check marks show up in check buttons,
|
||||
the stippled background and stippled text in gtk-demo's Text
|
||||
Widget look as they should, and GtkText's line wrap arrow shows
|
||||
correctly instead of an ugly rectangle. [This refers to the stable
|
||||
branch, haven't actually checked HEAD.]
|
||||
correctly instead of an ugly rectangle.
|
||||
|
||||
The implementation does do a lot of pixmap handling and blitting
|
||||
back and forth, especially on Win9x. But performance is hopefully
|
||||
|
||||
@ -1,3 +1,34 @@
|
||||
2002-11-16 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* gdk/gdk.def: Add missing entries, needed by gtk.
|
||||
|
||||
* gdk/win32/gdkcolor-win32.c (gdk_screen_get_system_colormap):
|
||||
Remove g_return_val_if_fail call. This function is called from
|
||||
gdk_display_open() with the _gdk_screen it just created, but when
|
||||
gdk_screen_get_default() still returns NULL.
|
||||
|
||||
* gdk/win32/gdkdisplay-win32.c
|
||||
* gdk/win32/gdkscreen-win32.c: Make more like the linux-fb
|
||||
versions. For instance, don't call
|
||||
gdk_display_manager_set_default_display() from gdk_display_open().
|
||||
|
||||
* gdk/win32/gdkglobals-win32.c: Move _gdk_display, _gdk_screen and
|
||||
_gdk_parent_root here.
|
||||
|
||||
* gdk/win32/gdkinput.c (gdk_display_list_devices): New function.
|
||||
|
||||
* gdk/win32/gdkmain-win32.c (gdk_get_display): New function.
|
||||
|
||||
* gdk/win32/gdkvisual-win32.c (gdk_screen_get_system_visual):
|
||||
Don't require that the screen parameter is non-NULL. It can be,
|
||||
and the linux-fb version doesn't check either.
|
||||
|
||||
* gdk/win32/gdkwindow-win32.c (gdk_window_set_skip_taskbar_hint,
|
||||
gdk_window_set_skip_pager_hint, gdk_window_fullscreen,
|
||||
gdk_window_unfullscreen): Implement as no-ops.
|
||||
|
||||
* gtk/gtk.def: Remove obsolete entries.
|
||||
|
||||
Fri Nov 15 19:12:56 2002 Jonathan Blandford <jrb@gnome.org>
|
||||
|
||||
* gtk/gtksettings.c: Allow g_object_set to work with GtkSettings.
|
||||
@ -18,8 +49,7 @@ Fri Nov 15 19:12:56 2002 Jonathan Blandford <jrb@gnome.org>
|
||||
Seems to work fine, now the check marks show up in check buttons,
|
||||
the stippled background and stippled text in gtk-demo's Text
|
||||
Widget look as they should, and GtkText's line wrap arrow shows
|
||||
correctly instead of an ugly rectangle. [This refers to the stable
|
||||
branch, haven't actually checked HEAD.]
|
||||
correctly instead of an ugly rectangle.
|
||||
|
||||
The implementation does do a lot of pixmap handling and blitting
|
||||
back and forth, especially on Win9x. But performance is hopefully
|
||||
|
||||
@ -1,3 +1,34 @@
|
||||
2002-11-16 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* gdk/gdk.def: Add missing entries, needed by gtk.
|
||||
|
||||
* gdk/win32/gdkcolor-win32.c (gdk_screen_get_system_colormap):
|
||||
Remove g_return_val_if_fail call. This function is called from
|
||||
gdk_display_open() with the _gdk_screen it just created, but when
|
||||
gdk_screen_get_default() still returns NULL.
|
||||
|
||||
* gdk/win32/gdkdisplay-win32.c
|
||||
* gdk/win32/gdkscreen-win32.c: Make more like the linux-fb
|
||||
versions. For instance, don't call
|
||||
gdk_display_manager_set_default_display() from gdk_display_open().
|
||||
|
||||
* gdk/win32/gdkglobals-win32.c: Move _gdk_display, _gdk_screen and
|
||||
_gdk_parent_root here.
|
||||
|
||||
* gdk/win32/gdkinput.c (gdk_display_list_devices): New function.
|
||||
|
||||
* gdk/win32/gdkmain-win32.c (gdk_get_display): New function.
|
||||
|
||||
* gdk/win32/gdkvisual-win32.c (gdk_screen_get_system_visual):
|
||||
Don't require that the screen parameter is non-NULL. It can be,
|
||||
and the linux-fb version doesn't check either.
|
||||
|
||||
* gdk/win32/gdkwindow-win32.c (gdk_window_set_skip_taskbar_hint,
|
||||
gdk_window_set_skip_pager_hint, gdk_window_fullscreen,
|
||||
gdk_window_unfullscreen): Implement as no-ops.
|
||||
|
||||
* gtk/gtk.def: Remove obsolete entries.
|
||||
|
||||
Fri Nov 15 19:12:56 2002 Jonathan Blandford <jrb@gnome.org>
|
||||
|
||||
* gtk/gtksettings.c: Allow g_object_set to work with GtkSettings.
|
||||
@ -18,8 +49,7 @@ Fri Nov 15 19:12:56 2002 Jonathan Blandford <jrb@gnome.org>
|
||||
Seems to work fine, now the check marks show up in check buttons,
|
||||
the stippled background and stippled text in gtk-demo's Text
|
||||
Widget look as they should, and GtkText's line wrap arrow shows
|
||||
correctly instead of an ugly rectangle. [This refers to the stable
|
||||
branch, haven't actually checked HEAD.]
|
||||
correctly instead of an ugly rectangle.
|
||||
|
||||
The implementation does do a lot of pixmap handling and blitting
|
||||
back and forth, especially on Win9x. But performance is hopefully
|
||||
|
||||
@ -1,3 +1,34 @@
|
||||
2002-11-16 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* gdk/gdk.def: Add missing entries, needed by gtk.
|
||||
|
||||
* gdk/win32/gdkcolor-win32.c (gdk_screen_get_system_colormap):
|
||||
Remove g_return_val_if_fail call. This function is called from
|
||||
gdk_display_open() with the _gdk_screen it just created, but when
|
||||
gdk_screen_get_default() still returns NULL.
|
||||
|
||||
* gdk/win32/gdkdisplay-win32.c
|
||||
* gdk/win32/gdkscreen-win32.c: Make more like the linux-fb
|
||||
versions. For instance, don't call
|
||||
gdk_display_manager_set_default_display() from gdk_display_open().
|
||||
|
||||
* gdk/win32/gdkglobals-win32.c: Move _gdk_display, _gdk_screen and
|
||||
_gdk_parent_root here.
|
||||
|
||||
* gdk/win32/gdkinput.c (gdk_display_list_devices): New function.
|
||||
|
||||
* gdk/win32/gdkmain-win32.c (gdk_get_display): New function.
|
||||
|
||||
* gdk/win32/gdkvisual-win32.c (gdk_screen_get_system_visual):
|
||||
Don't require that the screen parameter is non-NULL. It can be,
|
||||
and the linux-fb version doesn't check either.
|
||||
|
||||
* gdk/win32/gdkwindow-win32.c (gdk_window_set_skip_taskbar_hint,
|
||||
gdk_window_set_skip_pager_hint, gdk_window_fullscreen,
|
||||
gdk_window_unfullscreen): Implement as no-ops.
|
||||
|
||||
* gtk/gtk.def: Remove obsolete entries.
|
||||
|
||||
Fri Nov 15 19:12:56 2002 Jonathan Blandford <jrb@gnome.org>
|
||||
|
||||
* gtk/gtksettings.c: Allow g_object_set to work with GtkSettings.
|
||||
@ -18,8 +49,7 @@ Fri Nov 15 19:12:56 2002 Jonathan Blandford <jrb@gnome.org>
|
||||
Seems to work fine, now the check marks show up in check buttons,
|
||||
the stippled background and stippled text in gtk-demo's Text
|
||||
Widget look as they should, and GtkText's line wrap arrow shows
|
||||
correctly instead of an ugly rectangle. [This refers to the stable
|
||||
branch, haven't actually checked HEAD.]
|
||||
correctly instead of an ugly rectangle.
|
||||
|
||||
The implementation does do a lot of pixmap handling and blitting
|
||||
back and forth, especially on Win9x. But performance is hopefully
|
||||
|
||||
@ -1,3 +1,34 @@
|
||||
2002-11-16 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* gdk/gdk.def: Add missing entries, needed by gtk.
|
||||
|
||||
* gdk/win32/gdkcolor-win32.c (gdk_screen_get_system_colormap):
|
||||
Remove g_return_val_if_fail call. This function is called from
|
||||
gdk_display_open() with the _gdk_screen it just created, but when
|
||||
gdk_screen_get_default() still returns NULL.
|
||||
|
||||
* gdk/win32/gdkdisplay-win32.c
|
||||
* gdk/win32/gdkscreen-win32.c: Make more like the linux-fb
|
||||
versions. For instance, don't call
|
||||
gdk_display_manager_set_default_display() from gdk_display_open().
|
||||
|
||||
* gdk/win32/gdkglobals-win32.c: Move _gdk_display, _gdk_screen and
|
||||
_gdk_parent_root here.
|
||||
|
||||
* gdk/win32/gdkinput.c (gdk_display_list_devices): New function.
|
||||
|
||||
* gdk/win32/gdkmain-win32.c (gdk_get_display): New function.
|
||||
|
||||
* gdk/win32/gdkvisual-win32.c (gdk_screen_get_system_visual):
|
||||
Don't require that the screen parameter is non-NULL. It can be,
|
||||
and the linux-fb version doesn't check either.
|
||||
|
||||
* gdk/win32/gdkwindow-win32.c (gdk_window_set_skip_taskbar_hint,
|
||||
gdk_window_set_skip_pager_hint, gdk_window_fullscreen,
|
||||
gdk_window_unfullscreen): Implement as no-ops.
|
||||
|
||||
* gtk/gtk.def: Remove obsolete entries.
|
||||
|
||||
Fri Nov 15 19:12:56 2002 Jonathan Blandford <jrb@gnome.org>
|
||||
|
||||
* gtk/gtksettings.c: Allow g_object_set to work with GtkSettings.
|
||||
@ -18,8 +49,7 @@ Fri Nov 15 19:12:56 2002 Jonathan Blandford <jrb@gnome.org>
|
||||
Seems to work fine, now the check marks show up in check buttons,
|
||||
the stippled background and stippled text in gtk-demo's Text
|
||||
Widget look as they should, and GtkText's line wrap arrow shows
|
||||
correctly instead of an ugly rectangle. [This refers to the stable
|
||||
branch, haven't actually checked HEAD.]
|
||||
correctly instead of an ugly rectangle.
|
||||
|
||||
The implementation does do a lot of pixmap handling and blitting
|
||||
back and forth, especially on Win9x. But performance is hopefully
|
||||
|
||||
20
gdk/gdk.def
20
gdk/gdk.def
@ -58,16 +58,23 @@ EXPORTS
|
||||
gdk_device_set_source
|
||||
gdk_devices_list
|
||||
gdk_display_beep
|
||||
gdk_display_get_core_pointer
|
||||
gdk_display_get_default
|
||||
gdk_display_get_default_screen
|
||||
gdk_display_get_name
|
||||
gdk_display_get_n_screens
|
||||
gdk_display_get_pointer
|
||||
gdk_display_get_screen
|
||||
gdk_display_get_type
|
||||
gdk_display_get_window_at_pointer
|
||||
gdk_display_keyboard_ungrab
|
||||
gdk_display_list_devices
|
||||
gdk_display_manager_get
|
||||
gdk_display_open
|
||||
gdk_display_open_default_libgtk_only
|
||||
gdk_display_pointer_is_grabbed
|
||||
gdk_display_pointer_ungrab
|
||||
gdk_display_set_double_click_time
|
||||
gdk_display_sync
|
||||
gdk_drag_abort
|
||||
gdk_drag_action_get_type
|
||||
@ -78,6 +85,7 @@ EXPORTS
|
||||
gdk_drag_context_unref
|
||||
gdk_drag_drop
|
||||
gdk_drag_find_window
|
||||
gdk_drag_find_window_for_screen
|
||||
gdk_drag_get_protocol
|
||||
gdk_drag_get_selection
|
||||
gdk_drag_motion
|
||||
@ -95,6 +103,7 @@ EXPORTS
|
||||
gdk_draw_layout_with_colors
|
||||
gdk_draw_line
|
||||
gdk_draw_lines
|
||||
gdk_draw_pixbuf
|
||||
gdk_draw_point
|
||||
gdk_draw_points
|
||||
gdk_draw_polygon
|
||||
@ -134,11 +143,13 @@ EXPORTS
|
||||
gdk_event_get_coords
|
||||
gdk_event_get_graphics_expose
|
||||
gdk_event_get_root_coords
|
||||
gdk_event_get_screen
|
||||
gdk_event_get_state
|
||||
gdk_event_get_time
|
||||
gdk_event_get_type
|
||||
gdk_event_handler_set
|
||||
gdk_event_mask_get_type
|
||||
gdk_event_new
|
||||
gdk_event_peek
|
||||
gdk_event_put
|
||||
gdk_event_send_client_message
|
||||
@ -197,6 +208,7 @@ EXPORTS
|
||||
gdk_gc_unref
|
||||
gdk_gc_values_mask_get_type
|
||||
gdk_get_default_root_window
|
||||
gdk_get_display
|
||||
gdk_get_display_arg_name
|
||||
gdk_get_program_class
|
||||
gdk_get_show_events
|
||||
@ -248,6 +260,7 @@ EXPORTS
|
||||
gdk_list_visuals
|
||||
gdk_mbstowcs
|
||||
gdk_modifier_type_get_type
|
||||
gdk_notify_startup_complete
|
||||
gdk_notify_type_get_type
|
||||
gdk_overlap_type_get_type
|
||||
gdk_pango_attr_embossed_new
|
||||
@ -257,6 +270,7 @@ EXPORTS
|
||||
gdk_pango_context_set_colormap
|
||||
gdk_pango_layout_get_clip_region
|
||||
gdk_pango_layout_line_get_clip_region
|
||||
gdk_parse_args
|
||||
gdk_pixbuf_get_from_drawable
|
||||
gdk_pixbuf_get_from_image
|
||||
gdk_pixbuf_render_pixmap_and_mask
|
||||
@ -325,7 +339,9 @@ EXPORTS
|
||||
gdk_screen_get_display
|
||||
gdk_screen_get_height
|
||||
gdk_screen_get_monitor_at_point
|
||||
gdk_screen_get_monitor_at_window
|
||||
gdk_screen_get_monitor_geometry
|
||||
gdk_screen_get_n_monitors
|
||||
gdk_screen_get_number
|
||||
gdk_screen_get_rgb_colormap
|
||||
gdk_screen_get_rgb_visual
|
||||
@ -419,6 +435,7 @@ EXPORTS
|
||||
gdk_window_foreign_new
|
||||
gdk_window_foreign_new_for_display
|
||||
gdk_window_freeze_updates
|
||||
gdk_window_fullscreen
|
||||
gdk_window_get_children
|
||||
gdk_window_get_deskrelative_origin
|
||||
gdk_window_get_events
|
||||
@ -479,6 +496,8 @@ EXPORTS
|
||||
gdk_window_set_modal_hint
|
||||
gdk_window_set_override_redirect
|
||||
gdk_window_set_role
|
||||
gdk_window_set_skip_pager_hint
|
||||
gdk_window_set_skip_taskbar_hint
|
||||
gdk_window_set_static_gravities
|
||||
gdk_window_set_title
|
||||
gdk_window_set_transient_for
|
||||
@ -493,6 +512,7 @@ EXPORTS
|
||||
gdk_window_thaw_updates
|
||||
gdk_window_type_get_type
|
||||
gdk_window_type_hint_get_type
|
||||
gdk_window_unfullscreen
|
||||
gdk_window_unmaximize
|
||||
gdk_window_unstick
|
||||
gdk_window_withdraw
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
#include <string.h>
|
||||
|
||||
#include "gdkcolor.h"
|
||||
#include "gdkscreen.h" /* gdk_screen_get_default() */
|
||||
#include "gdkscreen.h"
|
||||
#include "gdkinternals.h"
|
||||
#include "gdkprivate-win32.h"
|
||||
|
||||
@ -599,8 +599,6 @@ gdk_screen_get_system_colormap (GdkScreen *screen)
|
||||
static GdkColormap *colormap = NULL;
|
||||
GdkColormapPrivateWin32 *private;
|
||||
|
||||
g_return_val_if_fail (screen == gdk_screen_get_default (), NULL);
|
||||
|
||||
if (!colormap)
|
||||
{
|
||||
colormap = g_object_new (gdk_colormap_get_type (), NULL);
|
||||
|
||||
@ -17,14 +17,9 @@
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#include "gdk.h" /* gdk_get_display_arg_name() */
|
||||
#include "gdkdisplay.h"
|
||||
#include "gdkscreen.h"
|
||||
#include "gdk.h"
|
||||
#include "gdkprivate-win32.h"
|
||||
|
||||
GdkDisplay *_gdk_display = NULL;
|
||||
GdkScreen *_gdk_screen = NULL;
|
||||
|
||||
void
|
||||
_gdk_windowing_set_default_display (GdkDisplay *display)
|
||||
{
|
||||
@ -40,9 +35,6 @@ gdk_display_open (const gchar *display_name)
|
||||
_gdk_display = g_object_new (GDK_TYPE_DISPLAY, NULL);
|
||||
_gdk_screen = g_object_new (GDK_TYPE_SCREEN, NULL);
|
||||
|
||||
gdk_display_manager_set_default_display (gdk_display_manager_get (),
|
||||
_gdk_display);
|
||||
|
||||
_gdk_visual_init ();
|
||||
gdk_screen_set_default_colormap (_gdk_screen,
|
||||
gdk_screen_get_system_colormap (_gdk_screen));
|
||||
@ -52,17 +44,20 @@ gdk_display_open (const gchar *display_name)
|
||||
_gdk_input_init (_gdk_display);
|
||||
_gdk_dnd_init ();
|
||||
|
||||
g_signal_emit_by_name (gdk_display_manager_get (),
|
||||
"display_opened", _gdk_display);
|
||||
|
||||
return _gdk_display;
|
||||
}
|
||||
|
||||
G_CONST_RETURN gchar*
|
||||
gdk_display_get_display_name (GdkDisplay *display)
|
||||
G_CONST_RETURN gchar *
|
||||
gdk_display_get_name (GdkDisplay *display)
|
||||
{
|
||||
return gdk_get_display_arg_name ();
|
||||
}
|
||||
|
||||
gint
|
||||
gdk_display_get_n_screens (GdkDisplay * display)
|
||||
gdk_display_get_n_screens (GdkDisplay *display)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
@ -71,13 +66,11 @@ GdkScreen *
|
||||
gdk_display_get_screen (GdkDisplay *display,
|
||||
gint screen_num)
|
||||
{
|
||||
g_return_val_if_fail (screen_num == 0, _gdk_screen);
|
||||
|
||||
return _gdk_screen;
|
||||
}
|
||||
|
||||
GdkScreen *
|
||||
gdk_display_get_default_screen (GdkDisplay * display)
|
||||
gdk_display_get_default_screen (GdkDisplay *display)
|
||||
{
|
||||
return _gdk_screen;
|
||||
}
|
||||
|
||||
@ -28,6 +28,10 @@
|
||||
#include "gdktypes.h"
|
||||
#include "gdkprivate-win32.h"
|
||||
|
||||
GdkDisplay *_gdk_display = NULL;
|
||||
GdkScreen *_gdk_screen = NULL;
|
||||
GdkWindow *_gdk_parent_root = NULL;
|
||||
|
||||
HWND _gdk_root_window = NULL;
|
||||
HDC _gdk_display_hdc;
|
||||
HINSTANCE _gdk_dll_hinstance;
|
||||
|
||||
@ -122,6 +122,12 @@ gdk_devices_list (void)
|
||||
return _gdk_input_devices;
|
||||
}
|
||||
|
||||
GList *
|
||||
gdk_display_list_devices (GdkDisplay *dpy)
|
||||
{
|
||||
return _gdk_input_devices;
|
||||
}
|
||||
|
||||
void
|
||||
gdk_device_set_source (GdkDevice *device,
|
||||
GdkInputSource source)
|
||||
|
||||
@ -212,6 +212,12 @@ _gdk_windowing_exit (void)
|
||||
_gdk_display_hdc = NULL;
|
||||
}
|
||||
|
||||
gchar *
|
||||
gdk_get_display (void)
|
||||
{
|
||||
return g_strdup (gdk_display_get_name (gdk_display_get_default ()));
|
||||
}
|
||||
|
||||
void
|
||||
gdk_error_trap_push (void)
|
||||
{
|
||||
|
||||
@ -456,6 +456,9 @@ extern LRESULT CALLBACK _gdk_win32_window_procedure (HWND, UINT, WPARAM, LPARAM)
|
||||
extern HWND _gdk_root_window;
|
||||
extern GdkWindow *_gdk_parent_root;
|
||||
|
||||
extern GdkDisplay *_gdk_display;
|
||||
extern GdkScreen *_gdk_screen;
|
||||
|
||||
extern HDC _gdk_display_hdc;
|
||||
extern HINSTANCE _gdk_dll_hinstance;
|
||||
extern HINSTANCE _gdk_app_hmodule;
|
||||
|
||||
@ -17,22 +17,15 @@
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#include <gdkscreen.h>
|
||||
#include "gdkprivate-win32.h" /* _gdk_parent_root */
|
||||
#include "gdk.h" /* gdk_screen_width(), ... */
|
||||
#include "gdk.h"
|
||||
#include "gdkprivate-win32.h"
|
||||
|
||||
static GdkColormap *default_colormap = NULL;
|
||||
|
||||
GdkDisplay *
|
||||
gdk_screen_get_display (GdkScreen *screen)
|
||||
{
|
||||
return gdk_display_get_default ();
|
||||
}
|
||||
|
||||
gint
|
||||
gdk_screen_get_screen_num (GdkScreen *screen)
|
||||
{
|
||||
return 1;
|
||||
return _gdk_display;
|
||||
}
|
||||
|
||||
GdkWindow *
|
||||
@ -54,7 +47,7 @@ gdk_screen_set_default_colormap (GdkScreen *screen,
|
||||
default_colormap = colormap;
|
||||
}
|
||||
|
||||
gint
|
||||
gint
|
||||
gdk_screen_get_n_monitors (GdkScreen *screen)
|
||||
{
|
||||
g_return_val_if_fail (GDK_IS_SCREEN (screen), 1);
|
||||
|
||||
@ -303,9 +303,7 @@ gdk_visual_get_best_type (void)
|
||||
GdkVisual*
|
||||
gdk_screen_get_system_visual (GdkScreen *screen)
|
||||
{
|
||||
g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
|
||||
|
||||
return ((GdkVisual*) system_visual);
|
||||
return system_visual;
|
||||
}
|
||||
|
||||
GdkVisual*
|
||||
|
||||
@ -48,8 +48,6 @@ static void gdk_window_impl_win32_finalize (GObject *object);
|
||||
|
||||
static gpointer parent_class = NULL;
|
||||
|
||||
GdkWindow *_gdk_parent_root = NULL;
|
||||
|
||||
GType
|
||||
_gdk_window_impl_win32_get_type (void)
|
||||
{
|
||||
@ -2459,6 +2457,20 @@ gdk_window_unmaximize (GdkWindow *window)
|
||||
0);
|
||||
}
|
||||
|
||||
void
|
||||
gdk_window_fullscreen (GdkWindow *window)
|
||||
{
|
||||
g_return_if_fail (GDK_IS_WINDOW (window));
|
||||
|
||||
g_warning ("gdk_window_fullscreen() not implemented.\n");
|
||||
}
|
||||
|
||||
void
|
||||
gdk_window_unfullscreen (GdkWindow *window)
|
||||
{
|
||||
g_return_if_fail (GDK_IS_WINDOW (window));
|
||||
}
|
||||
|
||||
void
|
||||
gdk_window_focus (GdkWindow *window,
|
||||
guint32 timestamp)
|
||||
@ -2496,6 +2508,20 @@ gdk_window_set_modal_hint (GdkWindow *window,
|
||||
WIN32_API_FAILED ("SetWindowPos");
|
||||
}
|
||||
|
||||
void
|
||||
gdk_window_set_skip_taskbar_hint (GdkWindow *window,
|
||||
gboolean skips_taskbar)
|
||||
{
|
||||
g_return_if_fail (GDK_IS_WINDOW (window));
|
||||
}
|
||||
|
||||
void
|
||||
gdk_window_set_skip_pager_hint (GdkWindow *window,
|
||||
gboolean skips_pager)
|
||||
{
|
||||
g_return_if_fail (GDK_IS_WINDOW (window));
|
||||
}
|
||||
|
||||
void
|
||||
gdk_window_set_type_hint (GdkWindow *window,
|
||||
GdkWindowTypeHint hint)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user