[gnome-shell/wip/clutter-deprecation-fixes: 18/22] st: Remove st-group



commit e513d94654da23df73eb6bad81630975f2b68f2c
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Tue Feb 14 11:33:26 2012 -0500

    st: Remove st-group
    
    Now that ClutterActor/StWidget is concrete, we don't need it.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=670034

 docs/reference/st/st-docs.sgml.in |    1 -
 js/ui/messageTray.js              |    6 +-
 js/ui/modalDialog.js              |    6 +-
 js/ui/overview.js                 |    4 +-
 js/ui/workspaceSwitcherPopup.js   |   12 +-
 js/ui/workspaceThumbnail.js       |    6 +-
 js/ui/workspacesView.js           |    2 +-
 src/Makefile-st.am                |    2 -
 src/st/st-group.c                 |  241 -------------------------------------
 src/st/st-group.h                 |   70 -----------
 10 files changed, 18 insertions(+), 332 deletions(-)
---
diff --git a/docs/reference/st/st-docs.sgml.in b/docs/reference/st/st-docs.sgml.in
index 764c5ea..b1d07d0 100644
--- a/docs/reference/st/st-docs.sgml.in
+++ b/docs/reference/st/st-docs.sgml.in
@@ -35,7 +35,6 @@
       <title>Containers</title>
       <xi:include href="xml/st-bin.xml"/>
       <xi:include href="xml/st-box-layout.xml"/>
-      <xi:include href="xml/st-group.xml"/>
       <xi:include href="xml/st-scroll-view.xml"/>
       <xi:include href="xml/st-table.xml"/>
     </chapter>
diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index b811a49..d0c62a5 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -1347,9 +1347,9 @@ const MessageTray = new Lang.Class({
             this._onStatusChanged(status);
         }));
 
-        this.actor = new St.Group({ name: 'message-tray',
-                                    reactive: true,
-                                    track_hover: true });
+        this.actor = new St.Widget({ name: 'message-tray',
+                                     reactive: true,
+                                     track_hover: true });
         this.actor.connect('notify::hover', Lang.bind(this, this._onTrayHoverChanged));
 
         this._notificationBin = new St.Bin();
diff --git a/js/ui/modalDialog.js b/js/ui/modalDialog.js
index 66c17d4..372a6b9 100644
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@@ -40,9 +40,9 @@ const ModalDialog = new Lang.Class({
         this._hasModal = false;
         this._shellReactive = params.shellReactive;
 
-        this._group = new St.Group({ visible: false,
-                                     x: 0,
-                                     y: 0 });
+        this._group = new St.Widget({ visible: false,
+                                      x: 0,
+                                      y: 0 });
         Main.uiGroup.add_actor(this._group);
 
         let constraint = new Clutter.BindConstraint({ source: global.stage,
diff --git a/js/ui/overview.js b/js/ui/overview.js
index 566d3f1..830cd48 100644
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -126,8 +126,8 @@ const Overview = new Lang.Class({
 
         this._spacing = 0;
 
-        this._group = new St.Group({ name: 'overview',
-                                     reactive: true });
+        this._group = new St.Widget({ name: 'overview',
+                                      reactive: true });
         this._group._delegate = this;
         this._group.connect('style-changed',
             Lang.bind(this, function() {
diff --git a/js/ui/workspaceSwitcherPopup.js b/js/ui/workspaceSwitcherPopup.js
index 15383db..51d2c28 100644
--- a/js/ui/workspaceSwitcherPopup.js
+++ b/js/ui/workspaceSwitcherPopup.js
@@ -19,12 +19,12 @@ const WorkspaceSwitcherPopup = new Lang.Class({
     Name: 'WorkspaceSwitcherPopup',
 
     _init : function() {
-        this.actor = new St.Group({ reactive: true,
-                                         x: 0,
-                                         y: 0,
-                                         width: global.screen_width,
-                                         height: global.screen_height,
-                                         style_class: 'workspace-switcher-group' });
+        this.actor = new St.Widget({ reactive: true,
+                                     x: 0,
+                                     y: 0,
+                                     width: global.screen_width,
+                                     height: global.screen_height,
+                                     style_class: 'workspace-switcher-group' });
         Main.uiGroup.add_actor(this.actor);
 
         this._container = new St.BoxLayout({ style_class: 'workspace-switcher-container' });
diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
index 52b2a74..0e68abc 100644
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@@ -156,9 +156,9 @@ const WorkspaceThumbnail = new Lang.Class({
 
         this._removed = false;
 
-        this.actor = new St.Group({ reactive: true,
-                                    clip_to_allocation: true,
-                                    style_class: 'workspace-thumbnail' });
+        this.actor = new St.Widget({ reactive: true,
+                                     clip_to_allocation: true,
+                                     style_class: 'workspace-thumbnail' });
         this.actor._delegate = this;
 
         this._contents = new Clutter.Group();
diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index 0e1bee8..925f791 100644
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -29,7 +29,7 @@ const WorkspacesView = new Lang.Class({
     Name: 'WorkspacesView',
 
     _init: function(workspaces) {
-        this.actor = new St.Group({ style_class: 'workspaces-view' });
+        this.actor = new St.Widget({ style_class: 'workspaces-view' });
 
         // The actor itself isn't a drop target, so we don't want to pick on its area
         this.actor.set_size(0, 0);
diff --git a/src/Makefile-st.am b/src/Makefile-st.am
index 8561f61..6b97766 100644
--- a/src/Makefile-st.am
+++ b/src/Makefile-st.am
@@ -54,7 +54,6 @@ st_source_h =					\
 	st/st-drawing-area.h			\
 	st/st-entry.h				\
 	st/st-focus-manager.h			\
-	st/st-group.h				\
 	st/st-icon.h				\
 	st/st-icon-colors.h			\
 	st/st-im-text.h				\
@@ -109,7 +108,6 @@ st_source_c =					\
 	st/st-drawing-area.c			\
 	st/st-entry.c				\
 	st/st-focus-manager.c			\
-	st/st-group.c				\
 	st/st-icon.c				\
 	st/st-icon-colors.c			\
 	st/st-im-text.c				\



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]