Commit Graph

98 Commits

Author SHA1 Message Date
Václav Slavík
e0a050e347 more changes to make wx compile without implicit wxString->char* conversion (for STL build)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-06-20 07:44:45 +00:00
Vadim Zeitlin
b8ec69e863 use correct background colour for the box label when foreground colour is set (remaining part of patch 1683573)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-22 02:28:06 +00:00
Vadim Zeitlin
441dfa1d99 call GetTextExtent() after selecting the correct font into DC in PaintForeground(), fixes label drawing for non default font sizes (part of patch 1683573)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-22 02:25:25 +00:00
Vadim Zeitlin
95fab76ba0 1. Don't draw our own custom label if we don't have custom foreground colour,
we don't need to do it then as it works just fine by default then

2. Use the theme font for the label (doesn't do anything for the default Luna
   theme but helps a lot with custom themes, unfortunately metrics are still
   wrong with them)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-12-23 22:20:53 +00:00
Paul Cornett
7212d15556 don't include missing.h before windows headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-10 17:37:02 +00:00
Jamie Gadd
ffabb347f9 Fix label positioning when text is LTR.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-20 12:05:49 +00:00
Vadim Zeitlin
cf072997af fix static box label drawing in RTL locale (patch 1552545)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-10 23:39:37 +00:00
Włodzimierz Skiba
57bd4c6031 Include wx/msw/wrap*.h according to pch support (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-07 19:01:45 +00:00
Vadim Zeitlin
32cd189dfc use GetLabelText() instead of wxStripMenuCodes() to avoid stripping the part of the string after TAB
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40331 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-25 18:47:39 +00:00
Jamie Gadd
24e35cf87b Don't handle WM_PRINTCLIENT anymore, manually draw the static box label background instead.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-07-22 17:20:05 +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
f38924e863 Include wx/dcmemory.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-08 07:58:37 +00:00
Jamie Gadd
1d6e57680c Fix bug where labels were multicoloured if their length > box width using XP with a non-default colour.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-23 13:50:39 +00:00
Julian Smart
9f8130d6b3 Must strip menu codes from labels before measuring (fixes bug 1400552)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 16:16:36 +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
cec46079ae Applied patch [ 1292827 ] [wxMSW] nested wxStaticBox fix
Jamie Gadd


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-17 20:27:19 +00:00
Vadim Zeitlin
9705fbe904 moved WM_PRINTCLIENT from wxRadioBox to wxStaticBox to allow using it as parent for other controls (modified patch 1188384)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-22 18:29:14 +00:00
Vadim Zeitlin
72a55896e5 respect label foreground colour for static boxes when using XP themes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-19 00:00:26 +00:00
Robin Dunn
31582e4e11 Patch #1203934: enable best size caching for MSW widgets
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-18 02:23:01 +00:00
Julian Smart
a92e7f3047 WinCE fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-13 11:52:03 +00:00
Julian Smart
5bf4788ae3 Temporary fix (I hope) to allow an application to paint around controls
within static boxes by suspending the flicker reduction fix


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-27 19:21:24 +00:00
Julian Smart
5c17f6d377 Fixed test for button style - styles contain other style bits
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-20 10:34:52 +00:00
Julian Smart
21c6080db7 Regenerated makefiles for runtime lib change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-17 12:58:24 +00:00
Robin Dunn
4249e33407 Don't clip hidden windows from the staticbox's refresh. Also handle
non wxWindows better.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-15 03:00:15 +00:00
Julian Smart
5c2f43f48f Removed unnecessary fix (caused by erroneous user code)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-14 07:26:55 +00:00
Włodzimierz Skiba
72093cd889 WinCE build fix (missing style).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-12 08:13:21 +00:00
Vadim Zeitlin
bcb8ba61c3 fixed MSWGetBgBrush() call, it needs a HWND and not wxWindow * now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33490 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-10 22:12:39 +00:00
Vadim Zeitlin
a83b5b74c3 GetParent() was always used in test for wxHSCROLL checked in in last commit; use the parent window recursively as intended instead; slightly simplified the code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-10 17:55:52 +00:00
Julian Smart
75a2645e11 Hack to make wxStaticBox be repainted when inside a scrolling window
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-10 17:14:58 +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
Vadim Zeitlin
9c2a1d53c0 add extra space for top border when wxDIALOG_UNIT_COMPATIBILITY == 1 too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-05 22:23:50 +00:00
Vadim Zeitlin
f05f427fc1 fixed wxStaticBox::SetBackgroundColour(): this should change background for the label only, not the entire box contents
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-05 21:27:35 +00:00
Vadim Zeitlin
8397b2f7a9 we need to leave some space for static box border even if its label is empty
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-05 21:15:25 +00:00
Julian Smart
9f76970889 Default border for a static box is wxBORDER_NONE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-02 17:30:04 +00:00
Vadim Zeitlin
3b6e5fb3f5 fixes to static box borders calculations and significant code cleanup (finalizes patch 1166587)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-02 01:17:51 +00:00
Julian Smart
54c5498d0f Now calculates clipping region from actual child HWNDs and not
wxWidgets windows, which helps with composite controls


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-01 15:57:19 +00:00
Julian Smart
2f059e30a1 Fixed MSWClipBoxRegion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-31 15:19:14 +00:00
Chris Elliott
a4c46c19c2 missing include for memoryDC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-31 10:37:34 +00:00
Julian Smart
eba99da4c0 Applied patch [ 1166587 ] [wxMSW] Removes all flicker from wxStaticBox
By Jamie Gadd


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-30 15:30:06 +00:00
Vadim Zeitlin
58385af016 fix top margin for static box sizer when wxDIALOG_UNIT_COMPATIBILITY == 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-07 23:41:07 +00:00
Vadim Zeitlin
abf912c5a1 harmless warning fixes for WinCE (mostly unused parameters)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-07 19:26:51 +00:00
Julian Smart
9dabade20b Make HTCLIENT code off by default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-25 08:08:22 +00:00
Julian Smart
6aa0103384 Restored mouse sensitivity for static box and static bitmap
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-24 08:26:50 +00:00
Vadim Zeitlin
8008807eb1 we don't need to use solid colour for background drawing when we're inside notebook any longer, so no need to override MSWGetBgBrushForSelf()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-19 20:50:59 +00:00
Vadim Zeitlin
e31e6ea75d moved styles logic to MSWGetStyle() (no real changes)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-01-15 17:10:34 +00:00
Vadim Zeitlin
301e257baf restored WS_EX_TRANSPARENT as otherwise background can be not drawn at all sometimes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-17 01:27:31 +00:00
Włodzimierz Skiba
3ad70d312e wx/msw/notebook.h needs wx/notebook.h in lack of precompiled headers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-13 18:24:19 +00:00
Vadim Zeitlin
b04093c949 use solid bacgkround for static box as pattern brush can't be properly aligned when it is painted
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-13 00:12:37 +00:00
Vadim Zeitlin
24181682fa don't use WS_EX_TRANSPARENT style, it doesn't seem to help with anything (if it is readded, please make sure to explain why exactly was it needed)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-12 20:27:35 +00:00
Vadim Zeitlin
18342f1993 don't set background colour explicitely; no need to handle WM_ERASEBKGND ourselves now that it is done correctly at wxControl level
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-19 19:55:34 +00:00