Commit Graph

169 Commits

Author SHA1 Message Date
Vadim Zeitlin
d44444105b simplified code (removed 2 unnecessary tests) in CalcMin(), no real changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-14 22:26:56 +00:00
Julian Smart
23b1018f14 Improve standard button spacing on Windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-14 22:24:09 +00:00
Vadim Zeitlin
5dd070c25b extracted platform-specific code to determine static box borders to wxStaticBox::GetBordersForSizer()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-07 23:37:15 +00:00
Robin Dunn
718903fe64 wxStdButtonSizer Finalise --> Realize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32146 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-18 17:49:03 +00:00
Włodzimierz Skiba
c47addef10 wxPoint/Size/Rect() causes the same code with (0,0) initialization and is incomparably more readable and clear.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-16 20:34:34 +00:00
Julian Smart
94f5392355 Standard dialogs becoming useable on WinCE.
Make standard button sizer horizontal on WinCE since
vertically it looks atrocious (app will need to reduce
number of buttons if they don't fit)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-16 15:37:09 +00:00
Włodzimierz Skiba
2997ca30d6 Use default constructors for wxSize/Point/Rect.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-10 21:33:56 +00:00
Kevin Ollivier
261ba880dd Added support for wxID_CONTEXT_HELP to wxStdDialogButtonSizer.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-01-30 20:56:43 +00:00
Vadim Zeitlin
6c1635b598 added wxStaticBoxSizer ctor creating a new static box
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-01-21 20:56:39 +00:00
Robin Dunn
53701799b4 Patch [ 1100272 ] wxFlexGridSizer works wrong when some rows/cols are hidden
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-01-11 19:01:22 +00:00
Robert Roebling
efba61bac0 Second try to commit compilo fix for sizer.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-01-06 12:34:23 +00:00
Włodzimierz Skiba
0f769aab09 Build fix for NOPCH.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-01-06 12:04:51 +00:00
Włodzimierz Skiba
974c2a5904 Incomplete (PalmOS) setup compatibility.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-01-03 07:03:31 +00:00
Robert Roebling
b181a50500 Allow to set the various buttons explicitly (and
not through IDs) in the wxStdButtonSizer.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-01-01 17:26:30 +00:00
Robert Roebling
acf2ac3757 Applied modified form of the StdButtonSize patch.
Tested on GTK2, MSW and Mac.
  Adapted various generic dialogs to stretch the
    button sizer so that the buttons don't end
    up centered but right aligned.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-31 18:57:25 +00:00
Włodzimierz Skiba
61c083e781 wxBookCtrl->wxBookCtrlBase. wxBookCtrl is now most suitable book for given platform. Samples adjustement.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-23 11:45:07 +00:00
Włodzimierz Skiba
56eee37fc8 wxSizer::Add/Insert now returns pointer to wxSizerItem added and wxSizerItem contains access to its area [Patch #1042571 with minimal tweaks]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-09 18:33:00 +00:00
Włodzimierz Skiba
9f13661f8b Parts of wxSizer::Show() extracted into wxSizer::GetItem() (together with documentation).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 18:58:52 +00:00
Włodzimierz Skiba
42841dfcad Warning fixes found under hardest mode of OpenWatcom. Seems clean in Borland, MinGW and DMC.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-11 16:30:43 +00:00
Włodzimierz Skiba
d775fa8235 Source cleaning: whitespaces, tabs, -1/wxID_ANY/wxNOT_FOUND/wxDefaultCoord, TRUE/true, FALSE/false.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-22 14:38:52 +00:00
Vadim Zeitlin
ccbc8038e6 added wxSizerItem::Init()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-18 14:29:15 +00:00
Vadim Zeitlin
8e32ea1c8d made all Add/Insert/Prepend methods inline
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-17 15:06:53 +00:00
Vadim Zeitlin
436ae7cf35 forward all wxSizer::Add/Prepend/Insert() to a virtual Insert(wxSizerItem) function, all the others made non virtual
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-17 13:25:20 +00:00
Włodzimierz Skiba
8b2bac626c Recursive wxSizer::Show for subsizer and return value if element was found.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-13 13:46:45 +00:00
Dimitri Schoolwerth
749bb9f129 added shortcut functions AddSpacer and AddStretchSpacer (plus Prepend and Insert variants)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-25 16:37:48 +00:00
Robin Dunn
36461f5811 Fixed incorrect ratio initialization
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-21 19:56:40 +00:00
Robin Dunn
559b747dc0 The gaps should *not* be included in the space given to the item, and
so should also not be accounted for in the alignment adjustmanets


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-30 23:43:02 +00:00
Robin Dunn
ba763a45d8 Optimized sizers to not call CalcMin more often than neccessary
Window items added with wxFIXED_MINSIZE flag will set the window's
minsize to its curent size.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-24 20:13:27 +00:00
Robin Dunn
9f88452895 * Implemented BestSize cache
* Added calls to InvalidateBestSize where things affecting BestSize
  are modified.  There are probably several other places where this
  still needs to be done...

* Added wxWindowBase::GetBestFittingSize that will merge the BestSize
  into the MinSize, (if any) and return the result.

* SetBestFittingSize will now only set the MinSize to the value that
  was passed to it, without merging in the BestSize


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-24 20:09:45 +00:00
Václav Slavík
adbf2d732f deprecated wxBookCtrlSizer and wxNotebookSizer, they are no longer needed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-24 11:58:06 +00:00
Robin Dunn
fda5e7a16e Only call GetBestSize if one or both of the minsize components are unset.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-08 16:33:47 +00:00
Julian Smart
655719367a Use old licence name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 20:53:33 +00:00
Julian Smart
77ffb5937e Name and version changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 14:56:36 +00:00
Robin Dunn
89a94520ea Take the hgap and vgap into account when doing alignments in grid
sizers.  The gap is not part of the "cell" so alignments should be
relative to the edge of the gap, not the next cell.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-13 19:12:06 +00:00
Robin Dunn
093475d267 Instead of using GetAdjustedBestSize use the minsize if there is one,
otherwise use GetBestSize.  This allows for situations where the
minsize is smaller than the bestsize (for example, abbreviated state
fields will normally be smaller than the 100px best size for
wxTextCtrls.)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26918 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-22 21:44:29 +00:00
Robin Dunn
77aa9abdc4 Set m_window to NULL after destroying it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-17 22:40:23 +00:00
Vadim Zeitlin
eb2a7883df show/hide static box when the wxStaticBoxSizer is shown/hidden (replaces patch 897020)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-15 22:26:09 +00:00
Robin Dunn
1eba219387 Added wxSizerItem::SetMinSize that calls m_window->SetSizeHints if not
wxFIXED_MINSIZE, SetInitSize and SetItemMinSize uses SetMinSize, and
fixed [ 934651 ] sizeritem's 'minsize' value has no effect in xrc resources


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-14 23:45:21 +00:00
Robin Dunn
f52e0cf489 Changed name to wxFIXED_MINSIZE since that is more descriptive of what
it does.  The size can still be changed by the sizer, but it won't
query the minsize if this flag is set.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-07 23:06:35 +00:00
Robin Dunn
caa251e073 Added wxFIXED_SIZE.
Propogated wxSizer::SetItemMinSize to SetSizeHints for window items.
Updated docs for flag parameter to be more readable and understandable.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-07 19:21:06 +00:00
Vadim Zeitlin
395a82b13f made wxADJUST_MINSIZE default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-29 10:18:38 +00:00
Stefan Csomor
e11d436ba0 merge of new wxMac code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-27 08:11:05 +00:00
Dimitri Schoolwerth
78ca56690e Simplified OS X Panther detection code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-14 02:40:59 +00:00
Stefan Csomor
c54b92d363 system includes instead of user
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-01-20 18:18:48 +00:00
Dimitri Schoolwerth
6702110216 Corrected size of staticbox borders when running OS X Panther or higher.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-12-12 21:04:36 +00:00
Robin Dunn
20b35a6916 Added wxGridBagSizer, a grid sizer where item positions can be
specified and row/col spanning is allowed.

Updated docs, the layout sample, files.bkl, and updated makefiles.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-06 01:31:44 +00:00
Robin Dunn
02319c2458 Prevent possible divide by zero problem
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-19 20:27:11 +00:00
Julian Smart
8d2474f486 Applied patch [ 800183 ] wxFlexGridSizer::RemoveGrowableRow/Col fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 15:57:37 +00:00
Vadim Zeitlin
85e5cfc952 fix redistribution of the extra space between sizer items
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-31 13:29:28 +00:00
Vadim Zeitlin
ccf5c8a88c undid the last change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-31 12:54:48 +00:00