Changeset 430

Timestamp:

02/25/2008 12:40:23 (6 months ago)

Author:

why

Message:

• shoes/ruby.c: starting to centralize functions that deal with platform-specific controls.
  
• lib/shoes/cache.rb: rubygems/open-uri is no longer.
  

Location:

trunk

Files:

• lib/shoes/cache.rb (modified) (1 diff)
• shoes/canvas.h (modified) (1 diff)
• shoes/config.h (modified) (3 diffs)
• shoes/ruby.c (modified) (5 diffs)

trunk/lib/shoes/cache.rb

@@ -36 +36 @@
   end
 end
-require 'rubygems/open-uri'
 require 'rubygems/installer'
 class << Gem::Ext::ExtConfBuilder

trunk/shoes/canvas.h

@@ -240 +240 @@
 void shoes_slot_init(VALUE, SHOES_SLOT_OS *, int, int, int, int, int);
 cairo_t *shoes_cairo_create(SHOES_SLOT_OS *, int, int, int);
+void shoes_control_hide_ref(SHOES_CONTROL_REF);
+void shoes_control_show_ref(SHOES_CONTROL_REF);
 
 VALUE shoes_app_main(int, VALUE *, VALUE);

trunk/shoes/config.h

@@ -61 +61 @@
 } shoes_world_gtk, SHOES_WORLD_OS;
 
+#define SHOES_CONTROL_REF GtkWidget *
 #define DC(slot) slot.canvas
 #define HAS_DRAWABLE(slot) GTK_LAYOUT(slot.canvas)->bin_window != 0
@@ -104 +105 @@
 #define kShoesSlotData    'SLOT'
 
+#define SHOES_CONTROL_REF ControlRef
 #define DC(slot) slot.view
 #define HAS_DRAWABLE(slot) slot.context != NULL
@@ -156 +158 @@
 } sheos_world_win32, SHOES_WORLD_OS;
 
+#define SHOES_CONTROL_REF HWND
 #define DC(slot) slot.window
 #define HAS_DRAWABLE(slot) slot.window != NULL

trunk/shoes/ruby.c

@@ -411 +411 @@
 }
 
+void
+shoes_control_hide_ref(SHOES_CONTROL_REF ref)
+{
+#ifdef SHOES_GTK
+  gtk_widget_hide(ref);
+#endif
+#ifdef SHOES_QUARTZ
+  HIViewSetVisible(ref, false);
+#endif
+#ifdef SHOES_WIN32
+  ShowWindow(ref, SW_HIDE);
+#endif
+}
+
+void
+shoes_control_show_ref(SHOES_CONTROL_REF ref)
+{
+#ifdef SHOES_GTK
+  gtk_widget_show(ref);
+#endif
+#ifdef SHOES_QUARTZ
+  HIViewSetVisible(ref, true);
+#endif
+#ifdef SHOES_WIN32
+  ShowWindow(ref, SW_SHOW);
+#endif
+}
+
 //
 // Macros for setting up drawing
@@ -1010 +1038 @@
   GET_STRUCT(video, self_t);
   ATTRSET(self_t->attr, hidden, Qtrue);
-#ifdef SHOES_GTK
-  gtk_widget_hide(self_t->ref);
-#endif
-#ifdef SHOES_QUARTZ
-  HIViewSetVisible(self_t->ref, false);
-#endif
-#ifdef SHOES_WIN32
-  ShowWindow(self_t->ref, SW_HIDE);
-#endif
+  shoes_control_hide_ref(self_t->ref);
   shoes_canvas_repaint_all(self_t->parent);
   return self;
@@ -1028 +1048 @@
   GET_STRUCT(video, self_t);
   ATTRSET(self_t->attr, hidden, Qfalse);
-#ifdef SHOES_GTK
-  gtk_widget_show(self_t->ref);
-#endif
-#ifdef SHOES_QUARTZ
-  HIViewSetVisible(self_t->ref, true);
-#endif
-#ifdef SHOES_WIN32
-  ShowWindow(self_t->ref, SW_SHOW);
-#endif
+  shoes_control_show_ref(self_t->ref);
   shoes_canvas_repaint_all(self_t->parent);
   return self;
@@ -2564 +2576 @@
   GET_STRUCT(control, self_t);
   ATTRSET(self_t->attr, hidden, Qtrue);
-#ifdef SHOES_GTK
-  gtk_widget_hide(self_t->ref);
-#endif
-#ifdef SHOES_QUARTZ
-  HIViewSetVisible(self_t->ref, false);
-#endif
-#ifdef SHOES_WIN32
-  ShowWindow(self_t->ref, SW_HIDE);
-#endif
+  shoes_control_hide_ref(self_t->ref);
   return self;
 }
@@ -2581 +2585 @@
   GET_STRUCT(control, self_t);
   ATTRSET(self_t->attr, hidden, Qfalse);
-#ifdef SHOES_GTK
-  gtk_widget_show(self_t->ref);
-#endif
-#ifdef SHOES_QUARTZ
-  HIViewSetVisible(self_t->ref, true);
-#endif
-#ifdef SHOES_WIN32
-  ShowWindow(self_t->ref, SW_SHOW);
-#endif
+  shoes_control_show_ref(self_t->ref);
   return self;
 }