move Ellipsize() to wxControl so it can be easily used by other controls

[wxWidgets.git] / src / generic / splitter.cpp

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 51d715bdb91d27e920e5c99719ee2506bf480631..444304ae32c0d36f978f0a3dc2e393d7727dab4f 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -9,24 +9,23 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "splitter.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#if wxUSE_SPLITTER
-

 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 

+#if wxUSE_SPLITTER
+
+#include "wx/splitter.h"
+

 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/utils.h"
     #include "wx/log.h"
 
 #ifndef WX_PRECOMP
     #include "wx/string.h"
     #include "wx/utils.h"
     #include "wx/log.h"
 

+    #include "wx/dcclient.h"

     #include "wx/dcscreen.h"
 
     #include "wx/window.h"
     #include "wx/dcscreen.h"
 
     #include "wx/window.h"


@@ -36,14 +35,8 @@
     #include "wx/settings.h"
 #endif
 
     #include "wx/settings.h"
 #endif
 

-#ifdef __WXMAC__
-    #include "wx/mac/private.h"
-#endif
-

 #include "wx/renderer.h"
 
 #include "wx/renderer.h"
 

-#include "wx/splitter.h"
-

 #include <stdlib.h>
 
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED)
 #include <stdlib.h>
 
 DEFINE_EVENT_TYPE(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED)


@@ -76,7 +69,7 @@ BEGIN_EVENT_TABLE(wxSplitterWindow, wxWindow)
     WX_EVENT_TABLE_CONTROL_CONTAINER(wxSplitterWindow)
 END_EVENT_TABLE()
 
     WX_EVENT_TABLE_CONTROL_CONTAINER(wxSplitterWindow)
 END_EVENT_TABLE()
 

-WX_DELEGATE_TO_CONTROL_CONTAINER(wxSplitterWindow);
+WX_DELEGATE_TO_CONTROL_CONTAINER(wxSplitterWindow, wxWindow)

 
 bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id,
                                    const wxPoint& pos,
 
 bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id,
                                    const wxPoint& pos,


@@ -94,18 +87,27 @@ bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id,
     if ( !wxWindow::Create(parent, id, pos, size, style, name) )
         return false;
 
     if ( !wxWindow::Create(parent, id, pos, size, style, name) )
         return false;
 

+    if (size.x >= 0)
+        m_lastSize.x = size.x;
+    if (size.y >= 0)
+        m_lastSize.y = size.y;
+    

     m_permitUnsplitAlways = (style & wxSP_PERMIT_UNSPLIT) != 0;
 
     m_permitUnsplitAlways = (style & wxSP_PERMIT_UNSPLIT) != 0;
 

+    // FIXME: with this line the background is not erased at all under GTK1,
+    //        so temporary avoid it there
+#if !defined(__WXGTK__) || defined(__WXGTK20__)

     // don't erase the splitter background, it's pointless as we overwrite it
     // anyhow
     SetBackgroundStyle(wxBG_STYLE_CUSTOM);
     // don't erase the splitter background, it's pointless as we overwrite it
     // anyhow
     SetBackgroundStyle(wxBG_STYLE_CUSTOM);

+#endif

 
     return true;
 }
 
 void wxSplitterWindow::Init()
 {
 
     return true;
 }
 
 void wxSplitterWindow::Init()
 {

-    m_container.SetContainerWindow(this);
+    WX_INIT_CONTROL_CONTAINER();

 
     m_splitMode = wxSPLIT_VERTICAL;
     m_permitUnsplitAlways = true;
 
     m_splitMode = wxSPLIT_VERTICAL;
     m_permitUnsplitAlways = true;


@@ -118,12 +120,13 @@ void wxSplitterWindow::Init()
     m_firstY = 0;
     m_sashPosition = m_requestedSashPosition = 0;
     m_sashGravity = 0.0;
     m_firstY = 0;
     m_sashPosition = m_requestedSashPosition = 0;
     m_sashGravity = 0.0;

+    m_sashSize = -1; // -1 means use the native sash size

     m_lastSize = wxSize(0,0);
     m_checkRequestedSashPosition = false;
     m_minimumPaneSize = 0;
     m_sashCursorWE = wxCursor(wxCURSOR_SIZEWE);
     m_sashCursorNS = wxCursor(wxCURSOR_SIZENS);
     m_lastSize = wxSize(0,0);
     m_checkRequestedSashPosition = false;
     m_minimumPaneSize = 0;
     m_sashCursorWE = wxCursor(wxCURSOR_SIZEWE);
     m_sashCursorNS = wxCursor(wxCURSOR_SIZENS);

-    m_sashTrackerPen = new wxPen(*wxBLACK, 2, wxSOLID);
+    m_sashTrackerPen = new wxPen(*wxBLACK, 2, wxPENSTYLE_SOLID);

 
     m_needUpdating = false;
     m_isHot = false;
 
     m_needUpdating = false;
     m_isHot = false;


@@ -210,10 +213,12 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
     // following the mouse movement while it drags the sash, without it we only
     // draw the sash at the new position but only resize the windows when the
     // dragging is finished
     // following the mouse movement while it drags the sash, without it we only
     // draw the sash at the new position but only resize the windows when the
     // dragging is finished

-#if defined( __WXMAC__ ) && TARGET_API_MAC_OSX == 1
-    bool isLive = true ;
+#if defined( __WXMAC__ ) 
+    // FIXME : this should be usable also with no live update, but then this
+    // currently is not visible
+    bool isLive = true;

 #else
 #else

-    bool isLive = (GetWindowStyleFlag() & wxSP_LIVE_UPDATE) != 0;
+    bool isLive = HasFlag(wxSP_LIVE_UPDATE);

 #endif
     if (event.LeftDown())
     {
 #endif
     if (event.LeftDown())
     {


@@ -286,9 +291,9 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
                 m_windowOne = m_windowTwo;
                 m_windowTwo = (wxWindow *) NULL;
                 OnUnsplit(removedWindow);
                 m_windowOne = m_windowTwo;
                 m_windowTwo = (wxWindow *) NULL;
                 OnUnsplit(removedWindow);

-                wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_UNSPLIT, this);
-                event.m_data.win = removedWindow;
-                (void)DoSendEvent(event);
+                wxSplitterEvent eventUnsplit(wxEVT_COMMAND_SPLITTER_UNSPLIT, this);
+                eventUnsplit.m_data.win = removedWindow;
+                (void)DoSendEvent(eventUnsplit);

                 SetSashPositionAndNotify(0);
             }
             else if ( posSashNew == GetWindowSize() )
                 SetSashPositionAndNotify(0);
             }
             else if ( posSashNew == GetWindowSize() )


@@ -297,9 +302,9 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
                 wxWindow *removedWindow = m_windowTwo;
                 m_windowTwo = (wxWindow *) NULL;
                 OnUnsplit(removedWindow);
                 wxWindow *removedWindow = m_windowTwo;
                 m_windowTwo = (wxWindow *) NULL;
                 OnUnsplit(removedWindow);

-                wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_UNSPLIT, this);
-                event.m_data.win = removedWindow;
-                (void)DoSendEvent(event);
+                wxSplitterEvent eventUnsplit(wxEVT_COMMAND_SPLITTER_UNSPLIT, this);
+                eventUnsplit.m_data.win = removedWindow;
+                (void)DoSendEvent(eventUnsplit);

                 SetSashPositionAndNotify(0);
             }
             else
                 SetSashPositionAndNotify(0);
             }
             else


@@ -378,7 +383,7 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
         }
         else
         {
         }
         else
         {

-            SetSashPositionAndNotify(posSashNew);
+            DoSetSashPosition(posSashNew);

             m_needUpdating = true;
         }
     }
             m_needUpdating = true;
         }
     }


@@ -467,7 +472,7 @@ bool wxSplitterWindow::SashHitTest(int x, int y, int tolerance)
 
 int wxSplitterWindow::GetSashSize() const
 {
 
 int wxSplitterWindow::GetSashSize() const
 {

-    return wxRendererNative::Get().GetSplitterParams(this).widthSash;
+    return m_sashSize > -1 ? m_sashSize : wxRendererNative::Get().GetSplitterParams(this).widthSash;

 }
 
 int wxSplitterWindow::GetBorderSize() const
 }
 
 int wxSplitterWindow::GetBorderSize() const


@@ -502,7 +507,7 @@ void wxSplitterWindow::DrawSash(wxDC& dc)
                                 m_sashPosition,
                                 m_splitMode == wxSPLIT_VERTICAL ? wxVERTICAL
                                                                 : wxHORIZONTAL,
                                 m_sashPosition,
                                 m_splitMode == wxSPLIT_VERTICAL ? wxVERTICAL
                                                                 : wxHORIZONTAL,

-                                m_isHot ? wxCONTROL_CURRENT : 0
+                                m_isHot ? (int)wxCONTROL_CURRENT : 0

                             );
 }
 
                             );
 }
 


@@ -568,8 +573,6 @@ int wxSplitterWindow::GetWindowSize() const
 
 int wxSplitterWindow::AdjustSashPosition(int sashPos) const
 {
 
 int wxSplitterWindow::AdjustSashPosition(int sashPos) const
 {

-    int window_size = GetWindowSize();
-

     wxWindow *win;
 
     win = GetWindow1();
     wxWindow *win;
 
     win = GetWindow1();


@@ -598,8 +601,8 @@ int wxSplitterWindow::AdjustSashPosition(int sashPos) const
         if ( minSize == -1 || m_minimumPaneSize > minSize )
             minSize = m_minimumPaneSize;
 
         if ( minSize == -1 || m_minimumPaneSize > minSize )
             minSize = m_minimumPaneSize;
 

-        int maxSize = window_size - minSize - GetBorderSize() - GetSashSize();
-        if ( sashPos > maxSize )
+        int maxSize = GetWindowSize() - minSize - GetBorderSize() - GetSashSize();
+        if ( maxSize > 0 && sashPos > maxSize )

             sashPos = maxSize;
     }
 
             sashPos = maxSize;
     }
 


@@ -626,13 +629,15 @@ void wxSplitterWindow::SetSashPositionAndNotify(int sashPos)
     // SetSashPosition():
     m_requestedSashPosition = INT_MAX;
 
     // SetSashPosition():
     m_requestedSashPosition = INT_MAX;
 

-    if ( DoSetSashPosition(sashPos) )
-    {
-        wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, this);
-        event.m_data.pos = m_sashPosition;
+    // note that we must send the event in any case, i.e. even if the sash
+    // position hasn't changed and DoSetSashPosition() returns false because we
+    // must generate a CHANGED event at the end of resizing
+    DoSetSashPosition(sashPos);

 
 

-        (void)DoSendEvent(event);
-    }
+    wxSplitterEvent event(wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED, this);
+    event.m_data.pos = m_sashPosition;
+
+    (void)DoSendEvent(event);

 }
 
 // Position and size subwindows.
 }
 
 // Position and size subwindows.


@@ -678,23 +683,31 @@ void wxSplitterWindow::SizeWindows()
         {
             w1 = size1;
             w2 = w - 2*border - sash - w1;
         {
             w1 = size1;
             w2 = w - 2*border - sash - w1;

-            h1 =
+            if (w2 < 0)
+                w2 = 0;

             h2 = h - 2*border;
             h2 = h - 2*border;

+            if (h2 < 0)
+                h2 = 0;
+            h1 = h2;

             x2 = size2;
             y2 = border;
         }
         else // horz splitter
         {
             x2 = size2;
             y2 = border;
         }
         else // horz splitter
         {

-            w1 =

             w2 = w - 2*border;
             w2 = w - 2*border;

+            if (w2 < 0)
+                w2 = 0;
+            w1 = w2;

             h1 = size1;
             h2 = h - 2*border - sash - h1;
             h1 = size1;
             h2 = h - 2*border - sash - h1;

+            if (h2 < 0)
+                h2 = 0;

             x2 = border;
             y2 = size2;
         }
 
             x2 = border;
             y2 = size2;
         }
 

-        GetWindow1()->SetSize(border, border, w1, h1);

         GetWindow2()->SetSize(x2, y2, w2, h2);
         GetWindow2()->SetSize(x2, y2, w2, h2);

+        GetWindow1()->SetSize(border, border, w1, h1);

     }
 
     wxClientDC dc(this);
     }
 
     wxClientDC dc(this);


@@ -706,9 +719,12 @@ void wxSplitterWindow::SizeWindows()
 // Set pane for unsplit window
 void wxSplitterWindow::Initialize(wxWindow *window)
 {
 // Set pane for unsplit window
 void wxSplitterWindow::Initialize(wxWindow *window)
 {

-    wxASSERT_MSG( (!window || (window && window->GetParent() == this)),
+    wxASSERT_MSG( (!window || window->GetParent() == this),

                   _T("windows in the splitter should have it as parent!") );
 
                   _T("windows in the splitter should have it as parent!") );
 

+    if (window && !window->IsShown())
+        window->Show();
+

     m_windowOne = window;
     m_windowTwo = (wxWindow *) NULL;
     DoSetSashPosition(0);
     m_windowOne = window;
     m_windowTwo = (wxWindow *) NULL;
     DoSetSashPosition(0);


@@ -734,7 +750,7 @@ bool wxSplitterWindow::DoSplit(wxSplitMode mode,
         window1->Show();
     if (! window2->IsShown())
         window2->Show();
         window1->Show();
     if (! window2->IsShown())
         window2->Show();

-    
+

     m_splitMode = mode;
     m_windowOne = window1;
     m_windowTwo = window2;
     m_splitMode = mode;
     m_windowOne = window1;
     m_windowTwo = window2;


@@ -870,9 +886,9 @@ wxSize wxSplitterWindow::DoGetBestSize() const
     // get best sizes of subwindows
     wxSize size1, size2;
     if ( m_windowOne )
     // get best sizes of subwindows
     wxSize size1, size2;
     if ( m_windowOne )

-        size1 = m_windowOne->GetBestSize();
+        size1 = m_windowOne->GetEffectiveMinSize();

     if ( m_windowTwo )
     if ( m_windowTwo )

-        size2 = m_windowTwo->GetBestSize();
+        size2 = m_windowTwo->GetEffectiveMinSize();

 
     // sum them
     //
 
     // sum them
     //