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 e10299faa9b1c955f28dfa61baf8d4f3f62b4758..d6264f22aa6fb55c7954e2c210b1ff5f1128ab6f 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.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()),
              (ID_NEW.SPACER, images.getToolSpacerBitmap())],
             ["Controls",
              (ID_NEW.STATIC_TEXT, images.getToolStaticTextBitmap()),


@@ -82,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())]
             ]


@@ -100,8 +102,10 @@ class Tools(wxPanel):
         EVT_KEY_UP(self, self.OnKeyUp)
 
     def AddButton(self, id, image, text):
         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)
         EVT_KEY_DOWN(button, self.OnKeyDown)
         EVT_KEY_UP(button, self.OnKeyUp)
         button.SetToolTipString(text)


@@ -111,7 +115,7 @@ class Tools(wxPanel):
     def AddGroup(self, name):
         # Each group is inside box
         box = wxStaticBox(self, -1, name, style=wxWANTS_CHARS)
     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)
         boxSizer = wxStaticBoxSizer(box, wxVERTICAL)
         boxSizer.Add((0, 4))
         self.curSizer = wxGridSizer(0, 3)


@@ -242,7 +246,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)