- wxPropertyGrid: Added "HasAlpha" attribute for wxColourProperty.
- Added support for saving PNG files with palette (troelsk).
- Added support for saving as GIF and animated GIF (troelsk).
+- Fix wxWrapSizer minimal size calculation (Catalin Raceanu).
GTK:
m_position = pos;
m_size = size;
Layout();
+
+ // This call is required for wxWrapSizer to be able to calculate its
+ // minimal size correctly.
+ InformFirstDirection(wxHORIZONTAL, size.x, size.y);
}
void SetDimension(int x, int y, int width, int height)
{ SetDimension(wxPoint(x, y), wxSize(width, height)); }
// tells the item how much more space there is available in the opposite
// direction (-1 if unknown).
virtual bool
- InformFirstDirection(int WXUNUSED(direction),
- int WXUNUSED(size),
- int WXUNUSED(availableOtherDir))
- {
- return false;
- }
+ InformFirstDirection(int direction, int size, int availableOtherDir);
// sends a size event to the window using its current size -- this has an
// effect of refreshing the window layout
return size*2;
}
+bool
+wxWindowBase::InformFirstDirection(int direction,
+ int size,
+ int availableOtherDir)
+{
+ return GetSizer() && GetSizer()->InformFirstDirection(direction,
+ size,
+ availableOtherDir);
+}
+
wxSize wxWindowBase::GetEffectiveMinSize() const
{
// merge the best size with the min size, giving priority to the min size
test_gui_settings.o \
test_gui_socket.o \
test_gui_boxsizer.o \
+ test_gui_wrapsizer.o \
test_gui_valnum.o \
test_gui_clientsize.o \
test_gui_setsize.o \
test_gui_boxsizer.o: $(srcdir)/sizers/boxsizer.cpp $(TEST_GUI_ODEP)
$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/sizers/boxsizer.cpp
+test_gui_wrapsizer.o: $(srcdir)/sizers/wrapsizer.cpp $(TEST_GUI_ODEP)
+ $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/sizers/wrapsizer.cpp
+
test_gui_valnum.o: $(srcdir)/validators/valnum.cpp $(TEST_GUI_ODEP)
$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/validators/valnum.cpp
$(OBJS)\test_gui_guifuncs.obj \\r
$(OBJS)\test_gui_selstoretest.obj \\r
$(OBJS)\test_gui_garbage.obj \\r
- $(OBJS)\test_gui_settings.obj \\r
- $(OBJS)\test_gui_socket.obj \\r
- $(OBJS)\test_gui_boxsizer.obj \\r
- $(OBJS)\test_gui_valnum.obj \\r
- $(OBJS)\test_gui_clientsize.obj \\r
- $(OBJS)\test_gui_setsize.obj \\r
+ $(OBJS)\test_gui_settings.obj \
+ $(OBJS)\test_gui_socket.obj \
+ $(OBJS)\test_gui_boxsizer.obj \
+ $(OBJS)\test_gui_wrapsizer.obj \
+ $(OBJS)\test_gui_valnum.obj \
+ $(OBJS)\test_gui_clientsize.obj \
+ $(OBJS)\test_gui_setsize.obj \
$(OBJS)\test_gui_xrctest.obj\r
\r
### Conditionally set variables: ###\r
$(OBJS)\test_gui_socket.obj: .\net\socket.cpp\r
$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\net\socket.cpp\r
\r
-$(OBJS)\test_gui_boxsizer.obj: .\sizers\boxsizer.cpp\r
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\sizers\boxsizer.cpp\r
-\r
-$(OBJS)\test_gui_valnum.obj: .\validators\valnum.cpp\r
- $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\validators\valnum.cpp\r
-\r
+$(OBJS)\test_gui_boxsizer.obj: .\sizers\boxsizer.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\sizers\boxsizer.cpp
+
+$(OBJS)\test_gui_wrapsizer.obj: .\sizers\wrapsizer.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\sizers\wrapsizer.cpp
+
+$(OBJS)\test_gui_valnum.obj: .\validators\valnum.cpp
+ $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\validators\valnum.cpp
+
$(OBJS)\test_gui_clientsize.obj: .\window\clientsize.cpp\r
$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\window\clientsize.cpp\r
\r
$(OBJS)\test_gui_guifuncs.o \\r
$(OBJS)\test_gui_selstoretest.o \\r
$(OBJS)\test_gui_garbage.o \\r
- $(OBJS)\test_gui_settings.o \\r
- $(OBJS)\test_gui_socket.o \\r
- $(OBJS)\test_gui_boxsizer.o \\r
- $(OBJS)\test_gui_valnum.o \\r
- $(OBJS)\test_gui_clientsize.o \\r
- $(OBJS)\test_gui_setsize.o \\r
+ $(OBJS)\test_gui_settings.o \
+ $(OBJS)\test_gui_socket.o \
+ $(OBJS)\test_gui_boxsizer.o \
+ $(OBJS)\test_gui_wrapsizer.o \
+ $(OBJS)\test_gui_valnum.o \
+ $(OBJS)\test_gui_clientsize.o \
+ $(OBJS)\test_gui_setsize.o \
$(OBJS)\test_gui_xrctest.o\r
\r
### Conditionally set variables: ###\r
$(OBJS)\test_gui_socket.o: ./net/socket.cpp\r
$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
\r
-$(OBJS)\test_gui_boxsizer.o: ./sizers/boxsizer.cpp\r
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
-\r
-$(OBJS)\test_gui_valnum.o: ./validators/valnum.cpp\r
- $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
-\r
+$(OBJS)\test_gui_boxsizer.o: ./sizers/boxsizer.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_wrapsizer.o: ./sizers/wrapsizer.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_valnum.o: ./validators/valnum.cpp
+ $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
$(OBJS)\test_gui_clientsize.o: ./window/clientsize.cpp\r
$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
\r
$(OBJS)\test_gui_guifuncs.obj \\r
$(OBJS)\test_gui_selstoretest.obj \\r
$(OBJS)\test_gui_garbage.obj \\r
- $(OBJS)\test_gui_settings.obj \\r
- $(OBJS)\test_gui_socket.obj \\r
- $(OBJS)\test_gui_boxsizer.obj \\r
- $(OBJS)\test_gui_valnum.obj \\r
- $(OBJS)\test_gui_clientsize.obj \\r
- $(OBJS)\test_gui_setsize.obj \\r
+ $(OBJS)\test_gui_settings.obj \
+ $(OBJS)\test_gui_socket.obj \
+ $(OBJS)\test_gui_boxsizer.obj \
+ $(OBJS)\test_gui_wrapsizer.obj \
+ $(OBJS)\test_gui_valnum.obj \
+ $(OBJS)\test_gui_clientsize.obj \
+ $(OBJS)\test_gui_setsize.obj \
$(OBJS)\test_gui_xrctest.obj\r
TEST_GUI_RESOURCES = \\r
$(OBJS)\test_gui_sample.res\r
$(OBJS)\test_gui_socket.obj: .\net\socket.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\net\socket.cpp\r
\r
-$(OBJS)\test_gui_boxsizer.obj: .\sizers\boxsizer.cpp\r
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\sizers\boxsizer.cpp\r
-\r
-$(OBJS)\test_gui_valnum.obj: .\validators\valnum.cpp\r
- $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\validators\valnum.cpp\r
-\r
+$(OBJS)\test_gui_boxsizer.obj: .\sizers\boxsizer.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\sizers\boxsizer.cpp
+
+$(OBJS)\test_gui_wrapsizer.obj: .\sizers\wrapsizer.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\sizers\wrapsizer.cpp
+
+$(OBJS)\test_gui_valnum.obj: .\validators\valnum.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\validators\valnum.cpp
+
$(OBJS)\test_gui_clientsize.obj: .\window\clientsize.cpp\r
$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\window\clientsize.cpp\r
\r
$(OBJS)\test_gui_guifuncs.obj &\r
$(OBJS)\test_gui_selstoretest.obj &\r
$(OBJS)\test_gui_garbage.obj &\r
- $(OBJS)\test_gui_settings.obj &\r
- $(OBJS)\test_gui_socket.obj &\r
- $(OBJS)\test_gui_boxsizer.obj &\r
- $(OBJS)\test_gui_valnum.obj &\r
- $(OBJS)\test_gui_clientsize.obj &\r
- $(OBJS)\test_gui_setsize.obj &\r
+ $(OBJS)\test_gui_settings.obj &
+ $(OBJS)\test_gui_socket.obj &
+ $(OBJS)\test_gui_boxsizer.obj &
+ $(OBJS)\test_gui_wrapsizer.obj &
+ $(OBJS)\test_gui_valnum.obj &
+ $(OBJS)\test_gui_clientsize.obj &
+ $(OBJS)\test_gui_setsize.obj &
$(OBJS)\test_gui_xrctest.obj\r
\r
\r
$(OBJS)\test_gui_socket.obj : .AUTODEPEND .\net\socket.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
\r
-$(OBJS)\test_gui_boxsizer.obj : .AUTODEPEND .\sizers\boxsizer.cpp\r
- $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
-\r
-$(OBJS)\test_gui_valnum.obj : .AUTODEPEND .\validators\valnum.cpp\r
- $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
-\r
+$(OBJS)\test_gui_boxsizer.obj : .AUTODEPEND .\sizers\boxsizer.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+
+$(OBJS)\test_gui_wrapsizer.obj : .AUTODEPEND .\sizers\wrapsizer.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+
+$(OBJS)\test_gui_valnum.obj : .AUTODEPEND .\validators\valnum.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+
$(OBJS)\test_gui_clientsize.obj : .AUTODEPEND .\window\clientsize.cpp\r
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
\r
--- /dev/null
+///////////////////////////////////////////////////////////////////////////////
+// Name: tests/sizers/wrapsizer.cpp
+// Purpose: Unit tests for wxWrapSizer
+// Author: Catalin Raceanu
+// Created: 2010-10-23
+// RCS-ID: $Id:$
+// Copyright: (c) 2010 wxWidgets development team
+///////////////////////////////////////////////////////////////////////////////
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "testprec.h"
+
+#ifdef __BORLANDC__
+ #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+ #include "wx/app.h"
+#endif // WX_PRECOMP
+
+#include "wx/wrapsizer.h"
+
+#include "asserthelper.h"
+
+// ----------------------------------------------------------------------------
+// test class
+// ----------------------------------------------------------------------------
+
+class WrapSizerTestCase : public CppUnit::TestCase
+{
+public:
+ WrapSizerTestCase() { }
+
+ virtual void setUp();
+ virtual void tearDown();
+
+private:
+ CPPUNIT_TEST_SUITE( WrapSizerTestCase );
+ CPPUNIT_TEST( CalcMin );
+ CPPUNIT_TEST_SUITE_END();
+
+ void CalcMin();
+
+ wxWindow *m_win;
+ wxSizer *m_sizer;
+
+ DECLARE_NO_COPY_CLASS(WrapSizerTestCase)
+};
+
+// register in the unnamed registry so that these tests are run by default
+CPPUNIT_TEST_SUITE_REGISTRATION( WrapSizerTestCase );
+
+// also include in it's own registry so that these tests can be run alone
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( WrapSizerTestCase, "WrapSizerTestCase" );
+
+// ----------------------------------------------------------------------------
+// test initialization
+// ----------------------------------------------------------------------------
+
+void WrapSizerTestCase::setUp()
+{
+ m_win = new wxWindow(wxTheApp->GetTopWindow(), wxID_ANY);
+ m_win->SetClientSize(180, 240);
+
+ m_sizer = new wxWrapSizer(wxHORIZONTAL);
+ m_win->SetSizer(m_sizer);
+}
+
+void WrapSizerTestCase::tearDown()
+{
+ delete m_win;
+ m_win = NULL;
+
+ m_sizer = NULL;
+}
+
+// ----------------------------------------------------------------------------
+// tests themselves
+// ----------------------------------------------------------------------------
+
+void WrapSizerTestCase::CalcMin()
+{
+ const wxSize sizeTotal = m_win->GetClientSize();
+ wxSize sizeMinExpected;
+
+ // With a single child the min size must be the same as child size.
+ const wxSize sizeChild1 = wxSize(sizeTotal.x/2 - 10, sizeTotal.y/4);
+ sizeMinExpected = sizeChild1;
+
+ wxWindow * const
+ child1 = new wxWindow(m_win, wxID_ANY, wxDefaultPosition, sizeChild1);
+ child1->SetBackgroundColour(*wxRED);
+ m_sizer->Add(child1);
+ m_win->Layout();
+
+ CPPUNIT_ASSERT_EQUAL( sizeMinExpected, m_sizer->CalcMin() );
+
+ // If both children can fit in the same row, the minimal size of the sizer
+ // is determined by the sum of their minimal horizontal dimensions and
+ // the maximum of their minimal vertical dimensions.
+ const wxSize sizeChild2 = wxSize(sizeTotal.x/2 + 10, sizeTotal.y/3);
+ sizeMinExpected.x += sizeChild2.x;
+ sizeMinExpected.y = wxMax(sizeChild1.y, sizeChild2.y);
+
+ wxWindow * const
+ child2 = new wxWindow(m_win, wxID_ANY, wxDefaultPosition, sizeChild2);
+ child2->SetBackgroundColour(*wxYELLOW);
+ m_sizer->Add(child2);
+ m_win->Layout();
+
+ CPPUNIT_ASSERT_EQUAL( sizeMinExpected, m_sizer->CalcMin() );
+
+ // Three children will take at least two rows so the minimal size in
+ // vertical direction must increase.
+ const wxSize sizeChild3 = wxSize(sizeTotal.x/2, sizeTotal.y/5);
+ sizeMinExpected.y += sizeChild3.y;
+
+ wxWindow * const
+ child3 = new wxWindow(m_win, wxID_ANY, wxDefaultPosition, sizeChild3);
+ child3->SetBackgroundColour(*wxGREEN);
+ m_sizer->Add(child3);
+ m_win->Layout();
+
+ CPPUNIT_ASSERT_EQUAL( sizeMinExpected, m_sizer->CalcMin() );
+}
-->
net/socket.cpp
sizers/boxsizer.cpp
+ sizers/wrapsizer.cpp
validators/valnum.cpp
window/clientsize.cpp
window/setsize.cpp
# End Source File\r
# Begin Source File\r
\r
+SOURCE=.\sizers\wrapsizer.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\xml\xrctest.cpp\r
# End Source File\r
# End Group\r
RelativePath=".\controls\windowtest.cpp">\r
</File>\r
<File\r
+ RelativePath=".\sizers\wrapsizer.cpp">
+ </File>
+ <File
RelativePath=".\xml\xrctest.cpp">\r
</File>\r
</Filter>\r
>\r
</File>\r
<File\r
+ RelativePath=".\sizers\wrapsizer.cpp"
+ >
+ </File>
+ <File
RelativePath=".\xml\xrctest.cpp"\r
>\r
</File>\r
>\r
</File>\r
<File\r
+ RelativePath=".\sizers\wrapsizer.cpp"
+ >
+ </File>
+ <File
RelativePath=".\xml\xrctest.cpp"\r
>\r
</File>\r
projects / wxWidgets.git / commitdiff
