frame should call skip on child focus event to give owner a chance

[wxWidgets.git] / wxPython / wx / lib / floatcanvas / NavCanvas.py

diff --git a/wxPython/wx/lib/floatcanvas/NavCanvas.py b/wxPython/wx/lib/floatcanvas/NavCanvas.py
index 5d7ee0cadc4bc0d187d0b5de6047f178336ddd3b..1770a109e8b5f27da9043529a0a135ba8694ee0b 100644 (file)
--- a/wxPython/wx/lib/floatcanvas/NavCanvas.py
+++ b/wxPython/wx/lib/floatcanvas/NavCanvas.py
@@ -3,18 +3,10 @@ A Panel that includes the FloatCanvas and Navigation controls
 
 """
 
 
 """
 

-#from Numeric import array,Float,cos,pi,sum,minimum,maximum,Int32
-
-#from time import clock, sleep
-

 import wx
 
 import wx
 

-#import types
-#import os        
-

 import FloatCanvas, Resources
 
 import FloatCanvas, Resources
 

-

 ID_ZOOM_IN_BUTTON = wx.NewId()
 ID_ZOOM_OUT_BUTTON = wx.NewId()
 ID_ZOOM_TO_FIT_BUTTON = wx.NewId()
 ID_ZOOM_IN_BUTTON = wx.NewId()
 ID_ZOOM_OUT_BUTTON = wx.NewId()
 ID_ZOOM_TO_FIT_BUTTON = wx.NewId()


@@ -31,7 +23,7 @@ class NavCanvas(wx.Panel):
     This is a high level window that encloses the FloatCanvas in a panel
     and adds a Navigation toolbar.
 
     This is a high level window that encloses the FloatCanvas in a panel
     and adds a Navigation toolbar.
 

-    Copyright: wxWindows Software Foundation (Assigned by: Christopher Barker)
+    Copyright: Christopher Barker)

 
     License: Same as the version of wxPython you are using it with
 
 
     License: Same as the version of wxPython you are using it with
 


@@ -80,18 +72,18 @@ class NavCanvas(wx.Panel):
         tb = wx.ToolBar(self,-1)
         self.ToolBar = tb
         
         tb = wx.ToolBar(self,-1)
         self.ToolBar = tb
         

-        tb.SetToolBitmapSize((23,23))
+        tb.SetToolBitmapSize((24,24))

         
         

-        tb.AddTool(ID_POINTER_BUTTON, Resources.GetPointerBitmap(), isToggle=True, shortHelpString = "Pointer")
+        tb.AddTool(ID_POINTER_BUTTON, Resources.getPointerBitmap(), isToggle=True, shortHelpString = "Pointer")

         wx.EVT_TOOL(self, ID_POINTER_BUTTON, self.SetToolMode)
 
         wx.EVT_TOOL(self, ID_POINTER_BUTTON, self.SetToolMode)
 

-        tb.AddTool(ID_ZOOM_IN_BUTTON, Resources.GetPlusBitmap(), isToggle=True, shortHelpString = "Zoom In")
+        tb.AddTool(ID_ZOOM_IN_BUTTON, Resources.getMagPlusBitmap(), isToggle=True, shortHelpString = "Zoom In")

         wx.EVT_TOOL(self, ID_ZOOM_IN_BUTTON, self.SetToolMode)
         
         wx.EVT_TOOL(self, ID_ZOOM_IN_BUTTON, self.SetToolMode)
         

-        tb.AddTool(ID_ZOOM_OUT_BUTTON, Resources.GetMinusBitmap(), isToggle=True, shortHelpString = "Zoom Out")
+        tb.AddTool(ID_ZOOM_OUT_BUTTON, Resources.getMagMinusBitmap(), isToggle=True, shortHelpString = "Zoom Out")

         wx.EVT_TOOL(self, ID_ZOOM_OUT_BUTTON, self.SetToolMode)
         
         wx.EVT_TOOL(self, ID_ZOOM_OUT_BUTTON, self.SetToolMode)
         

-        tb.AddTool(ID_MOVE_MODE_BUTTON, Resources.GetHandBitmap(), isToggle=True, shortHelpString = "Move")
+        tb.AddTool(ID_MOVE_MODE_BUTTON, Resources.getHandBitmap(), isToggle=True, shortHelpString = "Move")

         wx.EVT_TOOL(self, ID_MOVE_MODE_BUTTON, self.SetToolMode)
         
         tb.AddSeparator()
         wx.EVT_TOOL(self, ID_MOVE_MODE_BUTTON, self.SetToolMode)
         
         tb.AddSeparator()


@@ -100,7 +92,8 @@ class NavCanvas(wx.Panel):
         wx.EVT_BUTTON(self, ID_ZOOM_TO_FIT_BUTTON, self.ZoomToFit)
 
         tb.Realize()
         wx.EVT_BUTTON(self, ID_ZOOM_TO_FIT_BUTTON, self.ZoomToFit)
 
         tb.Realize()

-        tb.SetSizeHints(tb.GetSize())
+        S = tb.GetSize()
+        tb.SetSizeHints(S[0],S[1])

         return tb
 
     def SetToolMode(self,event):
         return tb
 
     def SetToolMode(self,event):