[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 849
Date       : Thu Apr 20 13:01:57 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxXtra/manager.cpp

Stop resizing of fixed size floating objects


Diff:
Index: Trunk/XaraLX/wxXtra/manager.cpp
===================================================================
--- Trunk/XaraLX/wxXtra/manager.cpp	(revision 848)
+++ Trunk/XaraLX/wxXtra/manager.cpp	(revision 849)
@@ -582,12 +582,13 @@
     wxFloatingPane(wxWindow* parent,
                    wxFrameManager* owner_mgr,
                    wxWindowID id = -1,
-                   const wxPoint& pos = wxDefaultPosition,
-                   const wxSize& size = wxDefaultSize)
-                    : wxFloatingPaneBaseClass(parent, id, wxT(""), pos, size,
-                            wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION |
+                   const wxPaneInfo& pane)
+                    : wxFloatingPaneBaseClass(parent, id, wxT(""),
+                            pane.floating_pos, pane.floating_size,
+                            wxSYSTEM_MENU | wxCAPTION |
                             wxCLOSE_BOX | wxFRAME_NO_TASKBAR |
-                            wxFRAME_FLOAT_ON_PARENT | wxCLIP_CHILDREN)
+                            wxFRAME_FLOAT_ON_PARENT | wxCLIP_CHILDREN |
+                            (pane.IsFixed()?0:wxRESIZE_BORDER))
     {
         m_owner_mgr = owner_mgr;
         m_moving = false;
@@ -627,9 +628,6 @@
         
         SetTitle(pane.caption);
 
-        if (contained_pane.IsFixed())
-            SetWindowStyle(GetWindowStyle() & ~wxRESIZE_BORDER);
-
         if (pane.floating_size != wxDefaultSize)
         {
             SetSize(pane.floating_size);
@@ -2620,8 +2618,7 @@
                 // pane, which has recently been floated
                 wxFloatingPane* frame = new wxFloatingPane(m_frame,
                                                   this, -1,
-                                                  p.floating_pos,
-                                                  p.floating_size);
+                                                  p);
                                 
                 // on MSW, if the owner desires transparent dragging, and
                 // the dragging is happening right now, then the floating


Xara