added copy ctor to wxHashTable

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

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 072448b191e7ceb2a5e3c4f2232b3ddf1bda8ef2..4360b6c9b9e1a07467a01ffe850044a3f0061d66 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -21,7 +21,9 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-    #include "wx/wx.h"
+    #include "wx/window.h"
+    #include "wx/dialog.h"
+    #include "wx/frame.h"

 #endif
 
 #include <stdlib.h>
 #endif
 
 #include <stdlib.h>


@@ -29,6 +31,7 @@
 #include "wx/string.h"
 #include "wx/splitter.h"
 #include "wx/dcscreen.h"
 #include "wx/string.h"
 #include "wx/splitter.h"
 #include "wx/dcscreen.h"

+#include "wx/settings.h"

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindow, wxWindow)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxSplitterWindow, wxWindow)


@@ -185,7 +188,7 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
            {
                DrawSashTracker(x, y);
            }
            {
                DrawSashTracker(x, y);
            }

-           
+

             m_oldX = x;
             m_oldY = y;
             return;
             m_oldX = x;
             m_oldY = y;
             return;


@@ -279,7 +282,7 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
         }
 #endif // __WXGTK__
     }
         }
 #endif // __WXGTK__
     }

-    else if (event.Dragging() && (m_dragMode == wxSPLIT_DRAG_DRAGGING)) 
+    else if (event.Dragging() && (m_dragMode == wxSPLIT_DRAG_DRAGGING))

     {
         // Obtain window size. We are only interested in the dimension the sash
         // splits up
     {
         // Obtain window size. We are only interested in the dimension the sash
         // splits up


@@ -373,7 +376,7 @@ void wxSplitterWindow::OnSize(wxSizeEvent& event)
         if ( dialog )
             iconized = dialog->IsIconized();
         else
         if ( dialog )
             iconized = dialog->IsIconized();
         else

-            wxFAIL_MSG(T("should have a top level frame or dialog parent!"));
+            wxFAIL_MSG(wxT("should have a top level frame or dialog parent!"));

     }
 
     if ( iconized )
     }
 
     if ( iconized )


@@ -433,7 +436,7 @@ void wxSplitterWindow::DrawBorders(wxDC& dc)
 
     if ( GetWindowStyleFlag() & wxSP_3D )
     {
 
     if ( GetWindowStyleFlag() & wxSP_3D )
     {

-               
+

         dc.SetPen(*m_facePen);
         dc.SetBrush(*m_faceBrush);
         dc.DrawRectangle(1, 1 , w-1, m_borderSize-2 ); //high
         dc.SetPen(*m_facePen);
         dc.SetBrush(*m_faceBrush);
         dc.DrawRectangle(1, 1 , w-1, m_borderSize-2 ); //high


@@ -618,9 +621,7 @@ void wxSplitterWindow::SizeWindows()
     if ( m_windowOne && !m_windowTwo )
     {
         m_windowOne->SetSize(m_borderSize, m_borderSize, w - 2*m_borderSize, h - 2*m_borderSize);
     if ( m_windowOne && !m_windowTwo )
     {
         m_windowOne->SetSize(m_borderSize, m_borderSize, w - 2*m_borderSize, h - 2*m_borderSize);

-       
-       if (m_windowOne->GetAutoLayout())
-           m_windowOne->Layout();
+

     }
     else if ( m_windowOne && m_windowTwo )
     {
     }
     else if ( m_windowOne && m_windowTwo )
     {


@@ -638,11 +639,7 @@ void wxSplitterWindow::SizeWindows()
 
             m_windowOne->SetSize(x1, y1, w1, h1);
             m_windowTwo->SetSize(x2, y2, w2, h2);
 
             m_windowOne->SetSize(x1, y1, w1, h1);
             m_windowTwo->SetSize(x2, y2, w2, h2);

-       
-           if (m_windowOne->GetAutoLayout())
-               m_windowOne->Layout();
-           if (m_windowTwo->GetAutoLayout())
-               m_windowTwo->Layout();
+

         }
         else
         {
         }
         else
         {


@@ -650,11 +647,7 @@ void wxSplitterWindow::SizeWindows()
                 w - 2*m_borderSize, m_sashPosition - m_borderSize);
             m_windowTwo->SetSize(m_borderSize, m_sashPosition + m_sashSize,
                 w - 2*m_borderSize, h - 2*m_borderSize - m_sashSize - (m_sashPosition - m_borderSize));
                 w - 2*m_borderSize, m_sashPosition - m_borderSize);
             m_windowTwo->SetSize(m_borderSize, m_sashPosition + m_sashSize,
                 w - 2*m_borderSize, h - 2*m_borderSize - m_sashSize - (m_sashPosition - m_borderSize));

-               
-           if (m_windowOne->GetAutoLayout())
-               m_windowOne->Layout();
-           if (m_windowTwo->GetAutoLayout())
-               m_windowTwo->Layout();
+

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


@@ -742,7 +735,7 @@ bool wxSplitterWindow::Unsplit(wxWindow *toRemove)
     }
     else
     {
     }
     else
     {

-        wxFAIL_MSG(T("splitter: attempt to remove a non-existent window"));
+        wxFAIL_MSG(wxT("splitter: attempt to remove a non-existent window"));

 
         return FALSE;
     }
 
         return FALSE;
     }


@@ -757,8 +750,8 @@ bool wxSplitterWindow::Unsplit(wxWindow *toRemove)
 // Replace a window with another one
 bool wxSplitterWindow::ReplaceWindow(wxWindow *winOld, wxWindow *winNew)
 {
 // Replace a window with another one
 bool wxSplitterWindow::ReplaceWindow(wxWindow *winOld, wxWindow *winNew)
 {

-    wxCHECK_MSG( winOld, FALSE, T("use one of Split() functions instead") );
-    wxCHECK_MSG( winNew, FALSE, T("use Unsplit() functions instead") );
+    wxCHECK_MSG( winOld, FALSE, wxT("use one of Split() functions instead") );
+    wxCHECK_MSG( winNew, FALSE, wxT("use Unsplit() functions instead") );

 
     if ( winOld == m_windowTwo )
     {
 
     if ( winOld == m_windowTwo )
     {


@@ -770,7 +763,7 @@ bool wxSplitterWindow::ReplaceWindow(wxWindow *winOld, wxWindow *winNew)
     }
     else
     {
     }
     else
     {

-        wxFAIL_MSG(T("splitter: attempt to replace a non-existent window"));
+        wxFAIL_MSG(wxT("splitter: attempt to replace a non-existent window"));

 
         return FALSE;
     }
 
         return FALSE;
     }