From: Peter g. <pg...@co...> - 2009-01-11 15:47:19
|
Sat Jan 10 17:02:57 EST 2009 Peter Gavin <pg...@gm...> * workaround several warnings caused by hsc2hs on amd64 hunk ./Makefile.am 14 + template-hsc-gtk2hs.h \ hunk ./gstreamer/Media/Streaming/GStreamer/Core/Constants.hsc 62 -newtype FormatId = FormatId #{type GstFormat} +newtype FormatId = FormatId #{gtk2hs_type GstFormat} hunk ./gstreamer/Media/Streaming/GStreamer/Core/Constants.hsc 74 -toFormat :: #{type GstFormat} -> Format +toFormat :: #{gtk2hs_type GstFormat} -> Format hunk ./gstreamer/Media/Streaming/GStreamer/Core/Constants.hsc 82 -fromFormat :: Format -> #{type GstFormat} +fromFormat :: Format -> #{gtk2hs_type GstFormat} hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 280 - (ty :: #{type GdkEventType}) <- peek (castPtr ptr) + (ty :: #{gtk2hs_type GdkEventType}) <- peek (castPtr ptr) hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 285 - (x :: #{type gdouble}) <- #{peek GdkEventButton, x} ptr - (y :: #{type gdouble}) <- #{peek GdkEventButton, y} ptr + (x :: #{gtk2hs_type gdouble}) <- #{peek GdkEventButton, x} ptr + (y :: #{gtk2hs_type gdouble}) <- #{peek GdkEventButton, y} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 289 - (x :: #{type gdouble}) <- #{peek GdkEventScroll, x} ptr - (y :: #{type gdouble}) <- #{peek GdkEventScroll, y} ptr + (x :: #{gtk2hs_type gdouble}) <- #{peek GdkEventScroll, x} ptr + (y :: #{gtk2hs_type gdouble}) <- #{peek GdkEventScroll, y} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 293 - (x :: #{type gdouble}) <- #{peek GdkEventMotion, x} ptr - (y :: #{type gdouble}) <- #{peek GdkEventMotion, y} ptr + (x :: #{gtk2hs_type gdouble}) <- #{peek GdkEventMotion, x} ptr + (y :: #{gtk2hs_type gdouble}) <- #{peek GdkEventMotion, y} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 298 - (x :: #{type gdouble}) <- #{peek GdkEventCrossing, x} ptr - (y :: #{type gdouble}) <- #{peek GdkEventCrossing, y} ptr + (x :: #{gtk2hs_type gdouble}) <- #{peek GdkEventCrossing, x} ptr + (y :: #{gtk2hs_type gdouble}) <- #{peek GdkEventCrossing, y} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 315 - (ty :: #{type GdkEventType}) <- peek (castPtr ptr) + (ty :: #{gtk2hs_type GdkEventType}) <- peek (castPtr ptr) hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 320 - (x :: #{type gdouble}) <- #{peek GdkEventButton, x_root} ptr - (y :: #{type gdouble}) <- #{peek GdkEventButton, y_root} ptr + (x :: #{gtk2hs_type gdouble}) <- #{peek GdkEventButton, x_root} ptr + (y :: #{gtk2hs_type gdouble}) <- #{peek GdkEventButton, y_root} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 324 - (x :: #{type gdouble}) <- #{peek GdkEventScroll, x_root} ptr - (y :: #{type gdouble}) <- #{peek GdkEventScroll, y_root} ptr + (x :: #{gtk2hs_type gdouble}) <- #{peek GdkEventScroll, x_root} ptr + (y :: #{gtk2hs_type gdouble}) <- #{peek GdkEventScroll, y_root} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 328 - (x :: #{type gdouble}) <- #{peek GdkEventMotion, x_root} ptr - (y :: #{type gdouble}) <- #{peek GdkEventMotion, y_root} ptr + (x :: #{gtk2hs_type gdouble}) <- #{peek GdkEventMotion, x_root} ptr + (y :: #{gtk2hs_type gdouble}) <- #{peek GdkEventMotion, y_root} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 333 - (x :: #{type gdouble}) <- #{peek GdkEventCrossing, x_root} ptr - (y :: #{type gdouble}) <- #{peek GdkEventCrossing, y_root} ptr + (x :: #{gtk2hs_type gdouble}) <- #{peek GdkEventCrossing, x_root} ptr + (y :: #{gtk2hs_type gdouble}) <- #{peek GdkEventCrossing, y_root} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 360 - defModMask :: #type guint + defModMask :: #gtk2hs_type guint hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 367 - (ty :: #{type GdkEventType}) <- peek (castPtr ptr) + (ty :: #{gtk2hs_type GdkEventType}) <- peek (castPtr ptr) hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 370 - (modif ::#type guint) <- #{peek GdkEventKey, state} ptr + (modif ::#gtk2hs_type guint) <- #{peek GdkEventKey, state} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 376 - (modif ::#type guint) <- #{peek GdkEventButton, state} ptr + (modif ::#gtk2hs_type guint) <- #{peek GdkEventButton, state} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 379 - (modif ::#type guint) <- #{peek GdkEventScroll, state} ptr + (modif ::#gtk2hs_type guint) <- #{peek GdkEventScroll, state} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 382 - (modif ::#type guint) <- #{peek GdkEventMotion, state} ptr + (modif ::#gtk2hs_type guint) <- #{peek GdkEventMotion, state} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 386 - (modif ::#type guint) <- #{peek GdkEventCrossing, state} ptr + (modif ::#gtk2hs_type guint) <- #{peek GdkEventCrossing, state} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 415 - (ty :: #{type GdkEventType}) <- peek (castPtr ptr) + (ty :: #{gtk2hs_type GdkEventType}) <- peek (castPtr ptr) hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 418 - (time :: #type guint32) <- #{peek GdkEventKey, time} ptr + (time :: #gtk2hs_type guint32) <- #{peek GdkEventKey, time} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 424 - (time :: #type guint32) <- #{peek GdkEventButton, time} ptr + (time :: #gtk2hs_type guint32) <- #{peek GdkEventButton, time} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 427 - (time :: #type guint32) <- #{peek GdkEventScroll, time} ptr + (time :: #gtk2hs_type guint32) <- #{peek GdkEventScroll, time} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 430 - (time :: #type guint32) <- #{peek GdkEventMotion, time} ptr + (time :: #gtk2hs_type guint32) <- #{peek GdkEventMotion, time} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 434 - (time :: #type guint32) <- #{peek GdkEventCrossing, time} ptr + (time :: #gtk2hs_type guint32) <- #{peek GdkEventCrossing, time} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 437 - (time :: #type guint32) <- #{peek GdkEventProperty, time} ptr + (time :: #gtk2hs_type guint32) <- #{peek GdkEventProperty, time} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 441 - (time :: #type guint32) <- #{peek GdkEventProximity, time} ptr + (time :: #gtk2hs_type guint32) <- #{peek GdkEventProximity, time} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 444 - (time :: #type guint32) <- #{peek GdkEventOwnerChange, time} ptr + (time :: #gtk2hs_type guint32) <- #{peek GdkEventOwnerChange, time} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 451 - (#{peek GdkEventKey, keyval} ptr :: IO #{type guint}) [_$_] + (#{peek GdkEventKey, keyval} ptr :: IO #{gtk2hs_type guint}) [_$_] hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 460 - (#{peek GdkEventKey, hardware_keycode} ptr :: IO #{type guint16}) + (#{peek GdkEventKey, hardware_keycode} ptr :: IO #{gtk2hs_type guint16}) hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 465 - (#{peek GdkEventKey, group} ptr :: IO #{type guint8}) + (#{peek GdkEventKey, group} ptr :: IO #{gtk2hs_type guint8}) hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 470 - (#{peek GdkEventButton, button} ptr :: IO #{type guint}) + (#{peek GdkEventButton, button} ptr :: IO #{gtk2hs_type guint}) hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 475 - (#{peek GdkEventScroll, direction} ptr :: IO #{type GdkScrollDirection}) + (#{peek GdkEventScroll, direction} ptr :: IO #{gtk2hs_type GdkScrollDirection}) hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 481 - (#{peek GdkEventMotion, is_hint} ptr :: IO #{type gint16}) + (#{peek GdkEventMotion, is_hint} ptr :: IO #{gtk2hs_type gint16}) hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 501 - (#{peek GdkEventVisibility, state} ptr :: IO #{type GdkVisibilityState}) + (#{peek GdkEventVisibility, state} ptr :: IO #{gtk2hs_type GdkVisibilityState}) hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 506 - (#{peek GdkEventCrossing, mode} ptr :: IO #{type GdkCrossingMode}) + (#{peek GdkEventCrossing, mode} ptr :: IO #{gtk2hs_type GdkCrossingMode}) hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 511 - (#{peek GdkEventCrossing, detail} ptr :: IO #{type GdkNotifyType}) + (#{peek GdkEventCrossing, detail} ptr :: IO #{gtk2hs_type GdkNotifyType}) hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 516 - (#{peek GdkEventCrossing, focus} ptr :: IO #{type gboolean}) + (#{peek GdkEventCrossing, focus} ptr :: IO #{gtk2hs_type gboolean}) hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 521 - (#{peek GdkEventFocus, in} ptr :: IO #{type gint16}) + (#{peek GdkEventFocus, in} ptr :: IO #{gtk2hs_type gint16}) hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 526 - (x :: #{type gint}) <- #{peek GdkEventConfigure, x} ptr - (y :: #{type gint}) <- #{peek GdkEventConfigure, y} ptr + (x :: #{gtk2hs_type gint}) <- #{peek GdkEventConfigure, x} ptr + (y :: #{gtk2hs_type gint}) <- #{peek GdkEventConfigure, y} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 533 - (x :: #{type gint}) <- #{peek GdkEventConfigure, width} ptr - (y :: #{type gint}) <- #{peek GdkEventConfigure, height} ptr + (x :: #{gtk2hs_type gint}) <- #{peek GdkEventConfigure, width} ptr + (y :: #{gtk2hs_type gint}) <- #{peek GdkEventConfigure, height} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 544 - (#{peek GdkEventWindowState, changed_mask} ptr :: IO #{type GdkWindowState}) + (#{peek GdkEventWindowState, changed_mask} ptr :: IO #{gtk2hs_type GdkWindowState}) hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 549 - (#{peek GdkEventWindowState, new_window_state} ptr :: IO #{type GdkWindowState}) + (#{peek GdkEventWindowState, new_window_state} ptr :: IO #{gtk2hs_type GdkWindowState}) hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 555 - (#{peek GdkEventOwnerChange, reason} ptr :: IO #{type GdkOwnerChange}) + (#{peek GdkEventOwnerChange, reason} ptr :: IO #{gtk2hs_type GdkOwnerChange}) hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 565 - (#{peek GdkEventOwnerChange, selection_time} ptr :: IO (#{type guint32})) + (#{peek GdkEventOwnerChange, selection_time} ptr :: IO (#{gtk2hs_type guint32})) hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 573 - (#{peek GdkEventGrabBroken, keyboard} ptr :: IO #{type gboolean}) + (#{peek GdkEventGrabBroken, keyboard} ptr :: IO #{gtk2hs_type gboolean}) hunk ./gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 578 - (#{peek GdkEventGrabBroken, implicit} ptr :: IO #{type gboolean}) + (#{peek GdkEventGrabBroken, implicit} ptr :: IO #{gtk2hs_type gboolean}) hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 387 - (eType::#type GdkEventType) <- #{peek GdkEventAny,type} ptr + (eType::#gtk2hs_type GdkEventType) <- #{peek GdkEventAny,type} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 417 - (sent ::#type gint8) <- #{peek GdkEventAny, send_event} ptr + (sent ::#gtk2hs_type gint8) <- #{peek GdkEventAny, send_event} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 423 - (#{const GDK_EXPOSE}::#type GdkEventType) <- #{peek GdkEventAny,type} ptr - (sent_ ::#type gint8) <- #{peek GdkEventExpose, send_event} ptr + (#{const GDK_EXPOSE}::#gtk2hs_type GdkEventType) <- #{peek GdkEventAny,type} ptr + (sent_ ::#gtk2hs_type gint8) <- #{peek GdkEventExpose, send_event} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 429 - (count_ ::#type gint) <- #{peek GdkEventExpose, count} ptr + (count_ ::#gtk2hs_type gint) <- #{peek GdkEventExpose, count} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 441 - (#{const GDK_EXPOSE}::#type GdkEventType) <- #{peek GdkEventAny,type} ptr + (#{const GDK_EXPOSE}::#gtk2hs_type GdkEventType) <- #{peek GdkEventAny,type} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 446 - (sent_ ::#type gint8) <- #{peek GdkEventMotion, send_event} ptr - (time_ ::#type guint32) <- #{peek GdkEventMotion, time} ptr - (x_ ::#type gdouble) <- #{peek GdkEventMotion, x} ptr - (y_ ::#type gdouble) <- #{peek GdkEventMotion, y} ptr - (modif_ ::#type guint) <- #{peek GdkEventMotion, state} ptr - (isHint_ ::#type gint16) <- #{peek GdkEventMotion, is_hint} ptr - (xRoot_ ::#type gdouble) <- #{peek GdkEventMotion, x_root} ptr - (yRoot_ ::#type gdouble) <- #{peek GdkEventMotion, y_root} ptr + (sent_ ::#gtk2hs_type gint8) <- #{peek GdkEventMotion, send_event} ptr + (time_ ::#gtk2hs_type guint32) <- #{peek GdkEventMotion, time} ptr + (x_ ::#gtk2hs_type gdouble) <- #{peek GdkEventMotion, x} ptr + (y_ ::#gtk2hs_type gdouble) <- #{peek GdkEventMotion, y} ptr + (modif_ ::#gtk2hs_type guint) <- #{peek GdkEventMotion, state} ptr + (isHint_ ::#gtk2hs_type gint16) <- #{peek GdkEventMotion, is_hint} ptr + (xRoot_ ::#gtk2hs_type gdouble) <- #{peek GdkEventMotion, x_root} ptr + (yRoot_ ::#gtk2hs_type gdouble) <- #{peek GdkEventMotion, y_root} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 465 - (sent_ ::#type gint8) <- #{peek GdkEventButton, send_event} ptr - (time_ ::#type guint32) <- #{peek GdkEventButton, time} ptr - (x_ ::#type gdouble) <- #{peek GdkEventButton, x} ptr - (y_ ::#type gdouble) <- #{peek GdkEventButton, y} ptr - (modif_ ::#type guint) <- #{peek GdkEventButton, state} ptr - (button_ ::#type guint) <- #{peek GdkEventButton, button} ptr - (xRoot_ ::#type gdouble) <- #{peek GdkEventButton, x_root} ptr - (yRoot_ ::#type gdouble) <- #{peek GdkEventButton, y_root} ptr + (sent_ ::#gtk2hs_type gint8) <- #{peek GdkEventButton, send_event} ptr + (time_ ::#gtk2hs_type guint32) <- #{peek GdkEventButton, time} ptr + (x_ ::#gtk2hs_type gdouble) <- #{peek GdkEventButton, x} ptr + (y_ ::#gtk2hs_type gdouble) <- #{peek GdkEventButton, y} ptr + (modif_ ::#gtk2hs_type guint) <- #{peek GdkEventButton, state} ptr + (button_ ::#gtk2hs_type guint) <- #{peek GdkEventButton, button} ptr + (xRoot_ ::#gtk2hs_type gdouble) <- #{peek GdkEventButton, x_root} ptr + (yRoot_ ::#gtk2hs_type gdouble) <- #{peek GdkEventButton, y_root} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 486 - (sent_ ::#type gint8) <- #{peek GdkEventKey, send_event} ptr - (time_ ::#type guint32) <- #{peek GdkEventKey, time} ptr - (modif_ ::#type guint) <- #{peek GdkEventKey, state} ptr - (keyval_ ::#type guint) <- #{peek GdkEventKey, keyval} ptr + (sent_ ::#gtk2hs_type gint8) <- #{peek GdkEventKey, send_event} ptr + (time_ ::#gtk2hs_type guint32) <- #{peek GdkEventKey, time} ptr + (modif_ ::#gtk2hs_type guint) <- #{peek GdkEventKey, state} ptr + (keyval_ ::#gtk2hs_type guint) <- #{peek GdkEventKey, keyval} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 491 - (length_ ::#type gint) <- #{peek GdkEventKey, length} ptr + (length_ ::#gtk2hs_type gint) <- #{peek GdkEventKey, length} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 507 - (sent_ ::#type gint8) <- #{peek GdkEventCrossing, send_event} ptr - (time_ ::#type guint32) <- #{peek GdkEventCrossing, time} ptr - (x_ ::#type gdouble) <- #{peek GdkEventCrossing, x} ptr - (y_ ::#type gdouble) <- #{peek GdkEventCrossing, y} ptr - (modif_ ::#type guint) <- #{peek GdkEventCrossing, state} ptr - (xRoot_ ::#type gdouble) <- #{peek GdkEventCrossing, x_root} ptr - (yRoot_ ::#type gdouble) <- #{peek GdkEventCrossing, y_root} ptr - (cMode_ ::#type GdkCrossingMode) [_$_] + (sent_ ::#gtk2hs_type gint8) <- #{peek GdkEventCrossing, send_event} ptr + (time_ ::#gtk2hs_type guint32) <- #{peek GdkEventCrossing, time} ptr + (x_ ::#gtk2hs_type gdouble) <- #{peek GdkEventCrossing, x} ptr + (y_ ::#gtk2hs_type gdouble) <- #{peek GdkEventCrossing, y} ptr + (modif_ ::#gtk2hs_type guint) <- #{peek GdkEventCrossing, state} ptr + (xRoot_ ::#gtk2hs_type gdouble) <- #{peek GdkEventCrossing, x_root} ptr + (yRoot_ ::#gtk2hs_type gdouble) <- #{peek GdkEventCrossing, y_root} ptr + (cMode_ ::#gtk2hs_type GdkCrossingMode) [_$_] hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 516 - (nType_ ::#type GdkNotifyType) + (nType_ ::#gtk2hs_type GdkNotifyType) hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 518 - (modif_ ::#type guint) <- #{peek GdkEventCrossing, state} ptr + (modif_ ::#gtk2hs_type guint) <- #{peek GdkEventCrossing, state} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 533 - (sent_ ::#type gint8) <- #{peek GdkEventFocus, send_event} ptr - (inFocus_::#type gint16) <- #{peek GdkEventFocus, in} ptr + (sent_ ::#gtk2hs_type gint8) <- #{peek GdkEventFocus, send_event} ptr + (inFocus_::#gtk2hs_type gint16) <- #{peek GdkEventFocus, in} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 540 - (sent_ ::#type gint8) <- #{peek GdkEventConfigure, send_event} ptr - (xPar_ ::#type gint) <- #{peek GdkEventConfigure, x} ptr - (yPar_ ::#type gint) <- #{peek GdkEventConfigure, y} ptr - (width_ ::#type gint) <- #{peek GdkEventConfigure, width} ptr - (height_ ::#type gint) <- #{peek GdkEventConfigure, height} ptr + (sent_ ::#gtk2hs_type gint8) <- #{peek GdkEventConfigure, send_event} ptr + (xPar_ ::#gtk2hs_type gint) <- #{peek GdkEventConfigure, x} ptr + (yPar_ ::#gtk2hs_type gint) <- #{peek GdkEventConfigure, y} ptr + (width_ ::#gtk2hs_type gint) <- #{peek GdkEventConfigure, width} ptr + (height_ ::#gtk2hs_type gint) <- #{peek GdkEventConfigure, height} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 554 - (sent_ ::#type gint8) <- #{peek GdkEventProperty, send_event} ptr - (time_ ::#type guint32) <- #{peek GdkEventProperty, time} ptr + (sent_ ::#gtk2hs_type gint8) <- #{peek GdkEventProperty, send_event} ptr + (time_ ::#gtk2hs_type guint32) <- #{peek GdkEventProperty, time} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 562 - (sent_ ::#type gint8) <- #{peek GdkEventProximity, send_event} ptr - (time_ ::#type guint32) <- #{peek GdkEventProximity, time} ptr + (sent_ ::#gtk2hs_type gint8) <- #{peek GdkEventProximity, send_event} ptr + (time_ ::#gtk2hs_type guint32) <- #{peek GdkEventProximity, time} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 570 - (sent_ ::#type gint8) <- #{peek GdkEventVisibility, send_event} ptr - (state_ ::#type GdkVisibilityState) + (sent_ ::#gtk2hs_type gint8) <- #{peek GdkEventVisibility, send_event} ptr + (state_ ::#gtk2hs_type GdkVisibilityState) hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 578 - (sent_ ::#type gint8) <- #{peek GdkEventScroll, send_event} ptr - (time_ ::#type guint32) <- #{peek GdkEventScroll, time} ptr - (x_ ::#type gdouble) <- #{peek GdkEventScroll, x} ptr - (y_ ::#type gdouble) <- #{peek GdkEventScroll, y} ptr - (direc_ ::#type GdkScrollDirection) + (sent_ ::#gtk2hs_type gint8) <- #{peek GdkEventScroll, send_event} ptr + (time_ ::#gtk2hs_type guint32) <- #{peek GdkEventScroll, time} ptr + (x_ ::#gtk2hs_type gdouble) <- #{peek GdkEventScroll, x} ptr + (y_ ::#gtk2hs_type gdouble) <- #{peek GdkEventScroll, y} ptr + (direc_ ::#gtk2hs_type GdkScrollDirection) hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 584 - (xRoot_ ::#type gdouble) <- #{peek GdkEventScroll, x_root} ptr - (yRoot_ ::#type gdouble) <- #{peek GdkEventScroll, y_root} ptr + (xRoot_ ::#gtk2hs_type gdouble) <- #{peek GdkEventScroll, x_root} ptr + (yRoot_ ::#gtk2hs_type gdouble) <- #{peek GdkEventScroll, y_root} ptr hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 597 - (sent_ ::#type gint8) <- #{peek GdkEventWindowState, send_event} ptr - (wMask_ ::#type GdkWindowState) + (sent_ ::#gtk2hs_type gint8) <- #{peek GdkEventWindowState, send_event} ptr + (wMask_ ::#gtk2hs_type GdkWindowState) hunk ./gtk/Graphics/UI/Gtk/Gdk/Events.hsc 600 - (wState_ ::#type GdkWindowState) + (wState_ ::#gtk2hs_type GdkWindowState) hunk ./gtk/Graphics/UI/Gtk/General/StockItems.hsc 188 - (modifier :: #type GdkModifierType) + (modifier :: #gtk2hs_type GdkModifierType) hunk ./gtk/Graphics/UI/Gtk/General/StockItems.hsc 190 - (keyval :: #type guint) + (keyval :: #gtk2hs_type guint) hunk ./gtk/Graphics/UI/Gtk/General/StockItems.hsc 216 - ((fromIntegral (fromFlags modifier))::#{type GdkModifierType}) - #{poke GtkStockItem, keyval} siPtr ((fromIntegral keyval)::#{type guint}) + ((fromIntegral (fromFlags modifier))::#{gtk2hs_type GdkModifierType}) + #{poke GtkStockItem, keyval} siPtr ((fromIntegral keyval)::#{gtk2hs_type guint}) hunk ./gtk/Graphics/UI/Gtk/General/StockItems.hsc 260 - stock_add :: Ptr StockItem -> #{type guint} -> IO () + stock_add :: Ptr StockItem -> #{gtk2hs_type guint} -> IO () hunk ./gtk/Graphics/UI/Gtk/General/StockItems.hsc 263 - stock_lookup :: CString -> Ptr StockItem -> IO #type gboolean + stock_lookup :: CString -> Ptr StockItem -> IO #gtk2hs_type gboolean hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 131 - alignment _ = alignment (undefined:: #type gint) + alignment _ = alignment (undefined:: #gtk2hs_type gint) hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 133 - (x_ ::#type gint) <- #{peek GdkRectangle, x} ptr - (y_ ::#type gint) <- #{peek GdkRectangle, y} ptr - (width_ ::#type gint) <- #{peek GdkRectangle, width} ptr - (height_ ::#type gint) <- #{peek GdkRectangle, height} ptr + (x_ ::#gtk2hs_type gint) <- #{peek GdkRectangle, x} ptr + (y_ ::#gtk2hs_type gint) <- #{peek GdkRectangle, y} ptr + (width_ ::#gtk2hs_type gint) <- #{peek GdkRectangle, width} ptr + (height_ ::#gtk2hs_type gint) <- #{peek GdkRectangle, height} ptr hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 140 - #{poke GdkRectangle, x} ptr ((fromIntegral x)::#type gint) - #{poke GdkRectangle, y} ptr ((fromIntegral y)::#type gint) - #{poke GdkRectangle, width} ptr ((fromIntegral width)::#type gint) - #{poke GdkRectangle, height} ptr ((fromIntegral height)::#type gint) + #{poke GdkRectangle, x} ptr ((fromIntegral x)::#gtk2hs_type gint) + #{poke GdkRectangle, y} ptr ((fromIntegral y)::#gtk2hs_type gint) + #{poke GdkRectangle, width} ptr ((fromIntegral width)::#gtk2hs_type gint) + #{poke GdkRectangle, height} ptr ((fromIntegral height)::#gtk2hs_type gint) hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 150 -data Color = Color (#type guint16) (#type guint16) (#type guint16) +data Color = Color (#gtk2hs_type guint16) (#gtk2hs_type guint16) (#gtk2hs_type guint16) hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 154 - alignment _ = alignment (undefined::#type guint32) + alignment _ = alignment (undefined::#gtk2hs_type guint32) hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 161 - #{poke GdkColor, pixel} ptr (0::#{type gint32}) + #{poke GdkColor, pixel} ptr (0::#{gtk2hs_type gint32}) hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 226 - (function_ :: #{type GdkFunction}) <- #{peek GdkGCValues, function} ptr - (fill_ :: #{type GdkFill}) <- #{peek GdkGCValues, fill} ptr + (function_ :: #{gtk2hs_type GdkFunction}) <- #{peek GdkGCValues, function} ptr + (fill_ :: #{gtk2hs_type GdkFill}) <- #{peek GdkGCValues, fill} ptr hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 240 - (subwindow_ :: #{type GdkSubwindowMode}) [_$_] + (subwindow_ :: #{gtk2hs_type GdkSubwindowMode}) [_$_] hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 242 - (tsXOrigin_ :: #{type gint}) [_$_] + (tsXOrigin_ :: #{gtk2hs_type gint}) [_$_] hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 244 - (tsYOrigin_ :: #{type gint}) [_$_] + (tsYOrigin_ :: #{gtk2hs_type gint}) [_$_] hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 246 - (clipXOrigin_:: #{type gint}) [_$_] + (clipXOrigin_:: #{gtk2hs_type gint}) [_$_] hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 248 - (clipYOrigin_:: #{type gint}) [_$_] + (clipYOrigin_:: #{gtk2hs_type gint}) [_$_] hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 250 - (graphics_ :: #{type gint}) + (graphics_ :: #{gtk2hs_type gint}) hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 252 - (lineWidth_ :: #{type gint}) + (lineWidth_ :: #{gtk2hs_type gint}) hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 254 - (lineStyle_ :: #{type GdkLineStyle}) [_$_] + (lineStyle_ :: #{gtk2hs_type GdkLineStyle}) [_$_] hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 256 - (capStyle_ :: #{type GdkCapStyle}) [_$_] + (capStyle_ :: #{gtk2hs_type GdkCapStyle}) [_$_] hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 258 - (joinStyle_ :: #{type GdkJoinStyle}) [_$_] + (joinStyle_ :: #{gtk2hs_type GdkJoinStyle}) [_$_] hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 307 - (fromIntegral (fromEnum function_):: #{type GdkFunction}) + (fromIntegral (fromEnum function_):: #{gtk2hs_type GdkFunction}) hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 310 - (fromIntegral (fromEnum fill_):: #{type GdkFill}) + (fromIntegral (fromEnum fill_):: #{gtk2hs_type GdkFill}) hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 328 - (fromIntegral (fromEnum subwindow_):: #{type GdkSubwindowMode}) + (fromIntegral (fromEnum subwindow_):: #{gtk2hs_type GdkSubwindowMode}) hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 331 - (fromIntegral tsXOrigin_:: #{type gint}) + (fromIntegral tsXOrigin_:: #{gtk2hs_type gint}) hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 334 - (fromIntegral tsYOrigin_:: #{type gint}) + (fromIntegral tsYOrigin_:: #{gtk2hs_type gint}) hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 337 - (fromIntegral clipXOrigin_:: #{type gint}) + (fromIntegral clipXOrigin_:: #{gtk2hs_type gint}) hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 340 - (fromIntegral clipYOrigin_:: #{type gint}) + (fromIntegral clipYOrigin_:: #{gtk2hs_type gint}) hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 343 - (fromBool graphics_:: #{type gint}) + (fromBool graphics_:: #{gtk2hs_type gint}) hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 346 - (fromIntegral lineWidth_:: #{type gint}) + (fromIntegral lineWidth_:: #{gtk2hs_type gint}) hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 349 - (fromIntegral (fromEnum lineStyle_):: #{type GdkLineStyle}) + (fromIntegral (fromEnum lineStyle_):: #{gtk2hs_type GdkLineStyle}) hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 352 - (fromIntegral (fromEnum capStyle_):: #{type GdkCapStyle}) + (fromIntegral (fromEnum capStyle_):: #{gtk2hs_type GdkCapStyle}) hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 355 - (fromIntegral (fromEnum joinStyle_):: #{type GdkJoinStyle}) + (fromIntegral (fromEnum joinStyle_):: #{gtk2hs_type GdkJoinStyle}) hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 398 - liftM (\x -> toEnum (fromIntegral (x :: #type guint8))) $ + liftM (\x -> toEnum (fromIntegral (x :: #gtk2hs_type guint8))) $ hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 408 - liftM (\x -> toEnum (fromIntegral (x :: #type guint8))) $ + liftM (\x -> toEnum (fromIntegral (x :: #gtk2hs_type guint8))) $ hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 430 - alignment _ = alignment (undefined::#type gint) + alignment _ = alignment (undefined::#gtk2hs_type gint) hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 432 - (width_ ::#type gint) <- #{peek GtkRequisition, width} ptr - (height_ ::#type gint) <- #{peek GtkRequisition, height} ptr + (width_ ::#gtk2hs_type gint) <- #{peek GtkRequisition, width} ptr + (height_ ::#gtk2hs_type gint) <- #{peek GtkRequisition, height} ptr hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 436 - #{poke GtkRequisition, width} ptr ((fromIntegral width)::#type gint) - #{poke GtkRequisition, height} ptr ((fromIntegral height)::#type gint) + #{poke GtkRequisition, width} ptr ((fromIntegral width)::#gtk2hs_type gint) + #{poke GtkRequisition, height} ptr ((fromIntegral height)::#gtk2hs_type gint) hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 444 -inputError :: #{type gint} +inputError :: #{gtk2hs_type gint} hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 581 -newtype NativeWindowId = NativeWindowId #{type GdkNativeWindow} deriving (Eq, Show) +newtype NativeWindowId = NativeWindowId #{gtk2hs_type GdkNativeWindow} deriving (Eq, Show) hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 599 - CInt -- \#type GtkToolbarChildType + CInt -- \#gtk2hs_type GtkToolbarChildType hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 707 - (width :: #{type gint}) <- #{peek GtkAllocation, width} [_$_] + (width :: #{gtk2hs_type gint}) <- #{peek GtkAllocation, width} [_$_] hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 709 - (height :: #{type gint}) <- #{peek GtkAllocation, height} + (height :: #{gtk2hs_type gint}) <- #{peek GtkAllocation, height} hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 855 -dragContextGetActions dc = liftM (fromIntegral :: #{type int} -> Int) $ +dragContextGetActions dc = liftM (fromIntegral :: #{gtk2hs_type int} -> Int) $ hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 860 - #{poke GdkDragContext, actions} ptr (fromIntegral val :: #{type int}) + #{poke GdkDragContext, actions} ptr (fromIntegral val :: #{gtk2hs_type int}) hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 863 -dragContextGetAction dc = liftM (fromIntegral :: #{type int} -> Int) $ +dragContextGetAction dc = liftM (fromIntegral :: #{gtk2hs_type int} -> Int) $ hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 868 - #{poke GdkDragContext, action} ptr (fromIntegral val :: #{type int}) + #{poke GdkDragContext, action} ptr (fromIntegral val :: #{gtk2hs_type int}) hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 871 -dragContextGetSuggestedAction dc = liftM (fromIntegral :: #{type int} -> Int) $ +dragContextGetSuggestedAction dc = liftM (fromIntegral :: #{gtk2hs_type int} -> Int) $ hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 876 - #{poke GdkDragContext, suggested_action} ptr (fromIntegral val :: #{type int}) + #{poke GdkDragContext, suggested_action} ptr (fromIntegral val :: #{gtk2hs_type int}) hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 937 -data TargetEntry = TargetEntry (Ptr #{type gchar}) InfoId +data TargetEntry = TargetEntry (Ptr #{gtk2hs_type gchar}) InfoId hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 955 - gdk_atom_name :: Ptr () -> IO (Ptr #{type gchar}) + gdk_atom_name :: Ptr () -> IO (Ptr #{gtk2hs_type gchar}) hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 958 - g_free :: Ptr #{type gchar} -> IO () + g_free :: Ptr #{gtk2hs_type gchar} -> IO () hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 962 - alignment _ = alignment (undefined::#type guint32) + alignment _ = alignment (undefined::#gtk2hs_type guint32) hunk ./gtk/Graphics/UI/Gtk/General/Structs.hsc 966 - #{poke GtkTargetEntry, flags} ptr (0::#{type guint}) + #{poke GtkTargetEntry, flags} ptr (0::#{gtk2hs_type guint}) hunk ./gtk/Graphics/UI/Gtk/Pango/Structs.hsc 156 - return (toBool (level :: #{type guint8})) + return (toBool (level :: #{gtk2hs_type guint8})) hunk ./gtk/Graphics/UI/Gtk/Pango/Structs.hsc 163 - (fromIntegral (ofsToUTF start correct) :: #{type guint}) + (fromIntegral (ofsToUTF start correct) :: #{gtk2hs_type guint}) hunk ./gtk/Graphics/UI/Gtk/Pango/Structs.hsc 165 - (fromIntegral (ofsToUTF end correct) :: #{type guint}) + (fromIntegral (ofsToUTF end correct) :: #{gtk2hs_type guint}) hunk ./gtk/Graphics/UI/Gtk/Pango/Structs.hsc 176 - b = ofsFromUTF (fromIntegral (startByte :: #{type guint})) correct + b = ofsFromUTF (fromIntegral (startByte :: #{gtk2hs_type guint})) correct hunk ./gtk/Graphics/UI/Gtk/Pango/Structs.hsc 178 - e = ofsFromUTF (fromIntegral (endByte :: #{type guint})) correct - case ty :: #{type PangoAttrType} of + e = ofsFromUTF (fromIntegral (endByte :: #{gtk2hs_type guint})) correct + case ty :: #{gtk2hs_type PangoAttrType} of hunk ./gtk/Graphics/UI/Gtk/Pango/Structs.hsc 189 - return $ AttrStyle b e (toEnum (fromIntegral (v::#{type int}))) + return $ AttrStyle b e (toEnum (fromIntegral (v::#{gtk2hs_type int}))) hunk ./gtk/Graphics/UI/Gtk/Pango/Structs.hsc 192 - return $ AttrWeight b e (toEnum (fromIntegral (v::#{type int}))) + return $ AttrWeight b e (toEnum (fromIntegral (v::#{gtk2hs_type int}))) hunk ./gtk/Graphics/UI/Gtk/Pango/Structs.hsc 195 - return $ AttrVariant b e (toEnum (fromIntegral (v::#{type int}))) + return $ AttrVariant b e (toEnum (fromIntegral (v::#{gtk2hs_type int}))) hunk ./gtk/Graphics/UI/Gtk/Pango/Structs.hsc 198 - return $ AttrStretch b e (toEnum (fromIntegral (v::#{type int}))) + return $ AttrStretch b e (toEnum (fromIntegral (v::#{gtk2hs_type int}))) hunk ./gtk/Graphics/UI/Gtk/Pango/Structs.hsc 201 - return $ AttrSize b e (realToFrac (v::#{type double})) + return $ AttrSize b e (realToFrac (v::#{gtk2hs_type double})) hunk ./gtk/Graphics/UI/Gtk/Pango/Structs.hsc 205 - return $ AttrAbsSize b e (realToFrac (v::#{type double})) + return $ AttrAbsSize b e (realToFrac (v::#{gtk2hs_type double})) hunk ./gtk/Graphics/UI/Gtk/Pango/Structs.hsc 219 - return $ AttrUnderline b e (toEnum (fromIntegral (v::#{type int}))) + return $ AttrUnderline b e (toEnum (fromIntegral (v::#{gtk2hs_type int}))) hunk ./gtk/Graphics/UI/Gtk/Pango/Structs.hsc 228 - return $ AttrStrikethrough b e (toEnum (fromIntegral (v::#{type int}))) + return $ AttrStrikethrough b e (toEnum (fromIntegral (v::#{gtk2hs_type int}))) hunk ./gtk/Graphics/UI/Gtk/Pango/Structs.hsc 237 - return $ AttrRise b e (realToFrac (v::#{type double})) + return $ AttrRise b e (realToFrac (v::#{gtk2hs_type double})) hunk ./gtk/Graphics/UI/Gtk/Pango/Structs.hsc 246 - return $ AttrScale b e (realToFrac (v::#{type double})) + return $ AttrScale b e (realToFrac (v::#{gtk2hs_type double})) hunk ./gtk/Graphics/UI/Gtk/Pango/Structs.hsc 250 - return $ AttrFallback b e (toBool (v::#{type int})) + return $ AttrFallback b e (toBool (v::#{gtk2hs_type int})) hunk ./gtk/Graphics/UI/Gtk/Pango/Structs.hsc 255 - return $ AttrLetterSpacing b e (realToFrac (v::#{type double})) + return $ AttrLetterSpacing b e (realToFrac (v::#{gtk2hs_type double})) hunk ./gtk/Graphics/UI/Gtk/Pango/Structs.hsc 260 - return $ AttrGravity b e (toEnum (fromIntegral (v::#{type int}))) + return $ AttrGravity b e (toEnum (fromIntegral (v::#{gtk2hs_type int}))) hunk ./gtk/Graphics/UI/Gtk/Pango/Structs.hsc 263 - return $ AttrGravityHint b e (toEnum (fromIntegral (v::#{type int}))) + return $ AttrGravityHint b e (toEnum (fromIntegral (v::#{gtk2hs_type int}))) hunk ./mk/common.mk 192 -.hsc.hs: $(CONFIG_HEADER) +.hsc.hs: $(CONFIG_HEADER) template-hsc-gtk2hs.h hunk ./mk/common.mk 200 + -C'-optc-include' -C'-optctemplate-hsc-gtk2hs.h' \ addfile ./template-hsc-gtk2hs.h hunk ./template-hsc-gtk2hs.h 1 +#ifndef _TEMPLATE_HSC_GTK2HS_H_ +#define _TEMPLATE_HSC_GTK2HS_H_ + +#include <glib.h> + +#define hsc_gtk2hs_type(t) \ + if ((t)(int)(t)1.4 == (t)1.4) \ + printf ("%s%" G_GSIZE_FORMAT, \ + (t)(-1) < (t)0 ? "Int" : "Word", \ + sizeof (t) * 8); \ + else \ + printf ("%s", \ + sizeof (t) > sizeof (double) ? "LDouble" : \ + sizeof (t) == sizeof (double) ? "Double" : \ + "Float"); + +#endif |