Stupid makeprog.vc corruption fixed

[wxWidgets.git] / utils / wxPython / lib / floatbar.py

diff --git a/utils/wxPython/lib/floatbar.py b/utils/wxPython/lib/floatbar.py
index ce846b4a2280c2642ae3c0f0e89b48fd0da7f8e6..26bf194033dedafb03efc6162eb838684c935643 100644 (file)
--- a/utils/wxPython/lib/floatbar.py
+++ b/utils/wxPython/lib/floatbar.py
@@ -16,6 +16,7 @@ class wxFloatBar(wxToolBar):
     position. Programmatically, call SetFloatable(true) and then
     Float(true) to float, Float(false) to dock.
     """
     position. Programmatically, call SetFloatable(true) and then
     Float(true) to float, Float(false) to dock.
     """

+

     def __init__(self,*_args,**_kwargs):
         """
         In addition to the usual arguments, wxFloatBar accepts keyword
     def __init__(self,*_args,**_kwargs):
         """
         In addition to the usual arguments, wxFloatBar accepts keyword


@@ -38,8 +39,10 @@ class wxFloatBar(wxToolBar):
             self.title = ""
         EVT_MOUSE_EVENTS(self, self.OnMouse)
         self.parentframe = wxPyTypeCast(args[1], 'wxFrame')
             self.title = ""
         EVT_MOUSE_EVENTS(self, self.OnMouse)
         self.parentframe = wxPyTypeCast(args[1], 'wxFrame')

+

     def IsFloatable(self):
         return self.floatable
     def IsFloatable(self):
         return self.floatable

+

     def SetFloatable(self, float):
         self.floatable = float
         #Find the size of a title bar.
     def SetFloatable(self, float):
         self.floatable = float
         #Find the size of a title bar.


@@ -48,17 +51,22 @@ class wxFloatBar(wxToolBar):
             test.SetClientSize(wxSize(0,0))
             self.titleheight = test.GetSizeTuple()[1]
             test.Destroy()
             test.SetClientSize(wxSize(0,0))
             self.titleheight = test.GetSizeTuple()[1]
             test.Destroy()

+

     def IsFloating(self):
         return self.floating
     def IsFloating(self):
         return self.floating

+

     def Realize(self):
         wxToolBar.Realize(self)
         self.barheight = -1
     def Realize(self):
         wxToolBar.Realize(self)
         self.barheight = -1

+

     def GetTitle(self):
         return self.title
     def GetTitle(self):
         return self.title

+

     def SetTitle(self, title):
         self.title = title
         if self.IsFloating():
             self.floatframe.SetTitle(self.title)
     def SetTitle(self, title):
         self.title = title
         if self.IsFloating():
             self.floatframe.SetTitle(self.title)

+

     def GetHome(self):
         """
         Returns the frame which this toolbar will return to when
     def GetHome(self):
         """
         Returns the frame which this toolbar will return to when


@@ -68,6 +76,7 @@ class wxFloatBar(wxToolBar):
             return self.parentframe
         else:
             return wxPyTypeCast(self.GetParent(), 'wxFrame')
             return self.parentframe
         else:
             return wxPyTypeCast(self.GetParent(), 'wxFrame')

+

     def SetHome(self, frame):
         """
         Called when docked, this will remove the toolbar from its
     def SetHome(self, frame):
         """
         Called when docked, this will remove the toolbar from its


@@ -89,12 +98,18 @@ class wxFloatBar(wxToolBar):
             size = frame.GetSize()
             frame.SetSize(wxSize(0,0))
             frame.SetSize(size)
             size = frame.GetSize()
             frame.SetSize(wxSize(0,0))
             frame.SetSize(size)

+

     def Float(self, bool):
         "Floats or docks the toolbar programmatically."
         if bool:
             self.parentframe = wxPyTypeCast(self.GetParent(), 'wxFrame')
             clientsize = self.parentframe.GetClientSizeTuple()
     def Float(self, bool):
         "Floats or docks the toolbar programmatically."
         if bool:
             self.parentframe = wxPyTypeCast(self.GetParent(), 'wxFrame')
             clientsize = self.parentframe.GetClientSizeTuple()

-            self.floatframe = wxMiniFrame(self.parentframe, -1, self.title, wxDefaultPosition, wxDefaultSize, wxTHICK_FRAME)
+            if self.title:
+                useStyle = wxDEFAULT_FRAME_STYLE
+            else:
+                useStyle = 0 #wxTHICK_FRAME
+            self.floatframe = wxMiniFrame(self.parentframe, -1, self.title,
+                                          style = useStyle)

             self.Reparent(self.floatframe)
             self.parentframe.SetToolBar(None)
             self.floating = 1
             self.Reparent(self.floatframe)
             self.parentframe.SetToolBar(None)
             self.floating = 1


@@ -104,15 +119,14 @@ class wxFloatBar(wxToolBar):
             self.floatframe.SetToolBar(self)
             self.oldcolor = self.GetBackgroundColour()
             barsize = self.GetSizeTuple()
             self.floatframe.SetToolBar(self)
             self.oldcolor = self.GetBackgroundColour()
             barsize = self.GetSizeTuple()

-#            self.floatframe.SetSize(wxSize(barsize[0], barsize[1] + self.titleheight))
-#            self.floatframe.SetClientSize(wxSize(barsize[0], barsize[1]))
-            self.floatframe.SetClientSize(wxSize(50,200))
+            self.floatframe.SetSize(wxSize(barsize[0], barsize[1] + self.titleheight))
+            self.floatframe.SetClientSize(wxSize(barsize[0], barsize[1]))

             newpos = self.parentframe.GetPosition()
             newpos.y = newpos.y + self.titleheight
             self.floatframe.SetPosition(newpos)
             self.floatframe.Show(true)
             EVT_CLOSE(self.floatframe, self.OnDock)
             newpos = self.parentframe.GetPosition()
             newpos.y = newpos.y + self.titleheight
             self.floatframe.SetPosition(newpos)
             self.floatframe.Show(true)
             EVT_CLOSE(self.floatframe, self.OnDock)

-#            EVT_MOVE(self.floatframe, self.OnMove)
+            EVT_MOVE(self.floatframe, self.OnMove)

         else:
             self.Reparent(self.parentframe)
             self.parentframe.SetToolBar(self)
         else:
             self.Reparent(self.parentframe)
             self.parentframe.SetToolBar(self)


@@ -122,6 +136,7 @@ class wxFloatBar(wxToolBar):
             self.parentframe.SetSize(wxSize(0,0))
             self.parentframe.SetSize(size)
             self.SetBackgroundColour(self.oldcolor)
             self.parentframe.SetSize(wxSize(0,0))
             self.parentframe.SetSize(size)
             self.SetBackgroundColour(self.oldcolor)

+

     def OnDock(self, e):
         self.Float(0)
         if hasattr(self, 'oldpos'):
     def OnDock(self, e):
         self.Float(0)
         if hasattr(self, 'oldpos'):


@@ -131,7 +146,7 @@ class wxFloatBar(wxToolBar):
         homepos = self.parentframe.GetPositionTuple()
         homepos = homepos[0], homepos[1] + self.titleheight
         floatpos = self.floatframe.GetPositionTuple()
         homepos = self.parentframe.GetPositionTuple()
         homepos = homepos[0], homepos[1] + self.titleheight
         floatpos = self.floatframe.GetPositionTuple()

-        if abs(homepos[0]-floatpos[0]) < 35 and abs(homepos[1]-floatpos[1]) < 35:
+        if abs(homepos[0] - floatpos[0]) < 35 and abs(homepos[1] - floatpos[1]) < 35:

             self._SetFauxBarVisible(true)
         else:
             self._SetFauxBarVisible(false)
             self._SetFauxBarVisible(true)
         else:
             self._SetFauxBarVisible(false)


@@ -143,10 +158,12 @@ class wxFloatBar(wxToolBar):
         if e.ButtonDown() or e.ButtonUp() or e.ButtonDClick(1) or e.ButtonDClick(2) or e.ButtonDClick(3):
             e.Skip()
         if e.ButtonDown():
         if e.ButtonDown() or e.ButtonUp() or e.ButtonDClick(1) or e.ButtonDClick(2) or e.ButtonDClick(3):
             e.Skip()
         if e.ButtonDown():

+            self.CaptureMouse()

             self.oldpos = (e.GetX(), e.GetY())
         if e.Entering():
             self.oldpos = (e.GetX(), e.GetY())
         if e.ButtonUp():
             self.oldpos = (e.GetX(), e.GetY())
         if e.Entering():
             self.oldpos = (e.GetX(), e.GetY())
         if e.ButtonUp():

+            self.ReleaseMouse()

             if self.IsFloating():
                 homepos = self.parentframe.GetPositionTuple()
                 homepos = homepos[0], homepos[1] + self.titleheight
             if self.IsFloating():
                 homepos = self.parentframe.GetPositionTuple()
                 homepos = homepos[0], homepos[1] + self.titleheight


@@ -166,7 +183,7 @@ class wxFloatBar(wxToolBar):
                         self.floatframe.SetPosition(pt)
 
     def _SetFauxBarVisible(self, vis):
                         self.floatframe.SetPosition(pt)
 
     def _SetFauxBarVisible(self, vis):

-#        return
+        return

         if vis:
             if self.parentframe.GetToolBar() == None:
                 if not hasattr(self, 'nullbar'):
         if vis:
             if self.parentframe.GetToolBar() == None:
                 if not hasattr(self, 'nullbar'):