Changeset 433

Show
Ignore:
Timestamp:
12/10/07 13:58:25 (1 year ago)
Author:
jeffrey
Message:

ImageView works, basic AnimView functionality

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plgtkimageview/ImageView.xs

    r432 r433  
    4040 
    4141## call as $widget = Gtk2::ImageView->new 
    42 GtkWidget * 
     42GtkWidget_ornull * 
    4343gtk_image_view_new (class) 
    4444        SV * class 
    …… 
    4747 
    4848## call as $viewport = $imageview->get_viewport 
    49 GdkRectangle * 
     49## gboolean gtk_image_view_get_viewport (GtkImageView *view, GdkRectangle *rect); 
     50GdkRectangle_ornull * 
    5051gtk_image_view_get_viewport (view) 
    5152        GtkImageView *  view 
    5253        PREINIT: 
    53                 GdkRectangle *        rect; 
     54                GdkRectangle  rect; 
    5455        CODE: 
    55                 if( ! gtk_image_view_get_viewport(view, RETVAL) ) 
     56                if (!gtk_image_view_get_viewport(view, &rect)) 
    5657                        XSRETURN_UNDEF; 
     58                RETVAL = ▭ 
    5759        OUTPUT: 
    5860                RETVAL 
    5961 
    6062## call as $rectangle = $imageview->get_draw_rect 
    61 GdkRectangle * 
     63GdkRectangle_ornull * 
    6264gtk_image_view_get_draw_rect (view); 
    6365        GtkImageView *  view 
    6466        PREINIT: 
    65                 GdkRectangle *        rect; 
     67                GdkRectangle  rect; 
    6668        CODE: 
    67                 if( ! gtk_image_view_get_draw_rect(view, RETVAL) ) 
     69                if (!gtk_image_view_get_draw_rect(view, &rect)) 
    6870                        XSRETURN_UNDEF; 
     71                RETVAL = ▭ 
    6972        OUTPUT: 
    7073                RETVAL 
    7174 
    72 ## call as ($check_color1, $check_color2) = $imageview->get_check_colors 
     75## call as @check_colors = $imageview->get_check_colors 
    7376void 
    7477gtk_image_view_get_check_colors (view) 
    7578        GtkImageView *  view 
    7679        PREINIT: 
    77                 int * check_color1; 
    78                 int * check_color2; 
     80                int   check_color1; 
     81                int   check_color2; 
    7982        PPCODE: 
    80                 gtk_image_view_get_check_colors (view, check_color1, check_color2); 
    81                 EXTEND(SP, 2); 
    82                 PUSHs(sv_2mortal(newSViv((int)check_color1))); 
    83                 PUSHs(sv_2mortal(newSViv((int)check_color2))); 
     83                gtk_image_view_get_check_colors (view, &check_color1, &check_color2); 
     84                XPUSHs(sv_2mortal(newSViv(check_color1))); 
     85                XPUSHs(sv_2mortal(newSViv(check_color2))); 
    8486 
    8587## call as $imageview->set_offset($x, $y, $invalidate) 
    …… 
    110112 
    111113## call as $pixbuf = $imageview->get_pixbuf 
    112 GdkPixbuf * 
     114GdkPixbuf_ornull * 
    113115gtk_image_view_get_pixbuf (view) 
    114116        GtkImageView *  view 

  • plgtkimageview/MANIFEST

    r432 r433  
    11gtkimageviewperl.h 
    22ImageView.pm 
     3AnimView.xs 
     4IImageTool.xs 
    35ImageView.xs 
    46Makefile.PL 
    57MANIFEST 
    68maps 
    7 t/01.t 
     9t/imageview.t 
     10t/animview.t 
    811t/gnome_logo.jpg 
    912META.yml                                 Module meta-data (added by MakeMaker) 

  • plgtkimageview/Makefile.PL

    r432 r433  
    6060                    "@headers > build/gtkimageviewperl-gtypes.h"); 
    6161 
    62 system('echo "TYPEMAP" > build/gtkimageviewperl-gtypes.typemap'); 
    63 system('echo "" >> build/gtkimageviewperl-gtypes.typemap'); 
    64 system('echo "GtkImageTransp *  T_GPERL_GENERIC_WRAPPER" >> build/gtkimageviewperl-gtypes.typemap'); 
    65 system('echo "" >> build/gtkimageviewperl-gtypes.typemap'); 
    66 system('echo "INPUT" >> build/gtkimageviewperl-gtypes.typemap'); 
    67 system('echo "" >> build/gtkimageviewperl-gtypes.typemap'); 
    68 system('echo "OUTPUT" >> build/gtkimageviewperl-gtypes.typemap'); 
    6962# 
    7063# autogeneration 
    7164# 
    72 Gtk2::CodeGen->parse_maps ('gtkimageviewperl'); 
    73 Gtk2::CodeGen->write_boot; 
     65Gtk2::CodeGen->parse_maps('gtkimageviewperl'); 
     66Gtk2::CodeGen->write_boot(glob => '*.xs', ignore => 'Gtk2::ImageView'); 
    7467 
    7568# now we're ready to start creating the makefile. 
    …… 
    8477$depends->add_pm ('ImageView.pm' => '$(INST_LIBDIR)/ImageView.pm'); 
    8578my $cwd = cwd(); 
    86 $depends->add_typemaps (File::Spec->catfile($cwd,'build/gtkimageviewperl-gtypes.typemap'), 
    87                         map {File::Spec->catfile($cwd,$_)} 
     79$depends->add_typemaps (map {File::Spec->catfile($cwd,$_)} 
    8880                                              'build/gtkimageviewperl.typemap'); 
    89 $depends->add_headers ('gtkimageviewperl.h'); 
    9081 
    9182$depends->install (qw(build/gtkimageviewperl-autogen.h 

  • plgtkimageview/maps

    r432 r433  
    11GTK_TYPE_IMAGE_VIEW                     GtkImageView    GObject Gtk2::ImageView 
    2 GTK_TYPE_IIMAGE_TOOL                    GtkIImageTool   GObject Gtk2::ImageTool 
    3 GTKIMAGEVIEWPERL_TYPE_GTK_IMAGE_TRANSP  GtkImageTransp  GEnum   Gtk2::ImageTool 
     2GTK_TYPE_ANIM_VIEW                      GtkAnimView     GObject Gtk2::AnimView 
     3GTK_TYPE_IIMAGE_TOOL                    GtkIImageTool   GObject Gtk2::IImageTool 
     4GTKIMAGEVIEWPERL_TYPE_GTK_IMAGE_TRANSP  GtkImageTransp  GEnum   Gtk2::ImageView