[gnue] r7588 - in trunk/gnue-designer/src: forms/LayoutEditor uidrivers/wx/docks

[btami]

Author: btami
Date: 2005-06-09 11:36:08 -0500 (Thu, 09 Jun 2005)
New Revision: 7588

Modified:
   trunk/gnue-designer/src/forms/LayoutEditor/DisplayDropTarget.py
   trunk/gnue-designer/src/uidrivers/wx/docks/DockedPane.py
   trunk/gnue-designer/src/uidrivers/wx/docks/SplitDock.py
Log:
little TLC heading to wxpython 2.6.x

Modified: trunk/gnue-designer/src/forms/LayoutEditor/DisplayDropTarget.py
===================================================================
--- trunk/gnue-designer/src/forms/LayoutEditor/DisplayDropTarget.py     
2005-06-09 14:44:57 UTC (rev 7587)
+++ trunk/gnue-designer/src/forms/LayoutEditor/DisplayDropTarget.py     
2005-06-09 16:36:08 UTC (rev 7588)
@@ -343,7 +343,7 @@
 
       fattr = {'name': instance.getUniqueName('fld' + f['name'].capitalize()),
                'field':f['name'],
-               'typecast':f['datatype']}
+               'typecast':f['type']}
 
       try:
         fattr['required'] = f['required']

Modified: trunk/gnue-designer/src/uidrivers/wx/docks/DockedPane.py
===================================================================
--- trunk/gnue-designer/src/uidrivers/wx/docks/DockedPane.py    2005-06-09 
14:44:57 UTC (rev 7587)
+++ trunk/gnue-designer/src/uidrivers/wx/docks/DockedPane.py    2005-06-09 
16:36:08 UTC (rev 7588)
@@ -31,11 +31,6 @@
 import sys
 from wxPython.wx import *
 
-TITLEBAR_ACTIVE = wxSystemSettings_GetSystemColour(wxSYS_COLOUR_HIGHLIGHT)
-TITLETEXT_ACTIVE = wxSystemSettings_GetSystemColour(wxSYS_COLOUR_HIGHLIGHTTEXT)
-#TITLEBAR_INACTIVE = wxSystemSettings_GetSystemColour(wxSYS_COLOUR_BTNFACE)
-#TITLETEXT_INACTIVE = wxSystemSettings_GetSystemColour(wxSYS_COLOUR_BTNFACE)
-
 from BasePane import BasePane
 
 #
@@ -43,6 +38,11 @@
 #
 class DockedPane(wxSashWindow, BasePane):
   def __init__(self, parent, instance, tool):
+    TITLEBAR_ACTIVE = wxSystemSettings_GetSystemColour(wxSYS_COLOUR_HIGHLIGHT)
+    TITLETEXT_ACTIVE = 
wxSystemSettings_GetSystemColour(wxSYS_COLOUR_HIGHLIGHTTEXT)
+    #TITLEBAR_INACTIVE = wxSystemSettings_GetSystemColour(wxSYS_COLOUR_BTNFACE)
+    #TITLETEXT_INACTIVE = 
wxSystemSettings_GetSystemColour(wxSYS_COLOUR_BTNFACE)
+
     wxSashWindow.__init__(self, parent, -1, style=wxSW_3DSASH|wxCLIP_CHILDREN)
     BasePane.__init__(self, parent, instance, tool)
     # These are used exclusively by ToolDock

Modified: trunk/gnue-designer/src/uidrivers/wx/docks/SplitDock.py
===================================================================
--- trunk/gnue-designer/src/uidrivers/wx/docks/SplitDock.py     2005-06-09 
14:44:57 UTC (rev 7587)
+++ trunk/gnue-designer/src/uidrivers/wx/docks/SplitDock.py     2005-06-09 
16:36:08 UTC (rev 7588)
@@ -263,7 +263,7 @@
       pass
 
   def CalcMin(self):
-    return (50, self.__childHideSize * len(self.__objects))
+    return wxSize(50, self.__childHideSize * len(self.__objects))
 
   def RecalcSizes(self, absolute=None, absheight=0, absrelative=None):
     size = self.GetSize()