don't use wxChar* arguments in wxLogWindow API

[wxWidgets.git] / wxPython / wx / lib / flatnotebook.py

diff --git a/wxPython/wx/lib/flatnotebook.py b/wxPython/wx/lib/flatnotebook.py
index 7b259ad4f7265e2b4932c84f06e483be25e73a11..f0915d1bec10fec98da9616bcd60b0d39eb6dbeb 100644 (file)
--- a/wxPython/wx/lib/flatnotebook.py
+++ b/wxPython/wx/lib/flatnotebook.py
@@ -1459,7 +1459,7 @@ class FNBRenderer:
 
         # erase old bitmap
         posx = self.GetDropArrowButtonPos(pc)
 
         # erase old bitmap
         posx = self.GetDropArrowButtonPos(pc)

-        dc.DrawBitmap(self._xBgBmp, posx, 6)
+        dc.DrawBitmap(self._rightBgBmp, posx, 6)

 
         # Draw the new bitmap
         dc.DrawBitmap(downBmp, posx, 6, True)
 
         # Draw the new bitmap
         dc.DrawBitmap(downBmp, posx, 6, True)


@@ -3353,6 +3353,7 @@ class FlatNotebook(wx.Panel):
 
         self._pages.DoDeletePage(page)
         self.Refresh()
 
         self._pages.DoDeletePage(page)
         self.Refresh()

+        self.Update()  

 
         # Fire a closed event
         closedEvent = FlatNotebookEvent(wxEVT_FLATNOTEBOOK_PAGE_CLOSED, self.GetId())
 
         # Fire a closed event
         closedEvent = FlatNotebookEvent(wxEVT_FLATNOTEBOOK_PAGE_CLOSED, self.GetId())


@@ -4733,12 +4734,13 @@ class PageContainer(wx.Panel):
 
         for i in xrange(len(self._pagesInfoVec)):
             pi = self._pagesInfoVec[i]
 
         for i in xrange(len(self._pagesInfoVec)):
             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
-            # if self.TabHasImage(ii):
-            #   item.SetBitmaps( (*m_ImageList)[pi.GetImageIndex()] );
+            # There is an alignment problem with wx2.6.3 & Menus so only use
+            # images for versions above 2.6.3
+            if wx.VERSION > (2, 6, 3, 0) and self.TabHasImage(i):
+                item.SetBitmap(self.GetImageList().GetBitmap(pi.GetImageIndex()))

 
             popupMenu.AppendItem(item)
             item.Enable(pi.GetEnabled())
 
             popupMenu.AppendItem(item)
             item.Enable(pi.GetEnabled())


@@ -4749,7 +4751,7 @@ class PageContainer(wx.Panel):
     def OnTabMenuSelection(self, event):
         """ Handles the wx.EVT_MENU event for L{PageContainer}. """
 
     def OnTabMenuSelection(self, event):
         """ Handles the wx.EVT_MENU event for L{PageContainer}. """
 

-        selection = event.GetId()
+        selection = event.GetId() - 1

         self.FireEvent(selection)
 
 
         self.FireEvent(selection)