Implemented wxArrayString::Shrink() and stuff.

[wxWidgets.git] / src / common / layout.cpp

diff --git a/src/common/layout.cpp b/src/common/layout.cpp
index b98de42ee583a7de91dae3b4a70e0262c0a135d9..e8f22391a6d5b5f4a64f3cf229ece5d7c19551cd 100644 (file)
--- a/src/common/layout.cpp
+++ b/src/common/layout.cpp
@@ -1273,7 +1273,7 @@ void wxSizer::RemoveSizerChild(wxWindow *child)
   GetChildren().DeleteObject(child);
 }
 
   GetChildren().DeleteObject(child);
 }
 

-void wxSizer::SetSize(int x, int y, int w, int h, int WXUNUSED(flags))
+void wxSizer::DoSetSize(int x, int y, int w, int h, int WXUNUSED(flags))

 {
   wxLayoutConstraints *constr = GetConstraints();
   if (x != -1)
 {
   wxLayoutConstraints *constr = GetConstraints();
   if (x != -1)


@@ -1500,11 +1500,6 @@ wxRowColSizer::~wxRowColSizer()
 {
 }
 
 {
 }
 

-void wxRowColSizer::SetSize(int x, int y, int w, int h, int flags)
-{
-  wxSizer::SetSize(x, y, w, h, flags);
-}
-

 bool wxRowColSizer::LayoutPhase1(int *noChanges)
 {
   *noChanges = 0;
 bool wxRowColSizer::LayoutPhase1(int *noChanges)
 {
   *noChanges = 0;