Implement Copy to all widgets, eliminate widget clone before use it in clsoures

Author: AllenDang

README.md

@@ -10,12 +10,13 @@
 
 ## Why Choose wxDragon?
 
-🎯 **Native Look & Feel** - Your apps integrate perfectly with each operating system's design language  
-🚀 **Single Codebase** - Write once, run everywhere with true cross-platform compatibility  
-🛡️ **Memory Safe** - All the safety guarantees of Rust with the mature wxWidgets foundation  
-⚡ **High Performance** - Direct access to native GUI components with minimal overhead  
-🎨 **Rich Widget Set** - Comprehensive collection of native controls and layouts  
+🎯 **Native Look & Feel** - Your apps integrate perfectly with each operating system's design language
+🚀 **Single Codebase** - Write once, run everywhere with true cross-platform compatibility
+🛡️ **Memory Safe** - All the safety guarantees of Rust with the mature wxWidgets foundation
+⚡ **High Performance** - Direct access to native GUI components with minimal overhead
+🎨 **Rich Widget Set** - Comprehensive collection of native controls and layouts
 🔧 **Two Development Styles** - Choose between programmatic creation or visual XRC design
+✨ **Ergonomic API** - Widgets implement `Copy`, so no manual cloning needed for closures
 
 ## Screenshots
 
@@ -112,17 +113,15 @@ fn main() {
         let ui = MyUI::new(None);
 
         // Access widgets with full type safety
-        let button = &ui.hello_button;      // Button
-        let input = &ui.input_field;        // TextCtrl
-        let label = &ui.status_label;       // StaticText
-        let frame = &ui.main_frame;         // Frame
-
-        // Bind events with closures
-        let label_clone = label.clone();
-        let input_clone = input.clone();
+        let button = ui.hello_button;      // Button
+        let input = ui.input_field;        // TextCtrl
+        let label = ui.status_label;       // StaticText
+        let frame = ui.main_frame;         // Frame
+
+        // Bind events with closures - widgets are Copy, no cloning needed!
         button.on_click(move |_| {
-            let text = input_clone.get_value();
-            label_clone.set_label(&format!("You entered: {}", text));
+            let text = input.get_value();
+            label.set_label(&format!("You entered: {}", text));
         });
 
         frame.show(true);
@@ -136,6 +135,7 @@ fn main() {
 - **Type Safety** - Compile-time checking of widget names and types
 - **Clean Separation** - UI layout separate from application logic
 - **Professional Workflows** - Integrate with existing design tools
+- **Zero Boilerplate** - Widgets are `Copy`, use them directly in closures without `.clone()`
 
 ## Platform Support
 

examples/rust/clipboard_test/src/main.rs

@@ -98,20 +98,19 @@ fn main() {
         let clipboard = Clipboard::get();
 
         // Implement button event handlers
-        let text_ctrl_copy = text_ctrl.clone();
+        // Widgets are Copy, so they can be used directly in closures
         copy_button.on_click(move |_| {
-            let text = text_ctrl_copy.get_value();
+            let text = text_ctrl.get_value();
             if clipboard.set_text(&text) {
                 println!("Text copied to clipboard: {text}");
             } else {
                 println!("Failed to copy text to clipboard");
             }
         });
 
-        let text_ctrl_paste = text_ctrl.clone();
         paste_button.on_click(move |_| {
             if let Some(text) = clipboard.get_text() {
-                text_ctrl_paste.set_value(&text);
+                text_ctrl.set_value(&text);
                 println!("Text pasted from clipboard: {text}");
             } else {
                 println!("No text on clipboard or clipboard access failed");
@@ -143,8 +142,7 @@ fn main() {
             }
         });
 
-        // For paste bitmap button - this should now work correctly with StaticBitmap's proper Clone
-        let static_bitmap_clone = static_bitmap.clone();
+        // For paste bitmap button - widgets are Copy
         paste_bitmap_button.on_click(move |_| {
             // Check if bitmap format is supported
             if !clipboard.is_format_supported(DataFormat::BITMAP) {
@@ -159,8 +157,7 @@ fn main() {
             if let Some(_locker) = clipboard.locker() {
                 if clipboard.get_data(&bitmap_data) {
                     if let Some(bitmap) = bitmap_data.get_bitmap() {
-                        // Now static_bitmap_clone is a proper StaticBitmap, not just a Window
-                        static_bitmap_clone.set_bitmap(&bitmap);
+                        static_bitmap.set_bitmap(&bitmap);
                         println!("Bitmap pasted from clipboard");
                     }
                 } else {
@@ -199,42 +196,40 @@ fn main() {
         });
 
         // Paste files from clipboard
-        let clipboard_paste = clipboard;
-        let file_text_ctrl_paste = file_text_ctrl.clone();
         paste_file_button.on_click(move |_| {
-            if let Some(_locker) = clipboard_paste.locker() {
+            if let Some(_locker) = clipboard.locker() {
                 // Check if file format is supported
-                if clipboard_paste.is_format_supported(DataFormat::FILENAME) {
+                if clipboard.is_format_supported(DataFormat::FILENAME) {
                     // Create a file data object to receive the data
                     let file_data = FileDataObject::new();
 
                     // Try getting the data - this should now work with our fixed implementation
-                    if clipboard_paste.get_data(&file_data) {
+                    if clipboard.get_data(&file_data) {
                         // Get all files from the data object
                         let files = file_data.get_files();
 
                         if files.is_empty() {
                             println!("No files on clipboard");
-                            file_text_ctrl_paste.set_value("No files on clipboard");
+                            file_text_ctrl.set_value("No files on clipboard");
                         } else {
                             // Display the file paths in the text control
                             let file_list = files.join("\n");
                             println!("Files pasted from clipboard:\n{file_list}");
-                            file_text_ctrl_paste.set_value(&file_list);
+                            file_text_ctrl.set_value(&file_list);
                         }
                     } else {
                         // Fallback to text for files
-                        if let Some(text) = clipboard_paste.get_text() {
+                        if let Some(text) = clipboard.get_text() {
                             println!("Retrieved file path as text: {text}");
-                            file_text_ctrl_paste.set_value(&text);
+                            file_text_ctrl.set_value(&text);
                         } else {
                             println!("Failed to get files from clipboard");
-                            file_text_ctrl_paste.set_value("Failed to get files from clipboard");
+                            file_text_ctrl.set_value("Failed to get files from clipboard");
                         }
                     }
                 } else {
                     println!("No files on clipboard");
-                    file_text_ctrl_paste.set_value("No files on clipboard");
+                    file_text_ctrl.set_value("No files on clipboard");
                 }
             }
         });

examples/rust/combobox_modifier_test/src/main.rs

@@ -46,8 +46,7 @@ fn main() {
         let status_label = StaticText::builder(&panel).with_label("Status: Ready").build();
 
         // Test key events on the ComboBox
-        let status_clone = status_label.clone();
-        let combo_clone = combo_box.clone();
+        // Widgets are Copy, so they can be used directly in closures
         combo_box.on_key_down(move |event| {
             if let WindowEventData::Keyboard(ref key_event) = event {
                 let mut should_handle = false;
@@ -56,7 +55,7 @@ fn main() {
                 if let Some(key_code) = key_event.get_key_code() {
                     // Check for CTRL+BACKSPACE (key code 8 is backspace)
                     if key_code == 8 && key_event.control_down() {
-                        delete_word_back(&combo_clone);
+                        delete_word_back(&combo_box);
                         status_text = "CTRL+BACKSPACE: Deleted word back".to_string();
                         should_handle = true;
                     }
@@ -86,7 +85,7 @@ fn main() {
 
                 // Update status if we detected something interesting
                 if !status_text.is_empty() {
-                    status_clone.set_label(&status_text);
+                    status_label.set_label(&status_text);
                     println!("{}", status_text);
                 }
 
@@ -100,15 +99,13 @@ fn main() {
         });
 
         // Also handle regular ComboBox events for completeness
-        let status_clone2 = status_label.clone();
         combo_box.on_text_updated(move |_event_data| {
-            status_clone2.set_label("Status: Text updated");
+            status_label.set_label("Status: Text updated");
         });
 
-        let status_clone3 = status_label.clone();
         combo_box.on_selection_changed(move |event_data| {
             if let Some(selection) = event_data.get_selection() {
-                status_clone3.set_label(&format!("Status: Selected item {}", selection));
+                status_label.set_label(&format!("Status: Selected item {}", selection));
             }
         });
 
@@ -132,10 +129,9 @@ fn main() {
         panel.set_sizer(sizer, true);
 
         // Handle frame close event
-        let frame_clone = frame.clone();
         frame.on_close(move |_event_data| {
             println!("Frame closing!");
-            frame_clone.destroy();
+            frame.destroy();
         });
 
         // Show the frame

examples/rust/custom_widget/src/anim_fill_button.rs

@@ -51,18 +51,16 @@ custom_widget!(
         let timer = Rc::new(Timer::new(&panel));
 
         // 设置绘制事件
-        let panel_paint = panel.clone();
         let animation_data_paint = animation_data.clone();
         let config_paint = config.clone();
         panel.on_paint(move |event| {
             let animation = animation_data_paint.borrow();
-            AniFillButton::draw_custom_button(&panel_paint, &config_paint, animation.progress, animation.is_mouse_pressed);
+            AniFillButton::draw_custom_button(&panel, &config_paint, animation.progress, animation.is_mouse_pressed);
             event.skip(true);
         });
 
         // 设置鼠标进入事件
         let animation_data_enter = animation_data.clone();
-        let panel_enter = panel.clone();
         let timer_enter = timer.clone();
         panel.on_mouse_enter(move |event| {
             let mut animation = animation_data_enter.borrow_mut();
@@ -73,14 +71,13 @@ custom_widget!(
                 drop(animation);
 
                 timer_enter.start(16, false); // 60fps
-                panel_enter.refresh(false, None);
+                panel.refresh(false, None);
             }
             event.skip(true);
         });
 
         // 设置鼠标离开事件
         let animation_data_leave = animation_data.clone();
-        let panel_leave = panel.clone();
         let timer_leave = timer.clone();
         panel.on_mouse_leave(move |event| {
             let mut animation = animation_data_leave.borrow_mut();
@@ -98,35 +95,33 @@ custom_widget!(
                 drop(animation);
 
                 timer_leave.start(16, false); // 60fps
-                panel_leave.refresh(false, None);
+                panel.refresh(false, None);
             } else {
                 drop(animation);
-                panel_leave.refresh(false, None);
+                panel.refresh(false, None);
             }
             event.skip(true);
         });
 
         // 设置鼠标按下事件
         let animation_data_down = animation_data.clone();
-        let panel_down = panel.clone();
         panel.on_mouse_left_down(move |event| {
             {
                 let mut animation = animation_data_down.borrow_mut();
                 animation.is_mouse_pressed = true;
             }
-            panel_down.refresh(false, None);
+            panel.refresh(false, None);
             event.skip(true);
         });
 
         // 设置鼠标释放事件
         let animation_data_up = animation_data.clone();
-        let panel_up = panel.clone();
         panel.on_mouse_left_up(move |event| {
             {
                 let mut animation = animation_data_up.borrow_mut();
                 animation.is_mouse_pressed = false;
             }
-            panel_up.refresh(false, None);
+            panel.refresh(false, None);
             event.skip(true);
         });
 
@@ -137,7 +132,6 @@ custom_widget!(
         // 设置定时器事件
         let animation_data_timer = animation_data.clone();
         let config_timer = config.clone();
-        let panel_timer = panel.clone();
         let timer_clone = timer.clone();
         timer.on_tick(move |event| {
             let mut animation = animation_data_timer.borrow_mut();
@@ -159,7 +153,7 @@ custom_widget!(
                     AnimationState::Idle => 0.0,
                 };
 
-                panel_timer.refresh(false, None);
+                panel.refresh(false, None);
 
                 // 动画完成时停止
                 if progress_ratio >= 1.0 {

examples/rust/custom_widget/src/pie_chart.rs

@@ -66,18 +66,16 @@ custom_widget!(
         let timer = Rc::new(Timer::new(&panel));
 
         // Set up paint event
-        let panel_paint = panel.clone();
         let animation_data_paint = animation_data.clone();
         let config_paint = config.clone();
         panel.on_paint(move |event| {
             let animation = animation_data_paint.borrow();
-            PieChart::draw_pie_chart(&panel_paint, &config_paint, &animation);
+            PieChart::draw_pie_chart(&panel, &config_paint, &animation);
             event.skip(true);
         });
 
         // Set up mouse motion event for hover detection
         let animation_data_motion = animation_data.clone();
-        let panel_motion = panel.clone();
         let timer_motion = timer.clone();
         let config_motion = config.clone();
         panel.on_mouse_motion(move |event| {
@@ -89,7 +87,7 @@ custom_widget!(
             };
 
             if let Some(pos) = mouse_pos {
-                let size = panel_motion.get_size();
+                let size = panel.get_size();
                 let center_x = size.width / 2;
                 let center_y = size.height / 2;
 
@@ -117,7 +115,7 @@ custom_widget!(
                         timer_motion.start(16, false); // 60fps
                     }
 
-                    panel_motion.refresh(false, None);
+                    panel.refresh(false, None);
                 }
             }
 
@@ -126,7 +124,6 @@ custom_widget!(
 
         // Set up mouse leave event
         let animation_data_leave = animation_data.clone();
-        let panel_leave = panel.clone();
         let timer_leave = timer.clone();
         panel.on_mouse_leave(move |event| {
             let mut animation = animation_data_leave.borrow_mut();
@@ -138,7 +135,7 @@ custom_widget!(
                 drop(animation);
 
                 timer_leave.start(16, false); // 60fps
-                panel_leave.refresh(false, None);
+                panel.refresh(false, None);
             }
 
             event.skip(true);
@@ -147,7 +144,6 @@ custom_widget!(
         // Set up timer event for animations
         let animation_data_timer = animation_data.clone();
         let config_timer = config.clone();
-        let panel_timer = panel.clone();
         let timer_clone = timer.clone();
         timer.on_tick(move |event| {
             let mut animation = animation_data_timer.borrow_mut();
@@ -180,7 +176,7 @@ custom_widget!(
                     }
                 }
 
-                panel_timer.refresh(false, None);
+                panel.refresh(false, None);
 
                 // Animation complete
                 if progress_ratio >= 1.0 {

examples/rust/dataviewtree/src/edit_dialog.rs

@@ -78,18 +78,12 @@ impl NodeEditDialog {
         );
 
         // Wire default behaviors
-        {
-            let dlg_ok = dlg.clone();
-            ok_btn.on_click(move |_| {
-                dlg_ok.end_modal(ID_OK);
-            });
-        }
-        {
-            let dlg_cancel = dlg.clone();
-            cancel_btn.on_click(move |_| {
-                dlg_cancel.end_modal(ID_CANCEL);
-            });
-        }
+        ok_btn.on_click(move |_| {
+            dlg.end_modal(ID_OK);
+        });
+        cancel_btn.on_click(move |_| {
+            dlg.end_modal(ID_CANCEL);
+        });
 
         // Disable non-applicable fields for branch nodes
         if is_branch {