atsu for textctrl

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

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index ec68425a1a78d2c7a3a541c42066f51a7d97e691..2108da42c43f4e57cbaf80f62e1a6bc16f827267 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -12,17 +12,20 @@
 // 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"


@@ -32,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)


@@ -72,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,


@@ -110,7 +107,7 @@ bool wxSplitterWindow::Create(wxWindow *parent, wxWindowID id,
 
 void wxSplitterWindow::Init()
 {
 
 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;


@@ -216,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())
     {


@@ -292,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() )


@@ -303,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


@@ -684,17 +683,25 @@ 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;
         }


@@ -879,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->GetAdjustedBestSize();
+        size1 = m_windowOne->GetEffectiveMinSize();

     if ( m_windowTwo )
     if ( m_windowTwo )

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

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