Skip to content
This repository has been archived by the owner on Jun 8, 2021. It is now read-only.

Enums #115

Merged
merged 3 commits into from
Apr 20, 2016
Merged

Enums #115

merged 3 commits into from
Apr 20, 2016

Conversation

EPashkin
Copy link
Member

Part of gtk-rs/gtk#307

@EPashkin
Copy link
Member Author

@gkoz Please, look at changed functions with uninitialized
IMHO PR ready for merge.

pub fn get_key(&self, index_: u32, keyval: &mut u32) -> (bool,::ModifierType) {
unsafe {
let mut modifiers = mem::uninitialized();
let ret = from_glib(ffi::gdk_device_get_key(self.to_glib_none().0, index_, keyval, &mut modifiers));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like a typical case of out-params + boolean, returning Option<(u32, ModifierType)>.

@gkoz
Copy link
Member

gkoz commented Apr 18, 2016

We'll also want Gdk.GLError.

This part seems easy and harmless enough. Are the remaining reexports in lib.rs apparently unused? There seem to be too many of them.

library = "Gdk"
version = "3.0"
min_cfg_version = "3.4"
target_path = "."
work_mode = "normal"
generate_safety_asserts = true
#generate_safety_asserts = true
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have the same set of asserts here as in gtk.

@EPashkin
Copy link
Member Author

EPashkin commented Apr 19, 2016

Fixed, also updated gdk_window_get_device_position and gdk_window_get_device_position_double as seems returning Window and returning other independent (https://developer.gnome.org/gdk3/stable/gdk3-Windows.html#gdk-window-get-device-position)

@@ -1,12 +1,21 @@
[options]
girs_dir = "gir-files"
girs_dir = "../gir-files"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we're generating some code now it makes sense to add the usual submodules and makefile.

@EPashkin
Copy link
Member Author

Added submodules.

@EPashkin
Copy link
Member Author

I strongly don't like idea of having many gir sub-modules ,
as it slow to rebuild and contains "big" target,
so IMHO we need rethink sub-module structure.

@EPashkin
Copy link
Member Author

Updated makefile

@EPashkin
Copy link
Member Author

EPashkin commented Apr 19, 2016

Ready for merge, all errors on gtk part

@GuillaumeGomez
Copy link
Member

Good for me.

@gkoz: Merge if you think it's all good.

@EPashkin
Copy link
Member Author

Added CursorType

@GuillaumeGomez
Copy link
Member

This PR is getting bigger and bigger. O.O

@EPashkin
Copy link
Member Author

Yes, it too many unneeded additions

@gkoz gkoz merged commit 95e4e16 into gtk-rs:master Apr 20, 2016
@EPashkin EPashkin deleted the enums branch April 20, 2016 15:18
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants