AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'win32-gir' into 'main'

Browse Source 
gdk/win32: do not expose gdk_win32_*_libgtk_only in public headers

See merge request GNOME/gtk!4980
This commit is contained in:
Luca Bacci 2022-08-26 13:14:30 +00:00
commit 3abc3425cb
11 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdk/win32/gdkdevice-win32.c
View File

@ -105,7 +105,7 @@ gdk_device_win32_query_state (GdkDevice *device,
hwndc = ChildWindowFromPoint (hwnd, point);
if (hwndc && hwndc != hwnd)
*child_window = gdk_win32_handle_table_lookup (hwndc);
*child_window = gdk_win32_handle_table_lookup_ (hwndc);
else
*child_window = NULL; /* Direct child unknown to gdk */
}
@ -183,7 +183,7 @@ _gdk_device_win32_surface_at_position (GdkDevice *device,
if (!PtInRect (&rect, client_pt))
hwnd = NULL;
window = gdk_win32_handle_table_lookup (hwnd);
window = gdk_win32_handle_table_lookup_ (hwnd);
if (window && (win_x || win_y))
{

4
gdk/win32/gdkdevice-winpointer.c
View File

@ -96,7 +96,7 @@ gdk_device_winpointer_query_state (GdkDevice *device,
hwndc = ChildWindowFromPoint (hwnd, point);
if (hwndc && hwndc != hwnd)
*child_window = gdk_win32_handle_table_lookup (hwndc);
*child_window = gdk_win32_handle_table_lookup_ (hwndc);
else
*child_window = NULL; /* Direct child unknown to gdk */
}
@ -160,7 +160,7 @@ gdk_device_winpointer_surface_at_position (GdkDevice *device,
if (!PtInRect (&rect, client_pt))
hwnd = NULL;
surface = gdk_win32_handle_table_lookup (hwnd);
surface = gdk_win32_handle_table_lookup_ (hwnd);
if (surface && (win_x || win_y))
{

2
gdk/win32/gdkdevice-wintab.c
View File

@ -104,7 +104,7 @@ gdk_device_wintab_query_state (GdkDevice *device,
hwndc = ChildWindowFromPoint (hwnd, point);
if (hwndc && hwndc != hwnd)
*child_window = gdk_win32_handle_table_lookup (hwndc);
*child_window = gdk_win32_handle_table_lookup_ (hwndc);
else
*child_window = NULL; /* Direct child unknown to gdk */
}

2
gdk/win32/gdkdisplay-win32.c
View File

@ -1247,6 +1247,8 @@ gdk_win32_display_init_gl (GdkDisplay *display,
* Retrieves the EGL display connection object for the given GDK display.
*
* Returns: (nullable): the EGL display
*
* Since: 4.4
*/
gpointer
gdk_win32_display_get_egl_display (GdkDisplay *display)

14
gdk/win32/gdkevents-win32.c
View File

@ -388,7 +388,7 @@ low_level_keyboard_proc (int code,
if (kbd_focus_owner == NULL)
break;
gdk_kbd_focus_owner = gdk_win32_handle_table_lookup (kbd_focus_owner);
gdk_kbd_focus_owner = gdk_win32_handle_table_lookup_ (kbd_focus_owner);
if (gdk_kbd_focus_owner == NULL)
break;
@ -618,7 +618,7 @@ find_window_for_mouse_event (GdkSurface* reported_window,
ScreenToClient (hwnd, &client_pt);
GetClientRect (hwnd, &rect);
if (PtInRect (&rect, client_pt))
event_surface = gdk_win32_handle_table_lookup (hwnd);
event_surface = gdk_win32_handle_table_lookup_ (hwnd);
}
if (event_surface == NULL)
event_surface = grab->surface;
@ -1782,7 +1782,7 @@ gdk_event_translate (MSG *msg,
return TRUE;
}
window = gdk_win32_handle_table_lookup (msg->hwnd);
window = gdk_win32_handle_table_lookup_ (msg->hwnd);
if (window == NULL)
{
@ -2297,7 +2297,7 @@ gdk_event_translate (MSG *msg,
ScreenToClient (hwnd, &client_pt);
GetClientRect (hwnd, &rect);
if (PtInRect (&rect, client_pt))
new_window = gdk_win32_handle_table_lookup (hwnd);
new_window = gdk_win32_handle_table_lookup_ (hwnd);
}
synthesize_crossing_events (display,
@ -2438,7 +2438,7 @@ gdk_event_translate (MSG *msg,
ScreenToClient (hwnd, &client_pt);
GetClientRect (hwnd, &rect);
if (PtInRect (&rect, client_pt))
new_window = gdk_win32_handle_table_lookup (hwnd);
new_window = gdk_win32_handle_table_lookup_ (hwnd);
}
if (!ignore_leave)
@ -2716,7 +2716,7 @@ gdk_event_translate (MSG *msg,
msg->hwnd = hwnd;
g_set_object (&window, gdk_win32_handle_table_lookup (hwnd));
g_set_object (&window, gdk_win32_handle_table_lookup_ (hwnd));
if (!window)
break;
@ -3246,7 +3246,7 @@ gdk_event_translate (MSG *msg,
{
if (msg->lParam != 0)
{
GdkSurface *other_surface = gdk_win32_handle_table_lookup ((HWND) msg->lParam);
GdkSurface *other_surface = gdk_win32_handle_table_lookup_ ((HWND) msg->lParam);
if (other_surface != NULL &&
(GDK_IS_POPUP (other_surface) || GDK_IS_DRAG_SURFACE (other_surface)))
{

8
gdk/win32/gdkprivate-win32.h
View File

@ -441,4 +441,12 @@ typedef enum _GdkWin32ProcessorCheckType
gboolean _gdk_win32_check_processor (GdkWin32ProcessorCheckType check_type);
GdkPixbuf *gdk_win32_icon_to_pixbuf_libgtk_only (HICON hicon,
double *x_hot,
double *y_hot);
HICON gdk_win32_pixbuf_to_hicon_libgtk_only (GdkPixbuf *pixbuf);
void gdk_win32_set_modal_dialog_libgtk_only (HWND window);
gpointer gdk_win32_handle_table_lookup_ (HWND handle);
#endif /* __GDK_PRIVATE_WIN32_H__ */

2
gdk/win32/gdksurface-win32.c
View File

@ -4259,7 +4259,7 @@ gdk_win32_surface_lookup_for_display (GdkDisplay *display,
{
g_return_val_if_fail (display == gdk_display_get_default (), NULL);
return (GdkSurface*) gdk_win32_handle_table_lookup (anid);
return (GdkSurface*) gdk_win32_handle_table_lookup_ (anid);
}
/**

8
gdk/win32/gdkwin32id.c
View File

@ -70,7 +70,7 @@ gdk_win32_handle_table_remove (HANDLE handle)
}
gpointer
gdk_win32_handle_table_lookup (HWND handle)
gdk_win32_handle_table_lookup_ (HWND handle)
{
gpointer data = NULL;
@ -79,3 +79,9 @@ gdk_win32_handle_table_lookup (HWND handle)
return data;
}
gpointer
gdk_win32_handle_table_lookup (HWND handle)
{
return gdk_win32_handle_table_lookup_ (handle);
}

18
gdk/win32/gdkwin32misc.h
View File

@ -73,9 +73,9 @@ gboolean gdk_win32_surface_is_win32 (GdkSurface *surface);
GDK_DEPRECATED_IN_4_8_FOR(gdk_win32_surface_get_handle)
HWND gdk_win32_surface_get_impl_hwnd (GdkSurface *surface);
/* Return the Gdk* for a particular HANDLE */
GDK_AVAILABLE_IN_ALL
GDK_DEPRECATED_IN_4_8
gpointer gdk_win32_handle_table_lookup (HWND handle);
/* Translate from window to Windows handle */
GDK_AVAILABLE_IN_ALL
HWND gdk_win32_surface_get_handle (GdkSurface *surface);
@ -84,20 +84,6 @@ GDK_AVAILABLE_IN_ALL
GdkSurface * gdk_win32_surface_lookup_for_display (GdkDisplay *display,
HWND anid);
#if defined (INSIDE_GDK_WIN32) || defined (GTK_COMPILATION) || defined (GTK_COMPILATION)
/* For internal GTK use only */
GDK_AVAILABLE_IN_ALL
GdkPixbuf *gdk_win32_icon_to_pixbuf_libgtk_only (HICON hicon,
double *x_hot,
double *y_hot);
GDK_AVAILABLE_IN_ALL
HICON gdk_win32_pixbuf_to_hicon_libgtk_only (GdkPixbuf *pixbuf);
GDK_AVAILABLE_IN_ALL
void gdk_win32_set_modal_dialog_libgtk_only (HWND window);
#endif
G_END_DECLS
#endif /* __GDK_WIN32_MISC_H__ */

1
gtk/gtkicontheme.c
View File

@ -36,6 +36,7 @@
#include <windows.h>
#include <shellapi.h>
#include "win32/gdkwin32.h"
#include "win32/gdkprivate-win32.h"
#endif /* G_OS_WIN32 */
#include "gtkiconthemeprivate.h"

1
gtk/gtkprintoperation-win32.c
View File

@ -45,6 +45,7 @@
#include "gtkprivate.h"
#include "gtkwidgetprivate.h"
#include "gtknative.h"
#include "win32/gdkprivate-win32.h"
#define MAX_PAGE_RANGES 20
#define STATUS_POLLING_TIME 2000