[gnue] r8064 - in trunk/gnue-designer/src: forms/LayoutEditor uidrivers/wx/startup

[btami]

Author: btami
Date: 2005-10-17 09:44:48 -0500 (Mon, 17 Oct 2005)
New Revision: 8064

Modified:
   trunk/gnue-designer/src/forms/LayoutEditor/LayoutEditor.py
   trunk/gnue-designer/src/uidrivers/wx/startup/Startup.py
Log:
designer is ok on wx 2.6.x from now (i hope)

Modified: trunk/gnue-designer/src/forms/LayoutEditor/LayoutEditor.py
===================================================================
--- trunk/gnue-designer/src/forms/LayoutEditor/LayoutEditor.py  2005-10-15 
21:25:46 UTC (rev 8063)
+++ trunk/gnue-designer/src/forms/LayoutEditor/LayoutEditor.py  2005-10-17 
14:44:48 UTC (rev 8064)
@@ -631,17 +631,15 @@
 
     elif self.mode == 'positioning':
 
-       if areaSelected:
-         width = x2 - x1 + 1
-         height = y2 - y1 + 1
-       else:
-         width = None
-         height = None
+      if areaSelected:
+        width = x2 - x1 + 1
+        height = y2 - y1 + 1
+      else:
+        width = None
+        height = None
 
-       
PrepositioningTimer(self.endPrePositioningTemplate,x1,y1,width,height).Start(100,1)
+      wxFutureCall(100,self.endPrePositioningTemplate,x1,y1,width,height)
 
-
-
   def selectWidgetInArea(self, object, x1, y1, x2, y2, selection):
     try:
       if x1 <= object.Char__x <= x2 and \
@@ -860,18 +858,6 @@
     event.Skip()
 
 
-class PrepositioningTimer(wxTimer):
-    def __init__(self, method, *args, **params):
-      self.__method = method
-      self.__args = args
-      self.__params = params
-      wxTimer.__init__(self)
-
-    def Notify(self):
-      self.__method(*self.__args, **self.__params)
-
-
-
 class TransparentPanel:
   def __init__(self, layoutEditor, parent):
     self.parent = parent

Modified: trunk/gnue-designer/src/uidrivers/wx/startup/Startup.py
===================================================================
--- trunk/gnue-designer/src/uidrivers/wx/startup/Startup.py     2005-10-15 
21:25:46 UTC (rev 8063)
+++ trunk/gnue-designer/src/uidrivers/wx/startup/Startup.py     2005-10-17 
14:44:48 UTC (rev 8064)
@@ -52,8 +52,8 @@
   def pauseAndClose(self):
     self.Raise()
     gStartupStatus('Finalizing Settings')
-    MyTimer(self.setSettingsText).Start(100)
-    self.timer = MyTimer(self.destroy).Start(1000)
+    wxFutureCall(100,self.setSettingsText)
+    wxFutureCall(1000,self.destroy)
 
   def setSettingsText(self):
     # Fscking, bastardized GTK piece of damn crap
@@ -64,11 +64,6 @@
     self.Destroy()
 
   def hide(self, event=None):
-    try:
-      self.timer.Stop()
-    except:
-      pass
-    self.timer = None
     __builtin__.__dict__['gStartupStatus'] = lambda string:string
     self.Show(0)
 
@@ -94,22 +89,3 @@
     self.drawText(wxBLACK)
     if event:
       event.Skip()
-
-
-class MyTimer(wxTimer):
-    def __init__(self, method, *args, **params):
-      self.__method = method
-      self.__args = args
-      self.__params = params
-      wxTimer.__init__(self)
-
-    def Notify(self):
-      try:
-        self.__method(*self.__args, **self.__params)
-      except wxPyDeadObjectError:
-        # WTF?!?!  Why isn't my .Stop() above working!!!!!
-        self.Stop()
-
-    def IsOneShot(self):
-      return 1
-