Merge branch 'master' into improvement/update-wgpu_glyph

1 files changed, 10 insertions, 21 deletions

diff --git a/src/widget.rs b/src/widget.rs
index e33a6b2c..3e4d4788 100644
--- a/src/widget.rs
+++ b/src/widget.rs
@@ -18,29 +18,30 @@
 //! [`text_input::State`]: text_input/struct.State.html
 #[cfg(not(target_arch = "wasm32"))]
 mod platform {
-    pub use iced_wgpu::widget::{
+    pub use crate::renderer::widget::{
         button, checkbox, container, pane_grid, progress_bar, radio,
-        scrollable, slider, text_input, Text,
+        scrollable, slider, text_input, Column, Row, Space, Text,
     };
 
-    #[cfg(feature = "canvas")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "canvas")))]
-    pub use iced_wgpu::widget::canvas;
+    #[cfg(any(feature = "canvas", feature = "glow_canvas"))]
+    #[cfg_attr(
+        docsrs,
+        doc(cfg(any(feature = "canvas", feature = "glow_canvas")))
+    )]
+    pub use crate::renderer::widget::canvas;
 
     #[cfg_attr(docsrs, doc(cfg(feature = "image")))]
     pub mod image {
         //! Display images in your user interface.
-        pub use iced_winit::image::{Handle, Image};
+        pub use crate::runtime::image::{Handle, Image};
     }
 
     #[cfg_attr(docsrs, doc(cfg(feature = "svg")))]
     pub mod svg {
         //! Display vector graphics in your user interface.
-        pub use iced_winit::svg::{Handle, Svg};
+        pub use crate::runtime::svg::{Handle, Svg};
     }
 
-    pub use iced_winit::Space;
-
     #[doc(no_inline)]
     pub use {
         button::Button, checkbox::Checkbox, container::Container, image::Image,
@@ -52,18 +53,6 @@ mod platform {
     #[cfg(feature = "canvas")]
     #[doc(no_inline)]
     pub use canvas::Canvas;
-
-    /// A container that distributes its contents vertically.
-    ///
-    /// This is an alias of an `iced_native` column with a default `Renderer`.
-    pub type Column<'a, Message> =
-        iced_winit::Column<'a, Message, iced_wgpu::Renderer>;
-
-    /// A container that distributes its contents horizontally.
-    ///
-    /// This is an alias of an `iced_native` row with a default `Renderer`.
-    pub type Row<'a, Message> =
-        iced_winit::Row<'a, Message, iced_wgpu::Renderer>;
 }
 
 #[cfg(target_arch = "wasm32")]