Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
51,272 Commits 1 Branch 330 Tags
4e8d90a7ce7889c729193b1ad5e10c357ff9569f
Commit Graph

104 Commits

Author SHA1 Message Date
Julian Smart
4e8d90a7ce Respect wxUSE_MENUS in toolbar base classes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-07-08 17:35:04 +00:00
Vadim Zeitlin
88046bdac5 No changes, just fix a typo in and rephrase a comment. 
Comment in wxToolBarBase::Realize() was probably copied from some
port-specific file but didn't make sense any more in common code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-12-26 16:36:26 +00:00
Vadim Zeitlin
cc26010927 Add support for stretchable spaces to wxToolBar. 
Stretchable spaces consume all extra toolbar space not allocated to the fixed
size items. They can in particular be used to right-align (some) toolbar tools.

Add and document the new API, change the sample to show it and implement it
for MSW, GTK and OS X/Cocoa.

Also refactor MSW background erasing/repainting code to avoid duplicated calls
to DrawThemeBackground(), call it from a new helper MSWEraseRect() function.

Note that we may want to add support for "invisible" separators, IOW
non-stretchable spaces. This could be easily done for MSW after the changes in
this commit and is supported natively by GTK+ and Cocoa so implementing this
would be trivial if there is any interest.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-12-10 03:04:19 +00:00
Vadim Zeitlin
2600776164 No changes, just slightly simplify the tool insertion code. 
Added a helper DoInsertNewTool() function to avoid code duplication and ensure
that we never forget to delete a new tool if inserting it into the toolbar
failed.

Also explicitly document that the tool passed to the public InsertTool() is
not owned by the toolbar and so must be deleted by the caller if its insertion
failed.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-12-10 02:59:02 +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
Vadim Zeitlin
bb2212e6c4 adjust the toolbar tools bitmap size to fit the biggest bitmap used under wxOSX too, not only under MSW (and moved the code doing it to the common base class to avoid duplicating it) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-06-23 10:21:18 +00:00
Vadim Zeitlin
8a012034c8 use HandleWindowEvent() instead of ProcessEvent() to avoid crashes if the toolbar left click handler throws under wxGTK 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-29 16:27:21 +00:00
Vadim Zeitlin
d3b9f782ef don't use annoying and unneeded in C++ casts of NULL to "T *" in all other files neither 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-01-19 13:55:27 +00:00
Vadim Zeitlin
74c80fe40b don't waste time sending out update UI events for separators, they can't be updated anyhow 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-09-21 13:05:56 +00:00
Vadim Zeitlin
1be45608e7 Several fixes for removing/readding controls to the toolbar: 
1. Don't destroy the control in wxToolBar::RemoveTool() as this prevents
   it from being added back with is the purpose of using RemoveTool() rather
   than DeleteTool().

2. Call wxToolBarTool::Attach/Detach() from the base code, not just from wxMSW
   and wxMac (wasn't called by wxGTK at all).

3. Allow adding back the removed control tool in wxGTK.

4. Add test for removing/adding back a control tool to the sample.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-03-27 00:10:19 +00:00
Francesco Montorsi
25af884d93 fix header files so that they can be included directly without generating 'undefined reference' errors 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-03-20 18:11:26 +00:00
Vadim Zeitlin
a9a0ceca5b added support for drop down toolbar buttons (patch 1713470) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-05-11 23:35:49 +00:00
Vadim Zeitlin
6d99eb3e37 Undid last commit and restored bool argument to wxFrame::DoGiveHelp() as 
removing it could silently break existing user code overriding this function.

Fix the problem with not restoring the original status bar text when the mouse
pointer left the toolbar by simply calling DoGiveHelp() with false as second
parameter only if there was no valid tool under mouse, not if the help string
(for a valid tool) was empty.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-04-03 18:04:44 +00:00
Vadim Zeitlin
fa36fe3680 removed second parameter of wxFrame::DoGiveHelp(), the help string is always shown (even if it's empty), not hidden; this hopefully really fixes restoring the previously shown status bar text when the menu is dismissed 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-04-02 22:00:52 +00:00
Vadim Zeitlin
cdb11cb99e added labels support for toolbar controls for wxMac and wxMSW (modified patch 1613603) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-03-18 23:13:18 +00:00
Vadim Zeitlin
632e5b636d don't waste time updating state of tools in a hidden toolbar (patch 1612415) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-03-16 02:30:35 +00:00
Vadim Zeitlin
9ac4391323 wxCreateGreyedImage() deprecated, use wxImage::ConvertToGreyscale() directly instead 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-03-04 20:57:46 +00:00
Vadim Zeitlin
d408730ce4 ensure that wxToolBar has one of wxTB_TOP/LEFT/RIGHT/BOTTOM styles set, otherwise the latest toolbar positioning code breaks down 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-31 13:09:08 +00:00
Włodzimierz Skiba
155ecd4c42 Include wx/image.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-07-03 19:02:54 +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
76b49cf49b Include wx/frame.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-05 08:10:55 +00:00
Robin Dunn
a3e9caa2b5 Fix for Bug #1432054: ToolBar controls not removed by ClearTools 
Use DeleteTool in ClearTools instead of just destroying the internal
list, so the toolbar is kept fully in sync with the removal of all
tool types.  Also fix wxMSW version to actually Destroy() the controls
when they are deleted from the toolbar.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-02-16 03:03:43 +00:00
Mattia Barbon
dee1a63ff5 Removed WXWIN_COMPATIBILITY_2_2 together with code guarded by it. 
Changed default for WXWIN_COMPATIBILITY_2_4 to 0.
  Added WXWIN_COMPATIBILITY_2_6 (defaults to 1).
  Ran build/update-setup-h.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-10-09 15:48:42 +00:00
Vadim Zeitlin
4e115ed2c7 fixed variable shadowing icc warnings 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-09-26 00:29:42 +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
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
Julian Smart
3103e8a97e Typo correction patch [ 1208110 ] Lots of typo corrections 
Olly Betts


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-05-31 09:20:43 +00:00
Julian Smart
b2e3be1c69 wxFrameBase doesn't have wxRTTI so don't test for it, or 
wxDynamicCast (for example) will erroneously succeed and
return the wrong cast object


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-04-12 07:33:20 +00:00
Vadim Zeitlin
434c6c9fa0 changed wxCreateGreyedImage() to respect the original image mask 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-04-02 21:34:29 +00:00
Vadim Zeitlin
062b84dd49 use image mask colour if any instead of guessing that (0, 0) is always transparent in wxCreateGreyedImage() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-03-27 18:00:58 +00:00
Robert Roebling
7b3eaf8fd1 Initialized vars to something in wxToolBarBase. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-03-25 13:36:37 +00:00
Włodzimierz Skiba
525d858363 Last .empty() string source cleaning before 2.5.4. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-02-02 13:57:02 +00:00
Włodzimierz Skiba
b4efc9b931 Old API clearly deprecated. Source cleaning. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-01-06 12:41:27 +00:00
Włodzimierz Skiba
1b941f2d31 Warning fixes for OpenWatcom. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-10-18 05:56:07 +00:00
Vadim Zeitlin
2ab822146c reset parent frame tool/status bar pointer automatically when the bar is destroyed; this ensures that we're never left with dangling pointers and fixes a crash under Mac when MDI child frame with a toolbar is closed 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-10-16 20:25:39 +00:00
Włodzimierz Skiba
326a37f148 Fix to the crash in all MSW/OpenWatcom apps using toolbars. wxString() in A?B:C is not a good idea. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-10-14 17:27:33 +00:00
Robin Dunn
214b94848a Fix from Jed Burgess that correctly untoggles radio toolbar items when 
another one in the same group is selected.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-09-23 22:39:24 +00:00
Włodzimierz Skiba
cb719f2e29 Source cleaning: whitespaces, tabs, -1/wxID_ANY/wxNOT_FOUND/wxDefaultCoord, TRUE/true, FALSE/false, !!/!IsEmpty(). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-09-23 18:20:56 +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
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
Robert Roebling
5ce61d9fd2 Don't do toolbar and menu UI updates if 
the owning frame or TLW is about to
    get deleted anyway.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-02-20 22:32:00 +00:00
Robert Roebling
fe5d86ed04 Don't update toolbar UI if the parent will 
get destroyed later anyway.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-02-19 23:13:01 +00:00
Julian Smart
ae29146343 Reverted bad fix. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-01-11 17:38:11 +00:00
Julian Smart
d3d0974f0f Applied patch [ 850483 ] Toolbar bugfix (Mac) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2004-01-11 16:42:47 +00:00
Robin Dunn
d6071228a9 wxPython needs wxRTTI info for wxToolBarToolBase in order to return 
objects of the right type.  Also made FindById public.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-12-17 21:12:36 +00:00
Vadim Zeitlin
331c9f56a4 fixes to radio button handling (patch 803360) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-09-27 11:43:01 +00:00
Václav Slavík
14f355c2b5 added support for gcc precompiled headers 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-08-09 12:46:53 +00:00
Vadim Zeitlin
fc7a2a602b undisable many warnings for VC++ in defs.h and fixed several thousands of them in the sources 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-07-22 00:24:07 +00:00
Mattia Barbon
222ed1d678 STL-ification patch for wxMSW and wxGTK. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2003-07-10 19:55:12 +00:00