Commit Graph

257 Commits

Author SHA1 Message Date
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
2003d0037f fix placement of wxStaticBox contents also under wxMSW, when using the (new) approach (i.e. when creating wxStaticBox contents as children of the staticbox itself, instead of as siblings)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-03 22:27:48 +00:00
Francesco Montorsi
f25f6620e6 fix for placement of wxStaticBox childrens (which doesn't affect the placement of the siblings) when using wxStaticBoxSizer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-01 15:28:58 +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
Vadim Zeitlin
4b6a582bef replace more __WXDEBUG__ occurrences with wxDEBUG_LEVEL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-22 12:53:48 +00:00
Vadim Zeitlin
997e8e2979 take into account the width of the static box label in wxStaticBoxSizer minimal size computation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-08 15:59:23 +00:00
Vadim Zeitlin
2d5fccc60b no changes, just removed unnecessary GetStaticBoxBorders() function
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-08 15:54:08 +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
4e4e06e349 postpone the check for the validity of growable rows/columns indices until we know the total number of items in the sizer (closes #10294)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-25 21:01:19 +00:00
Robert Roebling
6143d648c8 Add space all around std buttons as per Apple HIG (and as the comment in the code says but the code didn't do)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-03 10:42:34 +00:00
Robert Roebling
c084a1ac06 Enable the correct code making sure that subwindows will always receive a wxSizeEvent and can then relayout themselves
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-01 21:33:07 +00:00
Robert Roebling
491bb4ba78 Disable wxSIZE_FORCE_EVENT and demonstrate its bug in the wxCollapsiblePane sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-31 19:15:25 +00:00
Robert Roebling
7499628f59 Explain reasoning behind using wxSIZE_FORCE_EVENT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-30 23:23:31 +00:00
Robert Roebling
e47e063af2 Add wxSIZE_FORCE_EVENT and use is from wxSizerItem::SetDimension
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-30 20:10:44 +00:00
Robert Roebling
1a27a87d53 Only test for centre flag of minor direction and ignore the other in wxBoxSizer (as before)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-25 22:05:29 +00:00
Vadim Zeitlin
636a53b35f correct the direction of the comparison between the number of columns/rows and the number of items (#10294)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57521 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-24 00:35:53 +00:00
Vadim Zeitlin
2283800b2e verify that we don't have more items than our number of rows/columns allows (See #10294)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-23 00:21:29 +00:00
Vadim Zeitlin
6115b1b5d9 don't leave nrows/ncols uninitialized in wxGridSizer::CalcRowsCols()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-15 09:49:57 +00:00
Vadim Zeitlin
5fa51d09eb don't compute the columns/rows from the number of items if both were explicitly set by user
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-13 12:26:27 +00:00
Vadim Zeitlin
324dc1f2d8 correct the check added in r57175 to use dynamically computed numbers of rows/columns
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-08 08:39:13 +00:00
Vadim Zeitlin
ef52f19e6a check index validity in AddGrowable{Row,Col}()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-07 23:33:46 +00:00
Paul Cornett
b7bc9d806b cleanup: unreachable code, unused variables, indentation, etc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-16 18:20:46 +00:00
Vadim Zeitlin
ec07419336 don't distribute negative extra space among box sizer items, this isn't useful as it results in overlapping windows (#10008)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-10-01 13:57:53 +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
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
Václav Slavík
df44dcedaa added macros for checking for conflicts between flags values; use it in wxSizer code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-04 12:03:02 +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
428c07c0f8 fixed wxSizer::SetSizeHints() to allow setting smaller size than before (e.g. when wxCollapsiblePane collapses)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-14 13:41:56 +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
Václav Slavík
77fe7204b5 use ClientToWindowSize/WindowToClientSize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-12 15:53:35 +00:00
Václav Slavík
7e7bc14b51 eliminate code duplication in wxSizer::Fit()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-01 23:14:45 +00:00
Václav Slavík
02dc0099cb fixed RR's change of wxSizer::Fit to set client size (r50717) to not be completely broken; it no longer confuses client and window sizes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-01 22:28:10 +00:00
Robert Roebling
c30199bfdd wxSizer::Fit() now sets client size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-13 13:08:30 +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
Chris Elliott
82287aae32 another VC6 fix; i reused inside for
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-09 21:53:46 +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
Julian Smart
9e967d5417 Moved desktop margin options to a more sensible place
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-06 10:52:14 +00:00
Julian Smart
3ed6c6f4ac Added sizer.desktopmargin.x, sizer.desktopmargin.y options to allow for desktop decorations in wxSizer::Fit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-06 09:42:28 +00:00
Chris Elliott
653d72b33b another DMC build fix http://www.digitalmars.com/pnews/read.php?server=news.digitalmars.com&group=c++.beta&artnum=684
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-27 13:24:29 +00:00
Vadim Zeitlin
74ab5f5b9d various warning fixes for icc 9.1 compilation
- variable shadowing
- unused code and variables
- extra semicolons


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-09-21 12:00:25 +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
Julian Smart
e6cfcc0df2 Applied patch [ 1776951 ] wxSizer::GetContainingWindow fails for nested sizers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-08-21 14:08:26 +00:00
Vadim Zeitlin
cc67d082f7 deal correctly with having too few items in wxFlexGridSizer (this is not an error, more items could be added later): don't crash and don't assert
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-25 01:19:17 +00:00
Vadim Zeitlin
7fca7a731d don't leave pixels due to rounding errors in wxBoxSizer, allocate the extra pixels to the last item(s) instead, as wxFlexGridSizer (now) does
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-22 19:32:38 +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
b9a325a19f don't leave gaps around hidden columns/rows in wxFlexGridSizer (closes bug 1659872; part of patch 1667343)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-22 15:14:36 +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