Allow AutoCompletion for items in collections too

[wxWidgets.git] / wxPython / wx / tools / XRCed / tools.py

diff --git a/wxPython/wx/tools/XRCed/tools.py b/wxPython/wx/tools/XRCed/tools.py
index a7819a56651d05e173e2a3d5d373ba0abab4884b..e0e3ac86d2e124527be049950215ec6b7f756596 100644 (file)
--- a/wxPython/wx/tools/XRCed/tools.py
+++ b/wxPython/wx/tools/XRCed/tools.py
@@ -15,19 +15,19 @@ GROUPNUM = 4
 GROUP_WINDOWS, GROUP_MENUS, GROUP_SIZERS, GROUP_CONTROLS = range(GROUPNUM)
 
 # States depending on current selection and Control/Shift keys
 GROUP_WINDOWS, GROUP_MENUS, GROUP_SIZERS, GROUP_CONTROLS = range(GROUPNUM)
 
 # States depending on current selection and Control/Shift keys

-STATE_ROOT, STATE_MENUBAR, STATE_TOOLBAR, STATE_MENU, STATE_ELSE = range(5)
+STATE_ROOT, STATE_MENUBAR, STATE_TOOLBAR, STATE_MENU, STATE_STDDLGBTN, STATE_ELSE = range(6)

 
 # Left toolbar for GUI elements
 
 # Left toolbar for GUI elements

-class Tools(wxPanel):
+class Tools(wx.Panel):

     TOOL_SIZE = (30, 30)
     def __init__(self, parent):
     TOOL_SIZE = (30, 30)
     def __init__(self, parent):

-        if wxPlatform == '__WXGTK__':
-            wxPanel.__init__(self, parent, -1,
-                             style=wxRAISED_BORDER|wxWANTS_CHARS)
+        if wx.Platform == '__WXGTK__':
+            wx.Panel.__init__(self, parent, -1,
+                             style=wx.RAISED_BORDER|wx.WANTS_CHARS)

         else:
         else:

-            wxPanel.__init__(self, parent, -1, style=wxWANTS_CHARS)
+            wx.Panel.__init__(self, parent, -1, style=wx.WANTS_CHARS)

         # Create sizer for groups
         # Create sizer for groups

-        self.sizer = wxBoxSizer(wxVERTICAL)
+        self.sizer = wx.BoxSizer(wx.VERTICAL)

         # Data to create buttons
         pullDownMenu = g.pullDownMenu
         self.groups = []
         # Data to create buttons
         pullDownMenu = g.pullDownMenu
         self.groups = []


@@ -83,6 +83,7 @@ class Tools(wxPanel):
              (ID_NEW.LIST_CTRL, images.getToolListCtrlBitmap()),
              
              (ID_NEW.NOTEBOOK, images.getToolNotebookBitmap()),
              (ID_NEW.LIST_CTRL, images.getToolListCtrlBitmap()),
              
              (ID_NEW.NOTEBOOK, images.getToolNotebookBitmap()),

+             (ID_NEW.SPLITTER_WINDOW, images.getToolSplitterWindowBitmap()),

 
              (ID_NEW.UNKNOWN, images.getToolUnknownBitmap())]
             ]
 
              (ID_NEW.UNKNOWN, images.getToolUnknownBitmap())]
             ]


@@ -95,29 +96,31 @@ class Tools(wxPanel):
         # Allow to be resized in vertical direction only
         self.SetSizeHints(self.GetSize()[0], -1)
         # Events
         # Allow to be resized in vertical direction only
         self.SetSizeHints(self.GetSize()[0], -1)
         # Events

-        EVT_COMMAND_RANGE(self, ID_NEW.PANEL, ID_NEW.LAST,
-                          wxEVT_COMMAND_BUTTON_CLICKED, g.frame.OnCreate)
-        EVT_KEY_DOWN(self, self.OnKeyDown)
-        EVT_KEY_UP(self, self.OnKeyUp)
+        wx.EVT_COMMAND_RANGE(self, ID_NEW.PANEL, ID_NEW.LAST,
+                          wx.wxEVT_COMMAND_BUTTON_CLICKED, g.frame.OnCreate)
+        wx.EVT_KEY_DOWN(self, self.OnKeyDown)
+        wx.EVT_KEY_UP(self, self.OnKeyUp)

 
     def AddButton(self, id, image, text):
 
     def AddButton(self, id, image, text):

-        button = wxBitmapButton(self, id, image, size=self.TOOL_SIZE,
-                                style=wxBU_AUTODRAW|wxNO_BORDER|wxWANTS_CHARS)
-        EVT_KEY_DOWN(button, self.OnKeyDown)
-        EVT_KEY_UP(button, self.OnKeyUp)
+        from wx.lib import buttons
+        button = buttons.GenBitmapButton(self, id, image, size=self.TOOL_SIZE,
+                                           style=wx.NO_BORDER|wx.WANTS_CHARS)
+        button.SetBezelWidth(0)
+        wx.EVT_KEY_DOWN(button, self.OnKeyDown)
+        wx.EVT_KEY_UP(button, self.OnKeyUp)

         button.SetToolTipString(text)
         self.curSizer.Add(button)
         self.groups[-1][1][id] = button
 
     def AddGroup(self, name):
         # Each group is inside box
         button.SetToolTipString(text)
         self.curSizer.Add(button)
         self.groups[-1][1][id] = button
 
     def AddGroup(self, name):
         # Each group is inside box

-        box = wxStaticBox(self, -1, name, style=wxWANTS_CHARS)
-        box.SetFont(smallerFont)
-        boxSizer = wxStaticBoxSizer(box, wxVERTICAL)
+        box = wx.StaticBox(self, -1, name, style=wx.WANTS_CHARS)
+        box.SetFont(g.smallerFont())
+        boxSizer = wx.StaticBoxSizer(box, wx.VERTICAL)

         boxSizer.Add((0, 4))
         boxSizer.Add((0, 4))

-        self.curSizer = wxGridSizer(0, 3)
+        self.curSizer = wx.GridSizer(0, 3)

         boxSizer.Add(self.curSizer)
         boxSizer.Add(self.curSizer)

-        self.sizer.Add(boxSizer, 0, wxTOP | wxLEFT | wxRIGHT, 4)
+        self.sizer.Add(boxSizer, 0, wx.TOP | wx.LEFT | wx.RIGHT, 4)

         self.groups.append((box,{}))
 
     # Enable/disable group
         self.groups.append((box,{}))
 
     # Enable/disable group


@@ -139,17 +142,17 @@ class Tools(wxPanel):
 
     # Process key events
     def OnKeyDown(self, evt):
 
     # Process key events
     def OnKeyDown(self, evt):

-        if evt.GetKeyCode() == WXK_CONTROL:
+        if evt.GetKeyCode() == wx.WXK_CONTROL:

             g.tree.ctrl = True
             g.tree.ctrl = True

-        elif evt.GetKeyCode() == WXK_SHIFT:
+        elif evt.GetKeyCode() == wx.WXK_SHIFT:

             g.tree.shift = True
         self.UpdateIfNeeded()
         evt.Skip()
 
     def OnKeyUp(self, evt):
             g.tree.shift = True
         self.UpdateIfNeeded()
         evt.Skip()
 
     def OnKeyUp(self, evt):

-        if evt.GetKeyCode() == WXK_CONTROL:
+        if evt.GetKeyCode() == wx.WXK_CONTROL:

             g.tree.ctrl = False
             g.tree.ctrl = False

-        elif evt.GetKeyCode() == WXK_SHIFT:
+        elif evt.GetKeyCode() == wx.WXK_SHIFT:

             g.tree.shift = False
         self.UpdateIfNeeded()
         evt.Skip()
             g.tree.shift = False
         self.UpdateIfNeeded()
         evt.Skip()


@@ -207,6 +210,8 @@ class Tools(wxPanel):
                 state = STATE_TOOLBAR
             elif xxx.__class__ in [xxxMenu, xxxMenuItem]:
                 state = STATE_MENU
                 state = STATE_TOOLBAR
             elif xxx.__class__ in [xxxMenu, xxxMenuItem]:
                 state = STATE_MENU

+            elif xxx.__class__ == xxxStdDialogButtonSizer:
+                state = STATE_STDDLGBTN

             else:
                 state = STATE_ELSE
 
             else:
                 state = STATE_ELSE
 


@@ -225,6 +230,8 @@ class Tools(wxPanel):
                                         ID_NEW.MENU_ITEM,
                                         ID_NEW.SEPARATOR ],
                                       False)
                                         ID_NEW.MENU_ITEM,
                                         ID_NEW.SEPARATOR ],
                                       False)

+            elif state == STATE_STDDLGBTN:
+                pass                    # nothing can be added from toolbar

             elif state == STATE_MENUBAR:
                 self.EnableGroup(GROUP_MENUS)
                 self.EnableGroupItems(GROUP_MENUS,
             elif state == STATE_MENUBAR:
                 self.EnableGroup(GROUP_MENUS)
                 self.EnableGroupItems(GROUP_MENUS,


@@ -243,7 +250,8 @@ class Tools(wxPanel):
                 self.EnableGroup(GROUP_CONTROLS)
                 self.EnableGroupItems(GROUP_CONTROLS,
                                       [ ID_NEW.TREE_CTRL,
                 self.EnableGroup(GROUP_CONTROLS)
                 self.EnableGroupItems(GROUP_CONTROLS,
                                       [ ID_NEW.TREE_CTRL,

-                                        ID_NEW.NOTEBOOK ],
+                                        ID_NEW.NOTEBOOK,
+                                        ID_NEW.SPLITTER_WINDOW ],

                                       False)
             elif state == STATE_MENU:
                 self.EnableGroup(GROUP_MENUS)
                                       False)
             elif state == STATE_MENU:
                 self.EnableGroup(GROUP_MENUS)


@@ -269,13 +277,15 @@ class Tools(wxPanel):
                                       False)
                 self.EnableGroup(GROUP_SIZERS)
                 self.EnableGroup(GROUP_CONTROLS)
                                       False)
                 self.EnableGroup(GROUP_SIZERS)
                 self.EnableGroup(GROUP_CONTROLS)

-        # Special case for notebook (always executed)
+        # Special case for *book (always executed)

         if state == STATE_ELSE:
         if state == STATE_ELSE:

-            if xxx.__class__ == xxxNotebook:
+            if xxx.__class__ in [xxxNotebook, xxxChoicebook, xxxListbook]:

                 self.EnableGroup(GROUP_SIZERS, False)
             else:
                 self.EnableGroup(GROUP_SIZERS)
                 if not (xxx.isSizer or xxx.parent and xxx.parent.isSizer):
                     self.EnableGroupItem(GROUP_SIZERS, ID_NEW.SPACER, False)
                 self.EnableGroup(GROUP_SIZERS, False)
             else:
                 self.EnableGroup(GROUP_SIZERS)
                 if not (xxx.isSizer or xxx.parent and xxx.parent.isSizer):
                     self.EnableGroupItem(GROUP_SIZERS, ID_NEW.SPACER, False)

+            if xxx.__class__ == xxxFrame:
+                self.EnableGroupItem(GROUP_MENUS, ID_NEW.MENU_BAR)

         # Save state
         self.state = state
         # Save state
         self.state = state