AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
50,714 Commits 1 Branch 0 Tags 297 MiB
fc4e23d7c1
Commit Graph

56 Commits

Author SHA1 Message Date
Vadim Zeitlin
175363f6b8 Implement wxBookCtrlBase::CalcSizeFromPage() in the base class. 
The definition of this method was needlessly duplicated in all of
wx{Choice,List,Tool,Tree}book and in all of them except the first one it
didn't account correctly for the case when the size of the controller was
greater than the size of the page.

Avoid the duplication and fix the best size determination in such case by
providing a single, correct version of the function in the base class itself.

Closes #11793.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-03-05 23:55:19 +00:00
Vadim Zeitlin
1d2b7f06a3 No changes, just remove redundant GetControllerSize() definitions. 
For some reasons wxBookCtrlBase::GetControllerSize() was redefined in several
derived classes even though it did exactly the same thing in all of them.

Leave only the base class version and remove the other ones.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-03-05 23:55:09 +00:00
Julian Smart
95835bc453 Made DoSize and GetPageRect virtual for easier derivation without duplicating a lot of code 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-13 09:22:23 +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
Vadim Zeitlin
3c77890141 add more flexible and safer template Connect() overloads (#10000) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-12 14:26:13 +00:00
Vadim Zeitlin
3e97a90518 use a single wxBookCtrlEvent class for all wxBookCtrlBase-derived controls (#9667) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-08-01 13:46:46 +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
Vadim Zeitlin
3056dddc54 remove the unnecessary non-const GetPage() overload 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-01-22 19:31:10 +00:00
Julian Smart
dc797d8e1b More border rationalisation. GetDefaultBorder is now mostly defined in base class files. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-11-13 12:10:34 +00:00
Julian Smart
a047aff270 Added wxBORDER_THEME, wxWindow::GetDefaultBorderForControl(), wxWindow::CanApplyThemeBorder(). 
wxTextCtrl and wxSearchCtrl now get the correct border on wxMSW, and the wxRichTextCtrl sample
also now demonstrates correct borders.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-08-07 19:22:43 +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
3368424ae8 don't accept focus in book control itself 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-03-25 22:55:35 +00:00
Vadim Zeitlin
e8a147a6c3 invalidate best size of the book controller too when the pages are added/removed, this fixes a lot of sizing problems with treebook 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-04 12:20:09 +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
Vadim Zeitlin
73a0b98c1b define bookctrl (and -derived) classes flags in their headers instead of defs.h; don't deprecate the control-specific flags 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-20 11:32:30 +00:00
Vadim Zeitlin
deb325e3b2 avoid conflict between wxBookCtrlBase::DoSetSelection() and the derived classes; refactor more common code into the base class 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-09 21:29:12 +00:00
Vadim Zeitlin
1d6fcbcc70 added wxBookCtrl::ChangeSelection() which is the same as SetSelection() but doesn't send the page change events (second part of patch 1553551) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-08 17:37:23 +00:00
Włodzimierz Skiba
f41cf3716e BookCtrl event handler added to default book layer. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-04 09:33:52 +00:00
Vadim Zeitlin
e71c530e03 added HasMultiplePages() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-07-28 23:46:32 +00:00
Włodzimierz Skiba
9804d5404a wxNB_HITTEST_* flags renamed to wxBK_HITTEST_* to serve all book controls. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-07-05 12:21:13 +00:00
Julian Smart
90f9b8ef0c Reverted last wxBookCtrl change and added alignment check to notebook 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-06-06 12:53:31 +00:00
Julian Smart
926395e16b Each book control should say what its default orientation. Use this info 
if no alignment style, otherwise assertion will happen in GetPageRect.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-06-06 11:05:22 +00:00
Vadim Zeitlin
a18c21f000 show help for the page under mouse when the [?] button is used to request help 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-26 02:23:24 +00:00
Vadim Zeitlin
851b88c310 moved wxNotebook::HitTest() to the base book control class; implemented it for wxList/Treebook 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-26 02:09:44 +00:00
Włodzimierz Skiba
e0d5d9af8b All book controls shares wxBK_* flags [bug #1469980]. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-13 18:24:38 +00:00
Julian Smart
87cf52d8ac On screens with restricted space, it's useful to be able to add controls 
to e.g. the wxChoice control of a wxChoicebook. GetControlSizer
allows an app to do that, and we also add a control margin which
may or may not be respected by individual book controls.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-13 14:22:32 +00:00
Włodzimierz Skiba
a5325ad672 Back to 'unsigned int' after reasearch of 'size_t' problems. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-03-24 07:51:55 +00:00
Włodzimierz Skiba
05fd6a8b82 More size_t in interface. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-03-15 18:46:24 +00:00
Julian Smart
da817fa6eb Changed function to SetFitToCurrentPage 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-02-06 17:51:11 +00:00
Julian Smart
93bfe54527 Introduced the ability to size a book control based on the currently selected page 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-01-31 13:51:33 +00:00
Julian Smart
233387bdcb Separated out book control sizing code 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-01-30 15:19:48 +00:00
Vadim Zeitlin
b2f8e75a0a add Clone() to wxXXXbookEvent and copy ctor to wxBookCtrlBaseEvent 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36147 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-11-10 11:24:19 +00:00
Włodzimierz Skiba
d8fd7acb8b Unified flags for orienting wxBookCtrls (with backward compatibility). Centralised code for sizing internals. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-10-21 18:53:51 +00:00
Włodzimierz Skiba
159e6235b2 Set/get for internal border in book based controls. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-10-18 12:31:11 +00:00
Vadim Zeitlin
eca15c0d54 Added wxTreebook: 
- added the control itself
- added protected wxBookCtrlBase::AllowNullPage() to accommodate it
- big changes to the sample to get rid of (most) ugly macros
- added XRC handler for the control
- added docs
- and wxUSE_TREEBOOK everywhere


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-10-09 18:40:36 +00:00
Vadim Zeitlin
97c58531bf made GetPage() not virtual because it doesn't need to be virtual and this allows to have const overload of it 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-10-09 17:26:09 +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
c3732409ac simplifications and corrections to background drawing: 
1. removed ApplyParentThemeBackground() not used any longer
2. removed ProvidesBackground() which is synonymous with
   !HasTransparentBackground()
3. removed a whole bunch of unused MSWXXX() methods
4. moved MSWControlColor() from wxWindow up to wxControl

results:

1. the gradient is still shown properly for static/radio boxes in notebooks
2. correct background colour is used for the static boxes
3. code is shorter and better commented


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-04-10 15:23:08 +00:00
Włodzimierz Skiba
311131d369 Apart smartphones use choicebook when notebook is not available (like testing smartphone layout using desktop build). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-03-10 19:22:46 +00:00
Vadim Zeitlin
4cc4e7b6cc moved ProvidesBackground() from wxUniv to base wxWindow class; use it to prevent inheriting background brush beyond the windows which normally have their own background 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-12-19 20:51:06 +00:00
Włodzimierz Skiba
86a9d44545 Include fix. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-11-29 12:44:11 +00:00
Dimitri Schoolwerth
36b79d445d fixed #includes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-11-23 12:53:57 +00:00
Włodzimierz Skiba
1af34108c4 wxCHB<->wxNB flags switch fix. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-11-23 12:02:15 +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
Vadim Zeitlin
21db32c129 added GetCurrentPage() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-11-19 18:57:53 +00:00
Włodzimierz Skiba
1f30c17645 wx(Choice/List/Note)book controls send CHANG(ED/ING) events in SetSelection. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-09-23 12:43:10 +00:00
Robin Dunn
37144cf0f1 Invalidate notebook best size when pages are added or removed 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-07-03 15:49:29 +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
6457949e5c Book controls also shouldn't do anything for SetInitialBestSize 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-05-04 00:53:19 +00:00