Commit Graph

169 Commits

Author SHA1 Message Date
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
Vadim Zeitlin
a50cf60efe don't use deprecated wxSizerItem::SetWindow/Sizer/Spacer(), use AssignXXX() equivalents instead
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-30 20:16:11 +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
Robin Dunn
d9485f89b8 Forward port of my recent changes in the 2.8 branch:
* Force use of floating point math in wxGCDC::DoDrawEllipticArc.

 * Check for 0.5 offset in wxGCDC::DoDrawRoundedRectangle and
   DoDrawEllipse.  Set wxGDIPlusContext to use the offset.

 * Avoid crash in wxStdDialogButtonSizer::Realize if there is no
   negative button.

 * Provide implementations for wxCairoPathData::AddPath,
   wxCairoContext::Clip, wxCairoContext::DrawBitmap,
   wxCairoContext::DrawIcon, and wxCairoContext::GetTextExtent.

 * Fix wxCairoContext::DrawText to draw the text using the upper-left
   corner for the x,y position, not the baseline.

 * Fix wxMacCoreGraphicsRenderer::CreateContext to be able to use a
   wxMemoryDC as the target.

 * Map wxTELETYPE font family on wxMac to a monospace font.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-26 20:08:41 +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
Julian Smart
29392c81aa IsShown shouldn't cause empty sizers to not have their positions calculated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-02-16 22:12:58 +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
Robin Dunn
170acdc90e GetBestFittingSize --> GetEffectiveMinSize
SetBestFittingSize --> SetInitialSize
SetBestSize  --> SetInitialSize
SetInitialBestSize --> SetInitialSize


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-31 08:50:17 +00:00
Paul Cornett
003b64a7ba don't set negative size in wxSizerItem::SetDimension
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-06 03:01:17 +00:00
Michael Wetherell
4107600f20 Missing headers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-04 16:40:08 +00:00
Vadim Zeitlin
978af86426 merge of RTL changes (with many modifications) from SOC2006_RTL branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-04 13:35:13 +00:00
Vadim Zeitlin
ca8d899fcb small cleanup, removed unused headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-04 12:12:24 +00:00
Vadim Zeitlin
e8cfff879e added wxSizer::Get/SetContainingWindow()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-04 12:05:49 +00:00
Robert Roebling
eae0338fcb Commited patch for wxSizer::Replace()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-03 11:48:49 +00:00
Vadim Zeitlin
b3f1734fa0 min size of an empty sizer should be (0, 0) and not (10, 10)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-16 18:29:43 +00:00
Vadim Zeitlin
ca243008b3 remove the item from proportions arrays as well as from m_growableCols/Rows in wxFlexGridSizer::RemoveGrowableCol/Row(); also added an assert in case the item to remove is not growable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-26 00:11:59 +00:00
Włodzimierz Skiba
ed2fbeb835 Include wx/sizer.h and wx/layout.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-08 06:57:39 +00:00
Włodzimierz Skiba
876cd6f7e3 Include wx/statbox.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-31 18:27:51 +00:00
Vadim Zeitlin
649cfca1ce don't include statbox.h from the header, move wxStaticBoxSizer dtor to .cpp file instead
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-29 09:58:53 +00:00
Vadim Zeitlin
e978011a40 delete the associated wxStaticBox in wxStaticBoxSizer dtor (patch 1473769)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-28 17:24:12 +00:00
Włodzimierz Skiba
9eddec696f Include wx/settings.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-24 07:16:32 +00:00
Włodzimierz Skiba
de6185e212 Include wx/utils.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-02 10:39:23 +00:00
Włodzimierz Skiba
f43255e838 No more avoiding wxSizer::Fit in wxWinCE builds.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-30 00:20:54 +00:00
Włodzimierz Skiba
88a7a4e10e Include wx/intl.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-25 14:38:19 +00:00
Vadim Zeitlin
f3190d1cea use #if WXWIN_COMPATIBILITY_2_6 guard around implementation of wxNotebookSizer ctor too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-10 13:04:25 +00:00
Vadim Zeitlin
3abb199dee use #if WXWIN_COMPATIBILITY_2_6 guard around implementation of wxBookCtrlSizer ctor too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-10 12:54:52 +00:00
Włodzimierz Skiba
ca3e85cfa8 Better backward compatibility and deprecation markup for interface deprecated in comments.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-30 14:04:17 +00:00
Vadim Zeitlin
f303d69f93 deprecated wxSizerItem::IsShown() because it doesn't really make sense for the sizers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-08 22:22:51 +00:00
Michael Wetherell
4a10ea8b13 Warning fixes for win64
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-17 22:08:05 +00:00
Vadim Zeitlin
2fb18bf45b use wxIsNullDouble instead of comparing m_ration with 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35714 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-26 00:31:47 +00:00
Vadim Zeitlin
259c43f679 more extra semicolons removed (patch 1303724)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 11:16:57 +00:00
Vadim Zeitlin
fbfb8bcc3f added missing consts and pass objects by const reference instead of by value (patch 1205869)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-24 21:43:15 +00:00
Mart Raudsepp
8907154c1a Nuke #pragma implementation/interface's
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-23 12:56:45 +00:00
Vadim Zeitlin
f166217789 don't assert if kind == Item_None in wxSizerItem::IsShown(), this can happen during windows destruction (bug 1216428)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-17 21:46:20 +00:00
Włodzimierz Skiba
902725eefe Source cleaning inspired by and included in patch '[ 1215450 ] cleanup: unreachable code.'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-06 16:47:04 +00:00
Julian Smart
0f88451561 Lay buttons out on Windows according to conventions. Button spacing is
also reduced to a more reasonable size.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-09 11:43:28 +00:00
Ryan Norton
caa2490c0f Fix memory leak when a spacer is added, and crash when a window is added before wxSizerItem::DeleteWindows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-06 11:39:04 +00:00
David Elliott
3a5910cbe9 Blind bug fix to bug reported by Angel Kry.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-23 05:12:12 +00:00
Vadim Zeitlin
50c06297bd added wxSizerSpacer and modified wxSizerItem to contain a pointer to either
wxWindow, wxSizer or wxSizerSpacer (instead of containing either a pointer or
just wxSize for spacers) and implement IsShown() and Show() by forwarding it
to the appropriate pointer: this means that now you can directly hide/show
windows/sizers/spacers instead of having to pass by containing sizers
Show(child) method


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-17 21:17:38 +00:00