reSWIGged

[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 e10299faa9b1c955f28dfa61baf8d4f3f62b4758..7d852d0ef682c0410881044fabc1b61f9f5735e3 100644 (file)
--- a/wxPython/wx/tools/XRCed/tools.py
+++ b/wxPython/wx/tools/XRCed/tools.py
@@ -51,6 +51,7 @@ class Tools(wxPanel):
              (ID_NEW.STATIC_BOX_SIZER, images.getToolStaticBoxSizerBitmap()),
              (ID_NEW.GRID_SIZER, images.getToolGridSizerBitmap()),
              (ID_NEW.FLEX_GRID_SIZER, images.getToolFlexGridSizerBitmap()),
+             (ID_NEW.GRID_BAG_SIZER, images.getToolGridBagSizerBitmap()),
              (ID_NEW.SPACER, images.getToolSpacerBitmap())],
             ["Controls",
              (ID_NEW.STATIC_TEXT, images.getToolStaticTextBitmap()),
@@ -100,8 +101,10 @@ class Tools(wxPanel):
         EVT_KEY_UP(self, self.OnKeyUp)
 
     def AddButton(self, id, image, text):
-        button = wxBitmapButton(self, id, image, size=self.TOOL_SIZE,
-                                style=wxBU_AUTODRAW|wxNO_BORDER|wxWANTS_CHARS)
+        from wxPython.lib import buttons
+        button = buttons.wxGenBitmapButton(self, id, image, size=self.TOOL_SIZE,
+                                           style=wxNO_BORDER|wxWANTS_CHARS)
+        button.SetBezelWidth(0)
         EVT_KEY_DOWN(button, self.OnKeyDown)
         EVT_KEY_UP(button, self.OnKeyUp)
         button.SetToolTipString(text)
@@ -111,7 +114,7 @@ class Tools(wxPanel):
     def AddGroup(self, name):
         # Each group is inside box
         box = wxStaticBox(self, -1, name, style=wxWANTS_CHARS)
-        box.SetFont(smallerFont)
+        box.SetFont(g.smallerFont())
         boxSizer = wxStaticBoxSizer(box, wxVERTICAL)
         boxSizer.Add((0, 4))
         self.curSizer = wxGridSizer(0, 3)