fix examples not compiling

Author: jgcodes2020

examples/application.rs

@@ -41,7 +41,7 @@ use winit::platform::web::{ActiveEventLoopExtWeb, WindowAttributesWeb};
 use winit::platform::x11::{ActiveEventLoopExtX11, WindowAttributesX11};
 use winit::window::{
     CursorGrabMode, ImeCapabilities, ImeEnableRequest, ImePurpose, ImeRequestData, ResizeDirection,
-    SurfaceId, Theme, Window, WindowAttributes,
+    WindowId, Theme, Window, WindowAttributes,
 };
 use winit_core::application::macos::ApplicationHandlerExtMacOS;
 use winit_core::window::ImeRequest;
@@ -95,7 +95,7 @@ struct Application {
     custom_cursors: Result<Vec<CustomCursor>, RequestError>,
     /// Application icon.
     icon: Icon,
-    windows: HashMap<SurfaceId, WindowState>,
+    windows: HashMap<WindowId, WindowState>,
     /// Drawing context.
     ///
     /// With OpenGL it could be EGLDisplay.
@@ -147,7 +147,7 @@ impl Application {
         &mut self,
         event_loop: &dyn ActiveEventLoop,
         _tab_id: Option<String>,
-    ) -> Result<SurfaceId, Box<dyn Error>> {
+    ) -> Result<WindowId, Box<dyn Error>> {
         // TODO read-out activation token.
 
         #[allow(unused_mut)]
@@ -213,7 +213,7 @@ impl Application {
     fn handle_action_with_window(
         &mut self,
         event_loop: &dyn ActiveEventLoop,
-        window_id: SurfaceId,
+        window_id: WindowId,
         action: Action,
     ) {
         // let cursor_position = self.cursor_position;
@@ -415,7 +415,7 @@ impl ApplicationHandler for Application {
     fn window_event(
         &mut self,
         event_loop: &dyn ActiveEventLoop,
-        window_id: SurfaceId,
+        window_id: WindowId,
         event: WindowEvent,
     ) {
         let window = match self.windows.get_mut(&window_id) {
@@ -601,7 +601,7 @@ impl ApplicationHandlerExtMacOS for Application {
     fn standard_key_binding(
         &mut self,
         _event_loop: &dyn ActiveEventLoop,
-        window_id: SurfaceId,
+        window_id: WindowId,
         action: &str,
     ) {
         info!(?window_id, ?action, "macOS standard key binding");

examples/child_window.rs

@@ -8,7 +8,7 @@ fn main() -> Result<(), impl std::error::Error> {
     use winit::event::{ElementState, KeyEvent, WindowEvent};
     use winit::event_loop::{ActiveEventLoop, EventLoop};
     use winit::raw_window_handle::HasRawWindowHandle;
-    use winit::window::{SurfaceId, Window, WindowAttributes};
+    use winit::window::{WindowId, Window, WindowAttributes};
 
     #[path = "util/fill.rs"]
     mod fill;
@@ -27,8 +27,8 @@ fn main() -> Result<(), impl std::error::Error> {
 
     #[derive(Default, Debug)]
     struct Application {
-        parent_window_id: Option<SurfaceId>,
-        windows: HashMap<SurfaceId, WindowData>,
+        parent_window_id: Option<WindowId>,
+        windows: HashMap<WindowId, WindowData>,
     }
 
     impl ApplicationHandler for Application {
@@ -47,7 +47,7 @@ fn main() -> Result<(), impl std::error::Error> {
         fn window_event(
             &mut self,
             event_loop: &dyn ActiveEventLoop,
-            window_id: winit::window::SurfaceId,
+            window_id: winit::window::WindowId,
             event: WindowEvent,
         ) {
             match event {

examples/control_flow.rs

@@ -11,7 +11,7 @@ use winit::application::ApplicationHandler;
 use winit::event::{ElementState, KeyEvent, StartCause, WindowEvent};
 use winit::event_loop::{ActiveEventLoop, ControlFlow, EventLoop};
 use winit::keyboard::{Key, NamedKey};
-use winit::window::{SurfaceId, Window, WindowAttributes};
+use winit::window::{WindowId, Window, WindowAttributes};
 
 #[path = "util/fill.rs"]
 mod fill;
@@ -75,7 +75,7 @@ impl ApplicationHandler for ControlFlowDemo {
     fn window_event(
         &mut self,
         _event_loop: &dyn ActiveEventLoop,
-        _window_id: SurfaceId,
+        _window_id: WindowId,
         event: WindowEvent,
     ) {
         info!("{event:?}");

examples/dnd.rs

@@ -3,7 +3,7 @@ use std::error::Error;
 use winit::application::ApplicationHandler;
 use winit::event::WindowEvent;
 use winit::event_loop::{ActiveEventLoop, EventLoop};
-use winit::window::{SurfaceId, Window, WindowAttributes};
+use winit::window::{WindowId, Window, WindowAttributes};
 
 #[path = "util/fill.rs"]
 mod fill;
@@ -41,7 +41,7 @@ impl ApplicationHandler for Application {
     fn window_event(
         &mut self,
         event_loop: &dyn ActiveEventLoop,
-        _window_id: SurfaceId,
+        _window_id: WindowId,
         event: WindowEvent,
     ) {
         match event {

examples/pump_events.rs

@@ -11,7 +11,7 @@ fn main() -> std::process::ExitCode {
     use winit::event::WindowEvent;
     use winit::event_loop::pump_events::{EventLoopExtPumpEvents, PumpStatus};
     use winit::event_loop::{ActiveEventLoop, EventLoop};
-    use winit::window::{SurfaceId, Window, WindowAttributes};
+    use winit::window::{WindowId, Window, WindowAttributes};
 
     #[path = "util/fill.rs"]
     mod fill;
@@ -30,7 +30,7 @@ fn main() -> std::process::ExitCode {
         fn window_event(
             &mut self,
             event_loop: &dyn ActiveEventLoop,
-            _window_id: SurfaceId,
+            _window_id: WindowId,
             event: WindowEvent,
         ) {
             println!("{event:?}");

examples/run_on_demand.rs

@@ -9,15 +9,15 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     use winit::event::WindowEvent;
     use winit::event_loop::run_on_demand::EventLoopExtRunOnDemand;
     use winit::event_loop::{ActiveEventLoop, EventLoop};
-    use winit::window::{SurfaceId, Window, WindowAttributes};
+    use winit::window::{WindowId, Window, WindowAttributes};
 
     #[path = "util/fill.rs"]
     mod fill;
 
     #[derive(Default, Debug)]
     struct App {
         idx: usize,
-        window_id: Option<SurfaceId>,
+        window_id: Option<WindowId>,
         window: Option<Box<dyn Window>>,
     }
 
@@ -40,7 +40,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         fn window_event(
             &mut self,
             event_loop: &dyn ActiveEventLoop,
-            window_id: SurfaceId,
+            window_id: WindowId,
             event: WindowEvent,
         ) {
             if event == WindowEvent::Destroyed && self.window_id == Some(window_id) {

examples/util/fill.rs

@@ -29,7 +29,7 @@ mod platform {
     use softbuffer::{Context, Surface};
     #[cfg(all(web_platform, not(android_platform)))]
     use web_time::Instant;
-    use winit::window::{SurfaceId, Window};
+    use winit::window::{WindowId, Window};
 
     thread_local! {
         // NOTE: You should never do things like that, create context and drop it before
@@ -46,7 +46,7 @@ mod platform {
         context: RefCell<Context<&'static dyn Window>>,
 
         /// The hash map of window IDs to surfaces.
-        surfaces: HashMap<SurfaceId, Surface<&'static dyn Window, &'static dyn Window>>,
+        surfaces: HashMap<WindowId, Surface<&'static dyn Window, &'static dyn Window>>,
     }
 
     impl GraphicsContext {

examples/window.rs

@@ -7,7 +7,7 @@ use winit::event::WindowEvent;
 use winit::event_loop::{ActiveEventLoop, EventLoop};
 #[cfg(web_platform)]
 use winit::platform::web::WindowAttributesWeb;
-use winit::window::{SurfaceId, Window, WindowAttributes};
+use winit::window::{WindowId, Window, WindowAttributes};
 
 #[path = "util/fill.rs"]
 mod fill;
@@ -36,7 +36,7 @@ impl ApplicationHandler for App {
         }
     }
 
-    fn window_event(&mut self, event_loop: &dyn ActiveEventLoop, _: SurfaceId, event: WindowEvent) {
+    fn window_event(&mut self, event_loop: &dyn ActiveEventLoop, _: WindowId, event: WindowEvent) {
         println!("{event:?}");
         match event {
             WindowEvent::CloseRequested => {

examples/x11_embed.rs

@@ -7,7 +7,7 @@ fn main() -> Result<(), Box<dyn Error>> {
     use winit::event::WindowEvent;
     use winit::event_loop::{ActiveEventLoop, EventLoop};
     use winit::platform::x11::WindowAttributesX11;
-    use winit::window::{SurfaceId, Window, WindowAttributes};
+    use winit::window::{WindowId, Window, WindowAttributes};
 
     #[path = "util/fill.rs"]
     mod fill;
@@ -33,7 +33,7 @@ fn main() -> Result<(), Box<dyn Error>> {
         fn window_event(
             &mut self,
             event_loop: &dyn ActiveEventLoop,
-            _window_id: SurfaceId,
+            _window_id: WindowId,
             event: WindowEvent,
         ) {
             let window = self.window.as_ref().unwrap();