Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to GNOME 3.14 versions #135

Merged
merged 3 commits into from Feb 6, 2019
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.
+1 −23
Diff settings

Always

Just for now

Prev

Regenerate

  • Loading branch information...
sdroege committed Feb 6, 2019
commit 49ad146c2e9e2f8dcffff132d539bd099f79b3b6
Copy path View file
@@ -45,7 +45,6 @@ impl Default for Context {
pub const NONE_CONTEXT: Option<&Context> = None;

pub trait ContextExt: 'static {
#[cfg(any(feature = "v1_32_4", feature = "dox"))]
fn changed(&self);

fn get_base_dir(&self) -> Direction;
@@ -66,7 +65,6 @@ pub trait ContextExt: 'static {

fn get_metrics<'a, 'b, P: Into<Option<&'a FontDescription>>, Q: Into<Option<&'b Language>>>(&self, desc: P, language: Q) -> Option<FontMetrics>;

#[cfg(any(feature = "v1_32_4", feature = "dox"))]
fn get_serial(&self) -> u32;

fn list_families(&self) -> Vec<FontFamily>;
@@ -91,7 +89,6 @@ pub trait ContextExt: 'static {
}

impl<O: IsA<Context>> ContextExt for O {
#[cfg(any(feature = "v1_32_4", feature = "dox"))]
fn changed(&self) {
unsafe {
ffi::pango_context_changed(self.as_ref().to_glib_none().0);
@@ -154,7 +151,6 @@ impl<O: IsA<Context>> ContextExt for O {
}
}

#[cfg(any(feature = "v1_32_4", feature = "dox"))]
fn get_serial(&self) -> u32 {
unsafe {
ffi::pango_context_get_serial(self.as_ref().to_glib_none().0)
Copy path View file
@@ -27,12 +27,10 @@ glib_wrapper! {
pub const NONE_FONT_MAP: Option<&FontMap> = None;

pub trait FontMapExt: 'static {
#[cfg(any(feature = "v1_34", feature = "dox"))]
fn changed(&self);

fn create_context(&self) -> Option<Context>;

#[cfg(any(feature = "v1_32_4", feature = "dox"))]
fn get_serial(&self) -> u32;

#[cfg_attr(feature = "v1_38", deprecated)]
@@ -46,7 +44,6 @@ pub trait FontMapExt: 'static {
}

impl<O: IsA<FontMap>> FontMapExt for O {
#[cfg(any(feature = "v1_34", feature = "dox"))]
fn changed(&self) {
unsafe {
ffi::pango_font_map_changed(self.as_ref().to_glib_none().0);
@@ -59,7 +56,6 @@ impl<O: IsA<FontMap>> FontMapExt for O {
}
}

#[cfg(any(feature = "v1_32_4", feature = "dox"))]
fn get_serial(&self) -> u32 {
unsafe {
ffi::pango_font_map_get_serial(self.as_ref().to_glib_none().0)
Copy path View file
@@ -114,22 +114,10 @@ pub fn itemize_with_base_dir<'a, P: IsA<Context>, Q: Into<Option<&'a AttrIterato
}
}

#[cfg_attr(feature = "v1_32", deprecated)]
pub fn lookup_aliases(fontname: &str) -> Vec<GString> {
unsafe {
let mut families = ptr::null_mut();
let mut n_families = mem::uninitialized();
ffi::pango_lookup_aliases(fontname.to_glib_none().0, &mut families, &mut n_families);
FromGlibContainer::from_glib_full_num(families, n_families as usize)
}
}

//#[cfg(any(feature = "v1_31", feature = "dox"))]
//pub fn markup_parser_finish(context: /*Ignored*/&glib::MarkupParseContext) -> Result<(AttrList, GString, char), Error> {
// unsafe { TODO: call ffi::pango_markup_parser_finish() }
//}

//#[cfg(any(feature = "v1_31", feature = "dox"))]
//pub fn markup_parser_new(accel_marker: char) -> /*Ignored*/Option<glib::MarkupParseContext> {
// unsafe { TODO: call ffi::pango_markup_parser_new() }
//}
Copy path View file
@@ -88,7 +88,6 @@ pub trait LayoutExt: 'static {

fn get_pixel_size(&self) -> (i32, i32);

#[cfg(any(feature = "v1_32_4", feature = "dox"))]
fn get_serial(&self) -> u32;

fn get_single_paragraph_mode(&self) -> bool;
@@ -311,7 +310,6 @@ impl<O: IsA<Layout>> LayoutExt for O {
}
}

#[cfg(any(feature = "v1_32_4", feature = "dox"))]
fn get_serial(&self) -> u32 {
unsafe {
ffi::pango_layout_get_serial(self.as_ref().to_glib_none().0)
Copy path View file
@@ -1,2 +1,2 @@
Generated by gir (https://github.com/gtk-rs/gir @ f5d3eab)
Generated by gir (https://github.com/gtk-rs/gir @ 4a198d9)
from gir-files (https://github.com/gtk-rs/gir-files @ 02dfee2)
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.