Tweaks to work around wxMac bugs

[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..d6264f22aa6fb55c7954e2c210b1ff5f1128ab6f 100644 (file)
--- a/wxPython/wx/tools/XRCed/tools.py
+++ b/wxPython/wx/tools/XRCed/tools.py
@@ -83,6 +83,7 @@ class Tools(wxPanel):
              (ID_NEW.LIST_CTRL, images.getToolListCtrlBitmap()),
              
              (ID_NEW.NOTEBOOK, images.getToolNotebookBitmap()),
+             (ID_NEW.SPLITTER_WINDOW, images.getToolSplitterWindowBitmap()),
 
              (ID_NEW.UNKNOWN, images.getToolUnknownBitmap())]
             ]
@@ -101,8 +102,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)
@@ -112,7 +115,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)
@@ -243,7 +246,8 @@ class Tools(wxPanel):
                 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)