Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@46496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2007-06-16 23:15:13 +00:00
parent b060ae7de4
commit 14b4674a0b
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wxPython/wx/lib/buttonpanel.py
View File

@@ -974,8 +974,11 @@ class ButtonInfo(Control):
self._shortHelp = shortHelp self._shortHelp = shortHelp
self._longHelp = longHelp self._longHelp = longHelp
disabledbmp = GrayOut(bmp) if bmp:
disabledbmp = GrayOut(bmp)
else:
disabledbmp = wx.NullBitmap
self._bitmaps = {"Normal": bmp, "Toggled": None, "Disabled": disabledbmp, self._bitmaps = {"Normal": bmp, "Toggled": None, "Disabled": disabledbmp,
"Hover": None, "Pressed": None} "Hover": None, "Pressed": None}

14
wxPython/wx/lib/flatnotebook.py
View File

@@ -1459,7 +1459,7 @@ class FNBRenderer:
# erase old bitmap # erase old bitmap
posx = self.GetDropArrowButtonPos(pc) posx = self.GetDropArrowButtonPos(pc)
dc.DrawBitmap(self._xBgBmp, posx, 6) dc.DrawBitmap(self._rightBgBmp, posx, 6)
# Draw the new bitmap # Draw the new bitmap
dc.DrawBitmap(downBmp, posx, 6, True) dc.DrawBitmap(downBmp, posx, 6, True)
@@ -3353,6 +3353,7 @@ class FlatNotebook(wx.Panel):
self._pages.DoDeletePage(page) self._pages.DoDeletePage(page)
self.Refresh() self.Refresh()
self.Update()
# Fire a closed event # Fire a closed event
closedEvent = FlatNotebookEvent(wxEVT_FLATNOTEBOOK_PAGE_CLOSED, self.GetId()) closedEvent = FlatNotebookEvent(wxEVT_FLATNOTEBOOK_PAGE_CLOSED, self.GetId())
@@ -4733,12 +4734,13 @@ class PageContainer(wx.Panel):
for i in xrange(len(self._pagesInfoVec)): for i in xrange(len(self._pagesInfoVec)):
pi = self._pagesInfoVec[i] pi = self._pagesInfoVec[i]
item = wx.MenuItem(popupMenu, i, pi.GetCaption(), pi.GetCaption(), wx.ITEM_NORMAL) item = wx.MenuItem(popupMenu, i+1, pi.GetCaption(), pi.GetCaption(), wx.ITEM_NORMAL)
self.Bind(wx.EVT_MENU, self.OnTabMenuSelection, item) self.Bind(wx.EVT_MENU, self.OnTabMenuSelection, item)
# This code is commented, since there is an alignment problem with wx2.6.3 & Menus # There is an alignment problem with wx2.6.3 & Menus so only use
# if self.TabHasImage(ii): # images for versions above 2.6.3
# item.SetBitmaps( (*m_ImageList)[pi.GetImageIndex()] ); if wx.VERSION > (2, 6, 3, 0) and self.TabHasImage(i):
item.SetBitmap(self.GetImageList().GetBitmap(pi.GetImageIndex()))
popupMenu.AppendItem(item) popupMenu.AppendItem(item)
item.Enable(pi.GetEnabled()) item.Enable(pi.GetEnabled())
@@ -4749,7 +4751,7 @@ class PageContainer(wx.Panel):
def OnTabMenuSelection(self, event): def OnTabMenuSelection(self, event):
""" Handles the wx.EVT_MENU event for L{PageContainer}. """ """ Handles the wx.EVT_MENU event for L{PageContainer}. """
selection = event.GetId() selection = event.GetId() - 1
self.FireEvent(selection) self.FireEvent(selection)