Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgnacio Rodríguez <ignaciorodriguez@sugarlabs.org>2013-05-07 17:59:26 (GMT)
committer Ignacio Rodríguez <ignaciorodriguez@sugarlabs.org>2013-05-07 17:59:26 (GMT)
commitf482dde70ada779972557e200d1fc027419d9d24 (patch)
treeb55576f333b2234b614b4782601ba91d980b322a
parent8ef61f02b2bfb1f8dd785ac736a2257a345aa15e (diff)
Conflictos en Widgets.py, se agrega MainPaned.py
-rw-r--r--Widgets.py7
1 files changed, 0 insertions, 7 deletions
diff --git a/Widgets.py b/Widgets.py
index 078cf50..f116e34 100644
--- a/Widgets.py
+++ b/Widgets.py
@@ -10,7 +10,6 @@ from gi.repository import GdkPixbuf
from gi.repository import GObject
import Globales as G
-
def get_pixbuf(path, x=None, y=None):
if x is None or y is None:
pixbuf = GdkPixbuf.Pixbuf.new_from_file(path)
@@ -80,9 +79,3 @@ class Toolbar(Gtk.Toolbar):
def __recargar(self, widget):
pass
-
-class MainPaned(Gtk.HPaned):
- def __init__(self):
- super(MainPaned, self).__init__()
-
- self.show_all()