Commit Graph

139 Commits

Author SHA1 Message Date
Vadim Zeitlin
e556b61236 Add virtual wxSizer::DoInsert() to replace Insert().
This allows to avoid problems with hiding all but the overridden overloads of
Insert() in wxSizer-derived classes, see #11616, without having to explicitly
write any using statements.

Keep Insert(size_t, wxSizerItem) virtual to allow the existing code overriding
it to keep working.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-01-23 13:44:46 +00:00
Stefan Csomor
1e287c5df7 avoiding Insert shadowing superclass methods, closes #11616
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-01-18 09:45:32 +00:00
Robert Roebling
d7bb29260e Revert wxFlexGridSizer constr. change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-11-15 09:40:30 +00:00
Robert Roebling
7aab7176f1 Restore ability to create wxFlexGridSizer with 2 params (number of columns and vertical gap)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-11-14 21:50:50 +00:00
Vadim Zeitlin
1a2df6a75b Change wxBoxSizer::AddSpacer() to only add space in sizer direction.
It used to add a spacer with the given size in both directions but this was
counter-intuitive and wasn't expected even by the original author of this code
so change it to behave more reasonably.

Closes #11197.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-09-15 17:05:32 +00:00
Vadim Zeitlin
0274a7973d Added wxGridSize::GetEffective{Cols,Rows}Count().
These functions return the number of columns or rows being currently used and
not 0, unlike the existing Get{Cols,Rows}(), if the corresponding number is
determined dynamically.

Closes #10254.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61750 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-08-23 22:24:48 +00:00
Vadim Zeitlin
0be3080aed Use "non-negative" in assert message instead of "positive".
Closes #11059.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-08-10 11:18:31 +00:00
Vadim Zeitlin
4a00e77ce6 Update wxFlexGridSizer ctors to match (new) wxGridSizer ones.
Confusing wxFlexGridSizer(int cols, int vgap = 0, int hgap = 0) was removed as
well as corresponding wxGridSizer ctor overload. New ctor overloads taking gap
as wxSize were added.

See #11040.

Closes #11091.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-08-10 11:18:23 +00:00
Vadim Zeitlin
7e6edd2772 Make wxGridSizer ctors more consistent.
The old and confusing wxGridSizer(int cols, int vgap = 0, int hgap = 0) is removed and replaced with wxGridSizer(int cols, int vgap, int hgap).

New ctor overloads using wxSize for the gap parameter added.

Closes #11040.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-08-02 00:48:58 +00:00
Vadim Zeitlin
4f671eebc9 Add checks of wxGridSizer::Set{Cols,Rows}() arguments.
Number of rows or columns must be positive (see #11040).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-08-02 00:48:49 +00:00
Vadim Zeitlin
9a83f86094 Globally replace _T() with wxT().
Standardize on using a single macro across all wxWidgets sources and solve the name clash with Sun CC standard headers (see #10660).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-07-23 20:30:22 +00:00
Francesco Montorsi
9b49405777 no real change; just add the standard separator where it's missing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-04-21 00:05:14 +00:00
Václav Slavík
afc0db8ca0 detect and report errors in XRC specification of grid sizers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-16 13:33:39 +00:00
Vadim Zeitlin
8b492f67ab detect adding too many items to a grid sizer sooner and don't crash if this happens
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-07 23:37:51 +00:00
Vadim Zeitlin
c0c133e13b add wx-prefixed and semicolon-requiring versions of DECLARE_NO_{COPY,ASSIGN}_CLASS macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-08 11:45:59 +00:00
Francesco Montorsi
52ceb90e10 fix typo; document wxFlexSizerGrowMode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-31 20:10:13 +00:00
Vadim Zeitlin
6e1f851b17 also add wxSizer::IsEmpty()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-01 23:25:37 +00:00
Vadim Zeitlin
2f39b5a33e make the new GetItemCount() const
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-01 23:23:54 +00:00
Robert Roebling
6b527e158d Added wxSizer::GetItemCount()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-01 22:05:29 +00:00
Vadim Zeitlin
67ef83eb03 added wxFlexGridSizer::Add{Row,Col}Growable() (#2603)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-07-13 18:06:50 +00:00
Vadim Zeitlin
30a56ea8cb call wxSizerFlags::Top/Bottom() or Left/Right() shouldn't change horizontal or vertical alignment (#9534)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-07 01:22:34 +00:00
Vadim Zeitlin
49dcc246bf add wxSizer::SetDimension() overload taking wxPoint/wxSize instead of 4 ints
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-05-08 18:58:04 +00:00
Francesco Montorsi
53a2db124c substitute WXDLLEXPORT with WXDLLIMPEXP_CORE and WXDLLEXPORT_DATA with WXDLLIMPEXP_DATA_CORE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-26 15:06:00 +00:00
Václav Slavík
43c5fff8a8 use 6px as the default wxSizer border in wxGTK to be a little bit closer to GNOME HIG
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-06 10:12:03 +00:00
Václav Slavík
0ba6faaeee added wxRESERVE_SPACE_EVEN_IF_HIDDEN sizer flag that prevents the sizer from changing size if a window is hidden
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-04 12:01:36 +00:00
Václav Slavík
61d34c10ea removed now-unused wxSizer::GetMax/MinWindowSize helpers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-21 14:07:04 +00:00
Václav Slavík
32013b47d6 split wxSizer::Fit() into ComputeFittingWindow/ClientSize() that only does computations and Fit() that applies the result to the window
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-13 21:32:11 +00:00
Paul Cornett
2a818b7a73 initialize m_totalProportion in wxBoxSizer ctor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-12 17:45:41 +00:00
Paul Cornett
956e6c7b9c remove extra semicolon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-20 06:08:17 +00:00
Václav Slavík
f944aec0cf removed SetVirtualSizeHints() and related code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-15 12:07:32 +00:00
Vadim Zeitlin
3d2085a422 don't overload SizeInM{aj,in}orDir() on const/non-const, VC6 has troubles with this as does DMC, so use different names
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-11 12:42:58 +00:00
Robert Roebling
15f7c30516 Added wxWrapSizer (modified patch: [1826950] Wrapping Sizer) from Arne Steinarson
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-08 11:37:17 +00:00
Vadim Zeitlin
b701f995b1 allow using wxSizerFlags with wxSizer methods adding spacers too (patch 1797272)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-19 00:45:31 +00:00
Vadim Zeitlin
86909f4c89 added XRCSIZERITEM() allowing to directly retrieve the sizer from XRC by name (patch 1782080)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-16 10:50:01 +00:00
Václav Slavík
b5dbe15d0b added WXDLLIMPEXP_FWD_FOO macros in addition to WXDLLIMPEXP_FOO for use with forward declarations (in preparation for GCC visibility support)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-07-09 10:09:52 +00:00
Vadim Zeitlin
97800f6618 Many changes/fixes to wxFlexGridSizer implementation (no API changes):
- fix the problems addressed by the patch 1667343:
 * only distribute extra space between growable items, not all space
 * take hidden items and gaps into account for ALL grow mode layout
 * fix rounding errors by allocating the remaining pixels to the last item(s)
- refactor the code to avoid duplication between row/column cases
- use STL-like wxList methods instead of compatibility ones


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-22 19:20:14 +00:00
Vadim Zeitlin
8906471733 distribute only the extra, free, space according to the items proportions in wxBoxSizer and not the entire available space
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-22 12:50:01 +00:00
Vadim Zeitlin
57d7f9888e added wxAPPLY and wxCLOSE flags to CreateStdDialogButtonSizer() (Marcin Wojdyr)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-14 13:17:06 +00:00
Vadim Zeitlin
4dd10327d2 added wxSizerItem::AssignXXX() methods replacing the old SetXXX() but freeing the current item contents (modified patch 1687785)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-30 19:57:23 +00:00
Vadim Zeitlin
c1dc9f8394 removed WXWIN_COMPATIBILITY_2_4 from common and wxMSW files (patch 1675546)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-07 11:35:04 +00:00
Vadim Zeitlin
f9b5691a1b added const overload of GetChildren()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44414 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-02-08 14:27:25 +00:00
Vadim Zeitlin
a56a1234a5 removed wxABI_TESTS, they're irrelvant in 2.9
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-31 03:40:59 +00:00
Vadim Zeitlin
ccee328e0b Added wxSizerFlags::Top() and Bottom()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44331 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-31 03:26:31 +00:00
Vadim Zeitlin
d95527de9a added wxSizerFlags::Shaped() and FixedMinSize() methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-14 16:52:55 +00:00
Vadim Zeitlin
98018a4b05 limit TLW size to display size in wxSizer::Fit() instead of doing it in wxTLW::GetMaxSize(), this allows creating or manually resizing TLWs to be larger than the display while still avoiding making them too big by default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-23 17:50:52 +00:00
Włodzimierz Skiba
ce7208d49d Minor header cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-30 11:56:12 +00:00
Paul Cornett
50961a3571 and more inlines called before defined
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-11 02:41:07 +00:00
Vadim Zeitlin
97ebfd549b added more helper functions for setting borders in wxSizerFlags
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-09 21:11:37 +00:00
Vadim Zeitlin
2be7beda2d added wxSizerFlags::GetDefaultBorder()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-09 19:32:46 +00:00
Vadim Zeitlin
d3c7fc996a mark all dtors which are virtual because base class dtor is virtual explicitly virtual themselves
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-05 20:47:48 +00:00