Commit Graph

101 Commits

Author SHA1 Message Date
Vadim Zeitlin
355ce7adea Rename wxEllipsizeFlags elements to avoid confusion with wxEllipsizeMode.
We shouldn't use the same "wxELLIPSIZE_" prefix for two different enums, so
use wxELLIPSIZE_FLAGS one for wxEllipsizeFlags (they should be used less often
than wxEllipsizeMode so it's better to keep the short prefix for the latter).

Also add wxELLIPSIZE_FLAGS_NONE flag.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-10-16 21:32:51 +00:00
Vadim Zeitlin
03647350fc No changes, just removed hard tabs and trailing white space.
This commit is huge but there are no non-white-space changes in it.

Some files containing third-party sources (src/msw/wince/time.cpp,
src/x11/pango*.cpp) were left unchanged.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-08-21 10:41:26 +00:00
Vadim Zeitlin
6cf6897100 Don't pop explicitly changed status messages.
Calls to SetStatusText() in between Push/PopStatusText() were simply lost
before, now the text explicitly changed by SetStatusText() is preserved by the
next call to PopStatusText().

This required adding a new virtual method, called DoUpdateStatusText(), which
is now implemented in all the derived classes instead of overriding
SetStatusText() (on the bright side, it doesn't need to do any checks already
done in the base class any more).

Also fix PushStatusText() to actually show the text being pushed at all under
wxMSW as a side effect.

And further reduce code duplication between wxStatusBarBase and the derived
classes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-08-06 00:01:43 +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
Francesco Montorsi
c4c178c10d use wxSTB_ as prefix for wxStatusBar styles; add support for wxSTB_ELLIPSIZE_* flags under wxGTK; support wxSTB_SHOW_TIPS even if no ellipsization mode is active; update the sample to allow the user to choose the wxStatusBar style dynamically
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-04-25 12:59:09 +00:00
Francesco Montorsi
2d0a9aa49c build fix for wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-04-21 12:18:41 +00:00
Francesco Montorsi
c94bdf2a19 implement tooltips for wxStatusBar panes whose contents were ellipsized; introduce wxST_SHOW_TIPS and wxST_DEFAULT_STYLE styles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-04-21 11:10:44 +00:00
Francesco Montorsi
b31eaa5c34 make wxStatusBarPane a 'full class' with getters and protected data; document it; provide more accessors in wxStatusBar (closes #10574)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-03-15 17:54:05 +00:00
Francesco Montorsi
0cd159592e save the current status text for each pane inside wxStatusBarPane: native controls now store the (eventually) ellipsized version of the string; remove code for managing the status strings currently inside the [native|generic] control; add ellipsization support under wxMSW; now that all SetFieldsCount() implementation rrely on wxStatusBarBase::SetFieldsCount document how it behaves when adding new panes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-09 00:33:19 +00:00
Paul Cornett
c34d2f356b non-pch build fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-08 20:54:48 +00:00
Francesco Montorsi
ba4589db1d optimize rendering code by calling GetClientSize(), GetTextExtent() and CalculateAbsWidth() only when strictly needed; update cache from an OnSize() event handler; fix RTL code: wxDC::DrawText() is RTL-aware itself and doesn't need special calculations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-08 19:17:07 +00:00
Francesco Montorsi
78612fa68f use Ellipsize() in wxStatusBarGeneric so that the text is correctly ellipsized when exceeding field width; avoid that text overlaps the size grip
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-08 13:30:40 +00:00
Francesco Montorsi
9a6aafe003 no real change: put event handlers together at the end of the file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-07 14:11:33 +00:00
Francesco Montorsi
54e18afcca allow the user to pass NULL for the status widths; this was a feature supported by generic and MSW status bar but was not documented; document it; add menu item in the statbar sample for testing it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-31 17:07:30 +00:00
Francesco Montorsi
7b6fefbed1 get rid of the wxListString class in wxStatusBar code; introduce a wxStatusBarPane class which enormously simplifies the code handling stacks/widths/styles of panes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57686 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-31 12:28:05 +00:00
Paul Cornett
04ee05f92a fix a huge number of build errors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-17 18:26:00 +00:00
Vadim Zeitlin
ba959d4c98 don't hardcode grey/white colours for non-MSW/Mac in InitColours(), use wxSystemSettings for all ports (even if some of them, such as wxGTK, still hardcode white for wxSYS_COLOUR_3DHILIGHT) (replaces patch 1883386)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-09 15:10:13 +00:00
Stefan Neis
38400bb46b Fixed OS/2 compilation after wxDC changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-19 21:15:03 +00:00
Vadim Zeitlin
a0125cfc1a another PCH-less build fix after last change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-19 13:19:52 +00:00
Vadim Zeitlin
7422d7c442 don't show size grip if the window the status bar is attached to is maximized or not resizeable at all
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-18 23:31:48 +00:00
Paul Cornett
08f53168ac New "pizza" widget implementation. Window border widths now match the GtkStyle they are drawn with.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-06 18:14:15 +00:00
Robert Roebling
01399dcd57 Compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-05 10:01:32 +00:00
Stefan Csomor
8168167976 avoiding nesting dcs on the same window concurrently
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-20 11:01:50 +00:00
Robert Roebling
fc2d420900 Make status bar grip move to the left in RTL.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-14 14:36:18 +00:00
Paul Cornett
53b6d7a298 Always use wxFULL_REPAINT_ON_RESIZE for generic status bar.
Remove undocumented generic status bar ctor/Create.
Bring status bar ctor/Create into sync with docs.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-06 17:36:22 +00:00
Vadim Zeitlin
e5e0c72763 call Update() from SetStatusText() to ensure that the message is shown to the user immediately
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-27 15:13:36 +00:00
Włodzimierz Skiba
3304646d06 Include wx/statusbr.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-09 09:51:39 +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
Paul Cornett
b0fa218726 use stock pens/colors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-27 04:45:13 +00:00
Robert Roebling
daa85e93c4 Compile fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38896 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-24 19:17:26 +00:00
Michael Wetherell
8d7eaf9140 Warning fixes for VC5 (Igor Korot)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 12:16:56 +00:00
Włodzimierz Skiba
9b5f189564 Include order is wxprec.h=>defs.h=>platform.h=>setup.h so remove explicit setup.h inclusion not touched by chckconf.h.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-26 16:02:02 +00:00
Włodzimierz Skiba
a71d815bbe __WIN95__ removed (used to differ win3.1 vs. 'modern' 95 look, nowadays always defined for WXMSW so useless). Minor cleanings and corrections for correct #includes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-19 10:47:44 +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
Włodzimierz Skiba
48f7ffbe93 First part of '[ 1216148 ] cleanup: unused variables and declarations'.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-07 19:01:45 +00:00
David Webster
18ed8e0032 Unicode fixes for OS/2 (all inside #ifdef __WXPM__ blocks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-27 01:17:45 +00:00
Julian Smart
b8387e0450 Cleaned up commented-out code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-19 13:45:01 +00:00
Julian Smart
2841cdd89b Don't remove generic status bar from parent, since it can be used on
arbitrary windows.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-18 22:07:47 +00:00
Julian Smart
387d96cc8f Commented out SetFont(wxNullFont) which causes an assertion on Windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-14 10:16:24 +00:00
Dimitri Schoolwerth
d64b1c760b invalidate field-width cache before refreshing (Mac redraws immediately)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-24 01:33:15 +00:00
Dimitri Schoolwerth
f9a961e1ae invalidate field-width cache when changing field count
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-23 22:27:11 +00:00
Vadim Zeitlin
c2919ab326 added status bar fields styles support (patch 988292)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28480 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-25 16:13:52 +00:00
Włodzimierz Skiba
422d0ff0be wxDefaultSize.* and wxDefaultPosition.* to wxDefaultCoord.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-20 10:09:47 +00:00
Václav Slavík
0ac21dde62 no need to update default colours and refresh if syscolours change, wxWindow does it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-23 16:41:40 +00:00
Václav Slavík
1ca21594f7 don't explicitly set font and bg colour
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-19 22:39:05 +00:00
Włodzimierz Skiba
ca65c0440a Code cleaning: wxID_ANY, wxDefaultSize, wxDefaultPosition, true, false, wxEmptyString, tabs and white spaces.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-17 16:22:36 +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
595a949307 wxStatusBarGeneric::DoGetBestSize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-04-07 21:48:24 +00:00
Julian Smart
87ff599d25 Don't refresh statusbar field if the text is identical
(removes flicker)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-07 15:22:28 +00:00