← Back to branch summary

~valavanisalex/ubuntu/oneiric/inkscape/inkscape_0.48.1-2ubuntu4

« back to all changes in this revision

Viewing changes to src/widgets/sp-widget.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook, Ted Gould, Kees Cook
  • Date: 2009-06-24 14:00:43 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20090624140043-07stp20mry48hqup
Tags: 0.47~pre0-0ubuntu1
* New upstream release

[ Ted Gould ]
* debian/control: Adding libgsl0 and removing version specifics on boost

[ Kees Cook ]
* debian/watch: updated to run uupdate and mangle pre-release versions.
* Dropped patches that have been taken upstream:
  - 01_mips
  - 02-poppler-0.8.3
  - 03-chinese-inkscape
  - 05_fix_latex_patch
  - 06_gcc-4.4
  - 07_cdr2svg
  - 08_skip-bad-utf-on-pdf-import
  - 09_gtk-clist
  - 10_belarussian
  - 11_libpng
  - 12_desktop
  - 13_slider
  - 100_svg_import_improvements
  - 102_sp_pattern_painter_free
  - 103_bitmap_type_print

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/widgets/sp-widget.cpp
46
46
GtkType
47
47
sp_widget_get_type (void)
48
48
{
 
49
    //TODO: switch to GObject
 
50
    // GtkType and such calls were deprecated a while back with the
 
51
    // introduction of GObject as a separate layer, with GType instead. --JonCruz
 
52
 
49
53
        static GtkType type = 0;
50
54
        if (!type) {
51
55
                static const GtkTypeInfo info = {
52
 
                        "SPWidget",
 
56
                        (gchar*) "SPWidget",
53
57
                        sizeof (SPWidget),
54
58
                        sizeof (SPWidgetClass),
55
59
                        (GtkClassInitFunc) sp_widget_class_init,
124
128
 
125
129
        if (spw->inkscape) {
126
130
                /* Disconnect signals */
127
 
                // the checks are necessary because when destroy is caused by the the program shutting down, 
 
131
                // the checks are necessary because when destroy is caused by the the program shutting down,
128
132
                // the inkscape object may already be (partly?) invalid --bb
129
133
                if (G_IS_OBJECT(spw->inkscape) && G_OBJECT_GET_CLASS(G_OBJECT(spw->inkscape)))
130
134
                        sp_signal_disconnect_by_data (spw->inkscape, spw);
241
245
}
242
246
 
243
247
static void
244
 
sp_widget_modify_selection (Inkscape::Application *inkscape, Inkscape::Selection *selection, guint flags, SPWidget *spw)
 
248
sp_widget_modify_selection (Inkscape::Application */*inkscape*/, Inkscape::Selection *selection, guint flags, SPWidget *spw)
245
249
{
246
250
        g_signal_emit (G_OBJECT (spw), signals[MODIFY_SELECTION], 0, selection, flags);
247
251
}
248
252
 
249
253
static void
250
 
sp_widget_change_selection (Inkscape::Application *inkscape, Inkscape::Selection *selection, SPWidget *spw)
 
254
sp_widget_change_selection (Inkscape::Application */*inkscape*/, Inkscape::Selection *selection, SPWidget *spw)
251
255
{
252
256
        g_signal_emit (G_OBJECT (spw), signals[CHANGE_SELECTION], 0, selection);
253
257
}
254
258
 
255
259
static void
256
 
sp_widget_set_selection (Inkscape::Application *inkscape, Inkscape::Selection *selection, SPWidget *spw)
 
260
sp_widget_set_selection (Inkscape::Application */*inkscape*/, Inkscape::Selection *selection, SPWidget *spw)
257
261
{
258
262
        /* Emit "set_selection" signal */
259
263
        g_signal_emit (G_OBJECT (spw), signals[SET_SELECTION], 0, selection);
260
264
        /* Inkscape will force "change_selection" anyways */
261
265
}
262
266
 
 
267
/*
 
268
  Local Variables:
 
269
  mode:c++
 
270
  c-file-style:"stroustrup"
 
271
  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
 
272
  indent-tabs-mode:nil
 
273
  fill-column:99
 
274
  End:
 
275
*/
 
276
// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :