diff --git a/eek/eek-renderer.c b/eek/eek-renderer.c index d7dcdf43..e5f1cd52 100644 --- a/eek/eek-renderer.c +++ b/eek/eek-renderer.c @@ -31,10 +31,6 @@ static void render_button_label (cairo_t *cr, GtkStyleContext *ctx, const gchar *label, EekBounds bounds); -void eek_render_button (EekRenderer *self, - cairo_t *cr, const struct squeek_button *button, - gboolean pressed, gboolean locked); - static void render_outline (cairo_t *cr, GtkStyleContext *ctx, diff --git a/eek/eek-types.h b/eek/eek-types.h index 5d993191..8f52f716 100644 --- a/eek/eek-types.h +++ b/eek/eek-types.h @@ -90,13 +90,5 @@ struct transformation { gdouble scale; }; -struct squeek_button; -struct squeek_row; - -/// Represents the path to the button within a view -struct button_place { - const struct squeek_row *row; - const struct squeek_button *button; -}; G_END_DECLS #endif /* EEK_TYPES_H */ diff --git a/src/layout.h b/src/layout.h index 086b4097..519ecbc6 100644 --- a/src/layout.h +++ b/src/layout.h @@ -26,7 +26,6 @@ struct squeek_layout_state { struct squeek_layout; -void squeek_button_print(const struct squeek_button* button); struct transformation squeek_layout_calculate_transformation( const struct squeek_layout *layout, diff --git a/src/layout.rs b/src/layout.rs index aa2f4198..20984523 100644 --- a/src/layout.rs +++ b/src/layout.rs @@ -41,7 +41,7 @@ pub mod c { use super::*; use gtk_sys; - use std::os::raw::{ c_char, c_void }; + use std::os::raw::c_void; use std::ops::{ Add, Sub }; @@ -161,13 +161,6 @@ pub mod c { // The following defined in Rust. TODO: wrap naked pointers to Rust data inside RefCells to prevent multiple writers - #[no_mangle] - pub extern "C" - fn squeek_button_print(button: *const ::layout::Button) { - let button = unsafe { &*button }; - println!("{:?}", button); - } - /// Positions the layout contents within the available space. /// The origin of the transformation is the point inside the margins. #[no_mangle] diff --git a/src/popover.h b/src/popover.h deleted file mode 100644 index 1b164e5a..00000000 --- a/src/popover.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef POPOVER_H__ -#define POPOVER_H__ - -#include -#include "eek/eek-keyboard.h" - -void squeek_popover_show(GtkWidget*, struct button_place); - -#endif