← Back to branch summary

~ubuntu-branches/debian/stretch/glade/stretch

« back to all changes in this revision

Viewing changes to gladeui/glade-design-layout.c

  • Committer: Package Import Robot
  • Author(s): Andreas Henriksson, Emilio Pozuelo Monfort, Andreas Henriksson
  • Date: 2014-05-23 13:00:17 UTC
  • mfrom: (1.3.2)
  • Revision ID: package-import@ubuntu.com-20140523130017-7sp231ghdz55szde
Tags: 3.18.3-1
[ Emilio Pozuelo Monfort ]
* debian/rules:
  + Pass -c4 to dpkg-gensymbols so we know when new symbols are added.
* debian/libgladeui-2-6.symbols:
  + Add missing symbols.

[ Andreas Henriksson ]
* New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gladeui/glade-design-layout.c
35
35
#include <glib/gi18n-lib.h>
36
36
#include <gtk/gtk.h>
37
37
 
38
 
#define GLADE_DESIGN_LAYOUT_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object),  \
39
 
                                                 GLADE_TYPE_DESIGN_LAYOUT,               \
40
 
                                                 GladeDesignLayoutPrivate))
41
38
#define GLADE_DESIGN_LAYOUT_PRIVATE(object) (((GladeDesignLayout*)object)->priv)
42
39
 
43
40
#define OUTLINE_WIDTH     4
124
121
  PROP_DESIGN_VIEW
125
122
};
126
123
 
127
 
G_DEFINE_TYPE (GladeDesignLayout, glade_design_layout, GTK_TYPE_BIN)
 
124
G_DEFINE_TYPE_WITH_PRIVATE (GladeDesignLayout, glade_design_layout, GTK_TYPE_BIN)
128
125
 
129
126
#define RECTANGLE_POINT_IN(rect,x,y) (x >= rect.x && x <= (rect.x + rect.width) && y >= rect.y && y <= (rect.y + rect.height))
130
127
 
174
171
static Activity
175
172
gdl_get_activity_from_pointer (GladeDesignLayout *layout, gint x, gint y)
176
173
{
177
 
  GladeDesignLayoutPrivate *priv = GLADE_DESIGN_LAYOUT_GET_PRIVATE (layout);
 
174
  GladeDesignLayoutPrivate *priv = GLADE_DESIGN_LAYOUT_PRIVATE (layout);
178
175
  
179
176
  if (priv->selection)
180
177
    {
1787
1784
static void
1788
1785
glade_design_layout_style_updated (GtkWidget *widget)
1789
1786
{
1790
 
  GladeDesignLayoutPrivate *priv = GLADE_DESIGN_LAYOUT_GET_PRIVATE (widget);
 
1787
  GladeDesignLayoutPrivate *priv = GLADE_DESIGN_LAYOUT_PRIVATE (widget);
1791
1788
  
1792
1789
  _glade_design_layout_get_colors (gtk_widget_get_style_context (widget),
1793
1790
                                   &priv->frame_color[0],
1805
1802
  GladeDesignLayoutPrivate *priv;
1806
1803
  gint i;
1807
1804
  
1808
 
  layout->priv = priv = GLADE_DESIGN_LAYOUT_GET_PRIVATE (layout);
 
1805
  layout->priv = priv = glade_design_layout_get_instance_private (layout);
1809
1806
 
1810
1807
  priv->activity = ACTIVITY_NONE;
1811
1808
 
2059
2056
                                   GLADE_TYPE_DESIGN_LAYOUT,
2060
2057
                                   g_cclosure_new (G_CALLBACK (glade_design_layout_damage),
2061
2058
                                                   NULL, NULL));
2062
 
 
2063
 
  g_type_class_add_private (object_class, sizeof (GladeDesignLayoutPrivate));
2064
2059
}
2065
2060
 
2066
2061
/* Internal API */