Skip to content
This repository was archived by the owner on Mar 4, 2024. It is now read-only.

Commit f2ab1e8

Browse files
sdroegesdroege
authored
Merge pull request #792 from jf2048/into-value
Regenerate gir
2 parents 1d88490 + bf1c5aa commit f2ab1e8

File tree

17 files changed

+1313
-23
lines changed

17 files changed

+1313
-23
lines changed

‎.github/workflows/windows.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ jobs:
1010

1111
gvsbuild:
1212
name: build GTK binaries with gvsbuild
13-
runs-on: windows-2019
13+
runs-on: windows-2022
1414

1515
env:
1616
# git revision of gvsbuild we use for to build GTK and the other dependencies
17-
gvsbuildref: 861244f84a04da49172c23646d9e23885094cab4
17+
gvsbuildref: 078140d0b7dcfd6147b3063114fb38365b7ad5a1
1818

1919
# bump this number if you want to force a rebuild of gvsbuild with the same revision
2020
gvsbuildupdate: 1
@@ -48,10 +48,14 @@ jobs:
4848
run: move "C:\Program Files\Git\usr\bin" "C:\Program Files\Git\usr\notbin"
4949
shell: cmd
5050

51-
- name: (GTK binaries) run gvsbuild
51+
- name: (GTK binaries) install gvsbuild
5252
if: steps.cache.outputs.cache-hit != 'true'
5353
working-directory: gvsbuild
54-
run: python .\build.py build -p=x64 --vs-ver=16 --msys-dir=C:\msys64 gtk3 graphene
54+
run: python -m pip install .
55+
56+
- name: (GTK binaries) run gvsbuild
57+
if: steps.cache.outputs.cache-hit != 'true'
58+
run: gvsbuild build --platform=x64 --vs-ver=17 --msys-dir=C:\msys64 gtk3 graphene
5559

5660
- name: (GTK binaries) restore git binary
5761
if: steps.cache.outputs.cache-hit != 'true'
@@ -64,7 +68,7 @@ jobs:
6468

6569
build:
6670
name: build gtk-rs on Windows
67-
runs-on: windows-2019
71+
runs-on: windows-2022
6872
needs: gvsbuild
6973

7074
strategy:

‎atk/src/auto/enums.rs

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,14 @@ impl ToValue for CoordType {
9898
}
9999
}
100100

101+
impl From<CoordType> for glib::Value {
102+
#[inline]
103+
fn from(v: CoordType) -> Self {
104+
skip_assert_initialized!();
105+
ToValue::to_value(&v)
106+
}
107+
}
108+
101109
#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)]
102110
#[non_exhaustive]
103111
#[doc(alias = "AtkLayer")]
@@ -212,6 +220,14 @@ impl ToValue for Layer {
212220
}
213221
}
214222

223+
impl From<Layer> for glib::Value {
224+
#[inline]
225+
fn from(v: Layer) -> Self {
226+
skip_assert_initialized!();
227+
ToValue::to_value(&v)
228+
}
229+
}
230+
215231
#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)]
216232
#[non_exhaustive]
217233
#[doc(alias = "AtkRelationType")]
@@ -411,6 +427,14 @@ impl ToValue for RelationType {
411427
}
412428
}
413429

430+
impl From<RelationType> for glib::Value {
431+
#[inline]
432+
fn from(v: RelationType) -> Self {
433+
skip_assert_initialized!();
434+
ToValue::to_value(&v)
435+
}
436+
}
437+
414438
#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)]
415439
#[non_exhaustive]
416440
#[doc(alias = "AtkRole")]
@@ -1152,6 +1176,14 @@ impl ToValue for Role {
11521176
}
11531177
}
11541178

1179+
impl From<Role> for glib::Value {
1180+
#[inline]
1181+
fn from(v: Role) -> Self {
1182+
skip_assert_initialized!();
1183+
ToValue::to_value(&v)
1184+
}
1185+
}
1186+
11551187
#[cfg(any(feature = "v2_30", feature = "dox"))]
11561188
#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_30")))]
11571189
#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)]
@@ -1277,6 +1309,16 @@ impl ToValue for ScrollType {
12771309
}
12781310
}
12791311

1312+
#[cfg(any(feature = "v2_30", feature = "dox"))]
1313+
#[cfg_attr(feature = "dox", doc(cfg(feature = "v2_30")))]
1314+
impl From<ScrollType> for glib::Value {
1315+
#[inline]
1316+
fn from(v: ScrollType) -> Self {
1317+
skip_assert_initialized!();
1318+
ToValue::to_value(&v)
1319+
}
1320+
}
1321+
12801322
#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)]
12811323
#[non_exhaustive]
12821324
#[doc(alias = "AtkStateType")]
@@ -1591,6 +1633,14 @@ impl ToValue for StateType {
15911633
}
15921634
}
15931635

1636+
impl From<StateType> for glib::Value {
1637+
#[inline]
1638+
fn from(v: StateType) -> Self {
1639+
skip_assert_initialized!();
1640+
ToValue::to_value(&v)
1641+
}
1642+
}
1643+
15941644
#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)]
15951645
#[non_exhaustive]
15961646
#[doc(alias = "AtkTextAttribute")]
@@ -1837,6 +1887,14 @@ impl ToValue for TextAttribute {
18371887
}
18381888
}
18391889

1890+
impl From<TextAttribute> for glib::Value {
1891+
#[inline]
1892+
fn from(v: TextAttribute) -> Self {
1893+
skip_assert_initialized!();
1894+
ToValue::to_value(&v)
1895+
}
1896+
}
1897+
18401898
#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)]
18411899
#[non_exhaustive]
18421900
#[doc(alias = "AtkTextBoundary")]
@@ -1946,6 +2004,14 @@ impl ToValue for TextBoundary {
19462004
}
19472005
}
19482006

2007+
impl From<TextBoundary> for glib::Value {
2008+
#[inline]
2009+
fn from(v: TextBoundary) -> Self {
2010+
skip_assert_initialized!();
2011+
ToValue::to_value(&v)
2012+
}
2013+
}
2014+
19492015
#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)]
19502016
#[non_exhaustive]
19512017
#[doc(alias = "AtkTextClipType")]
@@ -2040,6 +2106,14 @@ impl ToValue for TextClipType {
20402106
}
20412107
}
20422108

2109+
impl From<TextClipType> for glib::Value {
2110+
#[inline]
2111+
fn from(v: TextClipType) -> Self {
2112+
skip_assert_initialized!();
2113+
ToValue::to_value(&v)
2114+
}
2115+
}
2116+
20432117
#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)]
20442118
#[non_exhaustive]
20452119
#[doc(alias = "AtkTextGranularity")]
@@ -2139,6 +2213,14 @@ impl ToValue for TextGranularity {
21392213
}
21402214
}
21412215

2216+
impl From<TextGranularity> for glib::Value {
2217+
#[inline]
2218+
fn from(v: TextGranularity) -> Self {
2219+
skip_assert_initialized!();
2220+
ToValue::to_value(&v)
2221+
}
2222+
}
2223+
21422224
#[derive(Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Clone, Copy)]
21432225
#[non_exhaustive]
21442226
#[doc(alias = "AtkValueType")]
@@ -2308,3 +2390,11 @@ impl ToValue for ValueType {
23082390
Self::static_type()
23092391
}
23102392
}
2393+
2394+
impl From<ValueType> for glib::Value {
2395+
#[inline]
2396+
fn from(v: ValueType) -> Self {
2397+
skip_assert_initialized!();
2398+
ToValue::to_value(&v)
2399+
}
2400+
}

‎atk/src/auto/flags.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,11 @@ impl ToValue for HyperlinkStateFlags {
7373
Self::static_type()
7474
}
7575
}
76+
77+
impl From<HyperlinkStateFlags> for glib::Value {
78+
#[inline]
79+
fn from(v: HyperlinkStateFlags) -> Self {
80+
skip_assert_initialized!();
81+
ToValue::to_value(&v)
82+
}
83+
}

‎atk/src/auto/versions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 3b6fe0a33676)
1+
Generated by gir (https://github.com/gtk-rs/gir @ 250c500566c3)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 4c173afc6395)

‎atk/sys/versions.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Generated by gir (https://github.com/gtk-rs/gir @ e94fdc6499e4)
2-
from gir-files (https://github.com/gtk-rs/gir-files @ 3b6fe0a33676)
1+
Generated by gir (https://github.com/gtk-rs/gir @ 250c500566c3)
2+
from gir-files (https://github.com/gtk-rs/gir-files @ 4c173afc6395)

0 commit comments

Comments
 (0)