Author: jackson
Date: 2007-08-23 15:27:12 -0400 (Thu, 23 Aug 2007)
New Revision: 84738

Modified:
   trunk/moon/src/ChangeLog
   trunk/moon/src/dependencyobject.cpp
   trunk/moon/src/dependencyobject.h
   trunk/moon/src/runtime.cpp
   trunk/moon/src/runtime.h
Log:

        * runtime.cpp|h: Make Resize use our event system (so the plugin
        can use it).
        * dependencyobject.cpp|h: Rename the add/remove handler
        * functions
        to not require dependencyobjects.



Modified: trunk/moon/src/ChangeLog
===================================================================
--- trunk/moon/src/ChangeLog    2007-08-23 19:14:13 UTC (rev 84737)
+++ trunk/moon/src/ChangeLog    2007-08-23 19:27:12 UTC (rev 84738)
@@ -1,3 +1,10 @@
+2007-08-23  Jackson Harper  <[EMAIL PROTECTED]>
+
+       * runtime.cpp|h: Make Resize use our event system (so the plugin
+       can use it).
+       * dependencyobject.cpp|h: Rename the add/remove handler functions
+       to not require dependencyobjects.
+
 2007-08-23  Jeffrey Stedfast  <[EMAIL PROTECTED]>
 
        * media.cpp (OnPropertyChanged): Don't autoplay here.

Modified: trunk/moon/src/dependencyobject.cpp
===================================================================
--- trunk/moon/src/dependencyobject.cpp 2007-08-23 19:14:13 UTC (rev 84737)
+++ trunk/moon/src/dependencyobject.cpp 2007-08-23 19:27:12 UTC (rev 84738)
@@ -434,19 +434,6 @@
        return obj->GetTypeName ();
 }
 
-void
-dependency_object_add_event_handler (DependencyObject *o, char *event, 
EventHandler handler, gpointer closure)
-{
-       o->AddHandler (event, handler, closure);
-}
-
-void
-dependency_object_remove_event_handler (DependencyObject *o, char *event, 
EventHandler handler, gpointer closure)
-{
-       o->RemoveHandler (event, handler, closure);
-}
-
-
 //
 // Use this for values that can be null
 //
@@ -956,3 +943,16 @@
 
        g_list_free (copy);
 }
+
+void
+event_object_add_event_handler (EventObject *o, char *event, EventHandler 
handler, gpointer closure)
+{
+       o->AddHandler (event, handler, closure);
+}
+
+void
+event_object_remove_event_handler (EventObject *o, char *event, EventHandler 
handler, gpointer closure)
+{
+       o->RemoveHandler (event, handler, closure);
+}
+

Modified: trunk/moon/src/dependencyobject.h
===================================================================
--- trunk/moon/src/dependencyobject.h   2007-08-23 19:14:13 UTC (rev 84737)
+++ trunk/moon/src/dependencyobject.h   2007-08-23 19:27:12 UTC (rev 84738)
@@ -182,11 +182,6 @@
 Type::Kind dependency_object_get_object_type (DependencyObject *obj);
 const char *dependency_object_get_type_name (DependencyObject *obj);
 
-void dependency_object_add_event_handler (DependencyObject *o, char *event, 
EventHandler handler, gpointer closure);
-void dependency_object_remove_event_handler (DependencyObject *o, char *event, 
EventHandler handler, gpointer closure);
-
-
-
 DependencyProperty *dependency_property_lookup (Type::Kind type, char *name);
 char *dependency_property_get_name (DependencyProperty* property);
 bool  dependency_property_is_nullable (DependencyProperty* property);
@@ -195,6 +190,11 @@
 
 void dependencyobject_init (void);
 
+
+void event_object_add_event_handler (EventObject *o, char *event, EventHandler 
handler, gpointer closure);
+void event_object_remove_event_handler (EventObject *o, char *event, 
EventHandler handler, gpointer closure);
+
+
 G_END_DECLS
 
 #endif /* __MONO_DEPOBJECT_H__ */

Modified: trunk/moon/src/runtime.cpp
===================================================================
--- trunk/moon/src/runtime.cpp  2007-08-23 19:14:13 UTC (rev 84737)
+++ trunk/moon/src/runtime.cpp  2007-08-23 19:27:12 UTC (rev 84738)
@@ -70,9 +70,7 @@
 
 
 Surface::Surface(int w, int h)
-  : cb_surface_resize(NULL),
-
-    width (w), height (h), buffer (0), pixbuf (NULL),
+  : width (w), height (h), buffer (0), pixbuf (NULL),
     using_cairo_xlib_surface(0),
     cairo_buffer_surface (NULL), cairo_buffer(NULL),
     cairo_xlib(NULL), cairo (NULL), transparent(false),
@@ -114,6 +112,8 @@
        toplevel = NULL;
        capture_element = NULL;
 
+       ResizeEvent = RegisterEvent ("Resize");
+
        Realloc ();
 }
 
@@ -349,6 +349,8 @@
 Surface::Resize (int width, int height)
 {
        gtk_widget_set_size_request (drawing_area, width, height);
+
+       Emit (ResizeEvent);
 }
 
 void
@@ -375,13 +377,6 @@
 }
 
 void
-Surface::RegisterEvents (callback_plain_event surface_resize)
-{
-       this->cb_surface_resize = surface_resize;
-}
-
-
-void
 Surface::render_cb (EventObject *sender, gpointer calldata, gpointer closure)
 {
        Surface *s = (Surface*)closure;
@@ -812,13 +807,6 @@
 }
 
 void
-surface_register_events (Surface *s,
-                        callback_plain_event surface_resize)
-{
-       s->RegisterEvents (surface_resize);
-}
-
-void
 Surface::SetTrans (bool trans)
 {
        transparent = trans;

Modified: trunk/moon/src/runtime.h
===================================================================
--- trunk/moon/src/runtime.h    2007-08-23 19:14:13 UTC (rev 84737)
+++ trunk/moon/src/runtime.h    2007-08-23 19:27:12 UTC (rev 84738)
@@ -34,9 +34,7 @@
 #define ENDTIMER(id,str)
 #endif
 
-typedef void (*callback_plain_event)    (UIElement *target);
-
-class Surface {
+class Surface : EventObject {
  public:
        Surface(int width, int height);
        
@@ -70,10 +68,8 @@
        GtkWidget* GetDrawingArea () { return drawing_area; }
        UIElement* GetToplevel() { return toplevel; }
 
-       void RegisterEvents (callback_plain_event surface_resize);
+       int ResizeEvent;
 
-       callback_plain_event cb_surface_resize;
-
 private:
        int width, height;
 
@@ -154,9 +150,6 @@
 
 void    *surface_get_drawing_area (Surface *s);
 
-void     surface_register_events (Surface *s,
-                                 callback_plain_event surface_resize);
-
 cairo_t *measuring_context_create (void);
 void     measuring_context_destroy (cairo_t *cr);
 

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to