Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/windows-msvc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ jobs:
id: cache
with:
path: c:/gnome
key: ${{ runner.os }}-gtk4-17.2
key: ${{ runner.os }}-gtk4-18
restore-keys: |
${{ runner.os }}-gtk4-17.2
${{ runner.os }}-gtk4-18

- name: Set up the PATH environment
run: |
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
uses: actions-rs/cargo@v1
with:
command: build
args: --features egl,win32 --manifest-path ./gdk4-win32/Cargo.toml
args: --features v4_18,egl,win32 --manifest-path ./gdk4-win32/Cargo.toml
- name: Clippy gdk-win32
uses: actions-rs/cargo@v1
with:
Expand Down
4 changes: 2 additions & 2 deletions gdk4-macos/src/auto/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 5ce24253f28c)
from gir-files (https://github.com/gtk-rs/gir-files @ 07aa7d177618)
Generated by gir (https://github.com/gtk-rs/gir @ b77ba3072803)
from gir-files (https://github.com/gtk-rs/gir-files @ 8245e53156fd)
4 changes: 2 additions & 2 deletions gdk4-macos/sys/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 5ce24253f28c)
from gir-files (https://github.com/gtk-rs/gir-files @ 07aa7d177618)
Generated by gir (https://github.com/gtk-rs/gir @ b77ba3072803)
from gir-files (https://github.com/gtk-rs/gir-files @ 8245e53156fd)
4 changes: 2 additions & 2 deletions gdk4-wayland/src/auto/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 5ce24253f28c)
from gir-files (https://github.com/gtk-rs/gir-files @ 07aa7d177618)
Generated by gir (https://github.com/gtk-rs/gir @ b77ba3072803)
from gir-files (https://github.com/gtk-rs/gir-files @ 8245e53156fd)
2 changes: 1 addition & 1 deletion gdk4-wayland/sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ version = "4.12"
version = "4.16"

[package.metadata.system-deps.gtk4_wayland.v4_18]
version = "4.17"
version = "4.18"

[package.metadata.docs.rs]
rustc-args = ["--cfg", "docsrs"]
Expand Down
4 changes: 2 additions & 2 deletions gdk4-wayland/sys/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 5ce24253f28c)
from gir-files (https://github.com/gtk-rs/gir-files @ 07aa7d177618)
Generated by gir (https://github.com/gtk-rs/gir @ b77ba3072803)
from gir-files (https://github.com/gtk-rs/gir-files @ 8245e53156fd)
1 change: 1 addition & 0 deletions gdk4-win32/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ version = "4"
[features]
v4_4 = ["gdk4-win32-sys/v4_4", "gdk/v4_4"]
v4_8 = ["v4_4", "gdk4-win32-sys/v4_8", "gdk/v4_8"]
v4_18 = ["v4_8"]
egl = ["khronos-egl"]
win32 = ["windows"]

Expand Down
8 changes: 7 additions & 1 deletion gdk4-win32/Gir.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ generate = [
"GdkWin32.Win32GLContext",
"GdkWin32.Win32MessageFilterReturn",
"GdkWin32.Win32Monitor",
"GdkWin32.Win32Screen",
]

manual = [
Expand Down Expand Up @@ -111,6 +110,13 @@ status = "generate"
name = "handle"
manual = true

[[object]]
name = "GdkWin32.Win32Screen"
status = "generate"
[[object.property]]
name = "display"
version = "4.18"

[[object]]
name = "GdkWin32.Win32Surface"
status = "generate"
Expand Down
1 change: 1 addition & 0 deletions gdk4-win32/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ gdk-win32 = { git = "https://github.com/gtk-rs/gtk4-rs.git", package = "gdk4-win

| Feature | Description |
| --- | ----------- |
| `v4_18` | Enable the new APIs part of GTK 4.18 |
| `v4_4` | Enable the new APIs part of GTK 4.4 |
| `egl` | Integration with the [khronos-egl](https://crates.io/crates/khronos-egl) crate |
| `win32` | Integration with the [windows](https://crates.io/crates/windows) crate |
Expand Down
4 changes: 2 additions & 2 deletions gdk4-win32/src/auto/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 5ce24253f28c)
from gir-files (https://github.com/gtk-rs/gir-files @ 07aa7d177618)
Generated by gir (https://github.com/gtk-rs/gir @ b77ba3072803)
from gir-files (https://github.com/gtk-rs/gir-files @ 8245e53156fd)
11 changes: 10 additions & 1 deletion gdk4-win32/src/auto/win32_screen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
// DO NOT EDIT

use crate::ffi;
#[cfg(feature = "v4_18")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_18")))]
use glib::{prelude::*, translate::*};

glib::wrapper! {
#[doc(alias = "GdkWin32Screen")]
Expand All @@ -13,4 +16,10 @@ glib::wrapper! {
}
}

impl Win32Screen {}
impl Win32Screen {
#[cfg(feature = "v4_18")]
#[cfg_attr(docsrs, doc(cfg(feature = "v4_18")))]
pub fn display(&self) -> Option<gdk::Display> {
ObjectExt::property(self, "display")
}
}
4 changes: 2 additions & 2 deletions gdk4-win32/sys/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 5ce24253f28c)
from gir-files (https://github.com/gtk-rs/gir-files @ 07aa7d177618)
Generated by gir (https://github.com/gtk-rs/gir @ b77ba3072803)
from gir-files (https://github.com/gtk-rs/gir-files @ 8245e53156fd)
4 changes: 2 additions & 2 deletions gdk4-x11/src/auto/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 5ce24253f28c)
from gir-files (https://github.com/gtk-rs/gir-files @ 07aa7d177618)
Generated by gir (https://github.com/gtk-rs/gir @ b77ba3072803)
from gir-files (https://github.com/gtk-rs/gir-files @ 8245e53156fd)
2 changes: 1 addition & 1 deletion gdk4-x11/sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ version = "4.10"
version = "4.16"

[package.metadata.system-deps.gtk4_x11.v4_18]
version = "4.17"
version = "4.18"

[package.metadata.docs.rs]
rustc-args = ["--cfg", "docsrs"]
Expand Down
4 changes: 2 additions & 2 deletions gdk4-x11/sys/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 5ce24253f28c)
from gir-files (https://github.com/gtk-rs/gir-files @ 07aa7d177618)
Generated by gir (https://github.com/gtk-rs/gir @ b77ba3072803)
from gir-files (https://github.com/gtk-rs/gir-files @ 8245e53156fd)
2 changes: 1 addition & 1 deletion gdk4/src/auto/clipboard.rs
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ impl Clipboard {
user_data: glib::ffi::gpointer,
) {
let mut error = std::ptr::null_mut();
let _ = ffi::gdk_clipboard_store_finish(_source_object as *mut _, res, &mut error);
ffi::gdk_clipboard_store_finish(_source_object as *mut _, res, &mut error);
let result = if error.is_null() {
Ok(())
} else {
Expand Down
2 changes: 1 addition & 1 deletion gdk4/src/auto/content_provider.rs
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ pub trait ContentProviderExt: IsA<ContentProvider> + 'static {
user_data: glib::ffi::gpointer,
) {
let mut error = std::ptr::null_mut();
let _ = ffi::gdk_content_provider_write_mime_type_finish(
ffi::gdk_content_provider_write_mime_type_finish(
_source_object as *mut _,
res,
&mut error,
Expand Down
2 changes: 2 additions & 0 deletions gdk4/src/auto/surface.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ pub trait SurfaceExt: IsA<Surface> + 'static {
}
}

#[cfg_attr(feature = "v4_18", deprecated = "Since 4.18")]
#[allow(deprecated)]
#[doc(alias = "gdk_surface_create_cairo_context")]
fn create_cairo_context(&self) -> CairoContext {
unsafe {
Expand Down
4 changes: 2 additions & 2 deletions gdk4/src/auto/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 5ce24253f28c)
from gir-files (https://github.com/gtk-rs/gir-files @ 07aa7d177618)
Generated by gir (https://github.com/gtk-rs/gir @ b77ba3072803)
from gir-files (https://github.com/gtk-rs/gir-files @ 8245e53156fd)
2 changes: 1 addition & 1 deletion gdk4/sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ version = "4.14"
version = "4.16"

[package.metadata.system-deps.gtk4.v4_18]
version = "4.17"
version = "4.18"

[package.metadata.docs.rs]
rustc-args = ["--cfg", "docsrs"]
Expand Down
4 changes: 2 additions & 2 deletions gdk4/sys/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 5ce24253f28c)
from gir-files (https://github.com/gtk-rs/gir-files @ 07aa7d177618)
Generated by gir (https://github.com/gtk-rs/gir @ b77ba3072803)
from gir-files (https://github.com/gtk-rs/gir-files @ 8245e53156fd)
2 changes: 1 addition & 1 deletion gir
4 changes: 2 additions & 2 deletions gsk4/src/auto/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 5ce24253f28c)
from gir-files (https://github.com/gtk-rs/gir-files @ 07aa7d177618)
Generated by gir (https://github.com/gtk-rs/gir @ b77ba3072803)
from gir-files (https://github.com/gtk-rs/gir-files @ 8245e53156fd)
2 changes: 1 addition & 1 deletion gsk4/sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ version = "4.14"
version = "4.16"

[package.metadata.system-deps.gtk4.v4_18]
version = "4.17"
version = "4.18"

[package.metadata.docs.rs]
rustc-args = ["--cfg", "docsrs"]
Expand Down
4 changes: 2 additions & 2 deletions gsk4/sys/versions.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ 5ce24253f28c)
from gir-files (https://github.com/gtk-rs/gir-files @ 07aa7d177618)
Generated by gir (https://github.com/gtk-rs/gir @ b77ba3072803)
from gir-files (https://github.com/gtk-rs/gir-files @ 8245e53156fd)
1 change: 1 addition & 0 deletions gtk4/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ v4_12 = ["gtk4-sys/v4_12", "v4_10", "gdk/v4_12"]
v4_14 = ["gtk4-sys/v4_14", "v4_12", "gdk/v4_14", "gsk/v4_14"]
v4_16 = ["gtk4-sys/v4_16", "v4_14", "gdk/v4_16", "gsk/v4_16"]
v4_18 = ["gtk4-sys/v4_18", "gdk/v4_18", "v4_16"]
v4_20 = ["gtk4-sys/v4_20", "v4_18"]
gio_v2_80 = ["gio/v2_80"]
xml_validation = ["gtk4-macros/xml_validation"]
blueprint = ["gtk4-macros/blueprint"]
Expand Down
1 change: 1 addition & 0 deletions gtk4/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ gtk = { git = "https://github.com/gtk-rs/gtk4-rs.git", package = "gtk4" }

| Feature | Description |
| --- | ----------- |
| `v4_20` | Enable the new APIs part of GTK 4.20 |
| `v4_18` | Enable the new APIs part of GTK 4.18 |
| `v4_16` | Enable the new APIs part of GTK 4.16 |
| `v4_14` | Enable the new APIs part of GTK 4.14 |
Expand Down
2 changes: 1 addition & 1 deletion gtk4/src/auto/app_chooser_button.rs
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ impl AppChooserButton {
detail.map(|name| format!("custom-item-activated::{name}\0"));
let signal_name: &[u8] = detailed_signal_name
.as_ref()
.map_or(&b"custom-item-activated\0"[..], |n| n.as_bytes());
.map_or(c"custom-item-activated".to_bytes(), |n| n.as_bytes());
connect_raw(
self.as_ptr() as *mut _,
signal_name.as_ptr() as *const _,
Expand Down
Loading
Loading