Commit Graph

173 Commits

Author SHA1 Message Date
Vadim Zeitlin
7092b1112e Fix caching of wxFONTSTYLE_SLANT fonts in wxTheFontList in wxMSW
Creating a font with wxFONTSTYLE_SLANT results in a font whose
GetStyle() returned wxFONTSTYLE_ITALIC, so it was never found in the
cache, resulting in, effectively, leaking memory and GDI handles because
each new call to wxFontList::FindOrCreateFont(...wxFONTSTYLE_SLANT)
created a new font.

Fix this by just hardcoding that wxFONTSTYLE_SLANT is wxFONTSTYLE_ITALIC
under MSW, this is ugly but avoids backwards incompatible (and not
obviously correct) change of making wxFont::GetStyle() return
wxFONTSTYLE_SLANT if the font was created using this style.

Notice that wxFont::GetStyle() does behave like this in wxOSX currently,
so there is an inconsistency between ports here. It would arguably be
better to make wxOSX behave like wxMSW because the actual font is really
italic and not slant/oblique and if we do this, the preprocessor
condition in this commit should be extended to cover wxOSX too.

Closes #17903.
2017-07-06 15:01:00 +02:00
Paul Cornett
2585d73204 In FindOrCreateFont(), avoid using family if facenames are specified.
GetFamily() is not reliable in wxGTK. See #17313
2016-01-08 09:56:28 -08:00
Dimitri Schoolwerth
8f8d58d193 Use wx-prefixed macros throughout the repository.
Change {DECLARE,IMPLEMENT}_*CLASS and {DECLARE,BEGIN,END}_EVENT_TABLE
occurrences to use the wx-prefixed version of the macros.
2015-04-23 22:00:35 +04:00
Vadim Zeitlin
01f9accd19 Remove wxPM, wxWidgets port to OS/2.
This port is not used and is not being worked on, so remove it to reduce the
amount of the code which needs to be updated for every global change.

Also remove tests for VisualAge compiler which isn't used since ages.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-15 23:56:58 +00:00
Vadim Zeitlin
bd30752410 Just deprecate but don't schedule for removal wxNORMAL and friends.
Deprecate the use of the old untyped constants but don't schedule them from
removal in a future wx version by removing "#if WXWIN_COMPATIBILITY_3_0" tests
around their definition and use. Provoking deprecation warnings in the code
using these constants is worth it as they are unclear and it's easy to make
mistakes when using them, but breaking this code compilation outright can't be
justified -- even in the future.

Also use more informational wxDEPRECATED_MSG() instead of a simple
wxDEPRECATED() as it might not be obvious at all how should the code be
updated exactly.

Finally, avoid the use of deprecated constants inside the library itself.

As a side effect, this closes #15814.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-01-06 12:42:37 +00:00
Paul Cornett
967a94c91a remove WXWIN_COMPATIBILITY_2_6, add WXWIN_COMPATIBILITY_3_0
closes #15792

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-01-04 20:07:33 +00:00
Vadim Zeitlin
9b31387508 Merge the changes from 3.0 branch.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-11-12 18:06:37 +00:00
Vadim Zeitlin
00dc8bac3c Replace wxFONTFAMILY_DEFAULT with wxFONTFAMILY_SWISS when comparing fonts.
Otherwise comparison always failed as no existing fonts had
wxFONTFAMILY_DEFAULT as their family in all ports except wxOSX, which does
keep wxFONTFAMILY_DEFAULT.

Closes #15410.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-08-16 11:04:39 +00:00
Vadim Zeitlin
3f66f6a5b3 Remove all lines containing cvs/svn "$Id$" keyword.
This keyword is not expanded by Git which means it's not replaced with the
correct revision value in the releases made using git-based scripts and it's
confusing to have lines with unexpanded "$Id$" in the released files. As
expanding them with Git is not that simple (it could be done with git archive
and export-subst attribute) and there are not many benefits in having them in
the first place, just remove all these lines.

If nothing else, this will make an eventual transition to Git simpler.

Closes #14487.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-26 16:02:46 +00:00
Dimitri Schoolwerth
a1b806b982 Replaced Ok() occurrences with IsOk() throughout trunk.
Additionally renamed wxOSX' private wxNativePrinterDC::Ok() function to IsOk().

Didn't deprecate the various Ok() functions: given the amount of changes already introduced in 3.0 a trivial one like this seems more suitable for after 3.0.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 16:29:04 +00:00
Vadim Zeitlin
85a9228394 Make wxSMALL_FONT larger under MSW as it was unreadable otherwise.
The default size of the normal font is 9pt under MSW and 7pt is too small for
wxSMALL_FONT, use 8pt for it instead.

Closes #13104.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-04-26 22:57:33 +00:00
Vadim Zeitlin
ce00f59b5b No changes whatsoever, just remove trailing whitespace.
There are no real changes in this commit but it removes all trailing white
space from our source files. This avoids problems when applying patches and
making diffs and it would be nice to prevent it from reappearing.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 11:44:45 +00:00
Vadim Zeitlin
5276b0a53c Use wxDELETE() and wxDELETEA() when possible.
Use wxDELETE[A]() functions which automatically NULL out their arguments after
deleting them instead of doing it manually.

Closes #9685.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-06-20 18:18:23 +00:00
Francesco Montorsi
a5664fd6ef Increase interoperability between wxPoint and wxRealPoint introducing constructors which convert between the two classes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-06-09 18:03:27 +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
8602802568 add new predefined colour (and relative brush/pen): wxYELLOW (closes #10669)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-09 12:40:09 +00:00
Francesco Montorsi
d818458781 add standard wxBLUE_PEN for coherency with the colours available for standard brushes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-04 16:30:27 +00:00
Francesco Montorsi
41d0b41d68 no change, just add comment about wxTheColourDatabase deletion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-12-28 11:34:30 +00:00
Vadim Zeitlin
5c33522fca replace wx_{const,static,reinterpret}_cast with their standard C++ equivalents
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-02 02:39:52 +00:00
Vadim Zeitlin
d43be80dab use inches2mm instead of literal constant in wxGetDisplayPPI()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-22 16:26:11 +00:00
Václav Slavík
40fcf546f6 added wxGetDisplayPPI() convenience function and wxPrintout::SetPPI*() overloads accepting single wxSize argument
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-21 09:35:49 +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
Francesco Montorsi
777819af7b fix typos and update MSW code to use new wxPENSTYLE_* enum values
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-16 21:36:59 +00:00
Francesco Montorsi
82cddbd97a fix also wxPen to use wxPenStyle,wxPenJoin,wxPenCap enums instead of plain int; remove from wxBrushStyle the styles wxPen-specific; add backward-compatible ctor to wxPen; don't include brush.h and pen.h from gdicmn.h, rather move wxPenList,wxBrushList,wxFontList in the relative headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-16 21:11:12 +00:00
Francesco Montorsi
3e6858cdcb introduce wxBrushStyle enum and replace 'int style' occurrences in wxBrush code with 'wxBrushStyle style'; the change is backward compatible and documented in changes.txt
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-16 16:47:57 +00:00
Vadim Zeitlin
8f884a0dcc Fix Ok/IsOk() mess in wxGDIObject-derived classes; also added
wxGDIObject::Create/CloneGDIRefData() and implemented them for (almost) all
ports


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-15 17:54:20 +00:00
Vadim Zeitlin
b685c0a668 compare colours using their operator==() instead of comparing individual RGB components as this is shorter and more correct for the colours with the same RGB but different alpha components (patch 1832844)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-17 14:24:18 +00:00
Paul Cornett
a76c2f3715 remove extraneous semicolons
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-23 07:27:12 +00:00
Robert Roebling
b0d7707bc4 Use wxPointList instead of wxList in wxDC code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-19 14:53:55 +00:00
Vadim Zeitlin
bc5e942bf3 added wxRect::operator+() and *() (union and intersection); also made other operators friends instead of members (patch 1589175)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-24 01:47:29 +00:00
Vadim Zeitlin
527343602e 1. changed wxIconBundle to use m_refData and COW to make copying icon bundles
fast (which was needed for 2)
2. make it possible to return wxIconBundles from wxArtProvider
3. implement Mac-specific wxArtProvider doing (2)

(modified patch 1581960)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-07 19:59:51 +00:00
Robin Dunn
59571b718e Fix "PINK" to actually be pink, and not lavender
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-26 03:26:57 +00:00
Václav Slavík
22a35096a0 renamed wxRect::Inside() to wxRect::Contains(), wxRect::Inside(wxRect) is too confusing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-13 17:12:25 +00:00
Václav Slavík
5819f832e6 moved IMPLEMENT_DYNAMIC_CLASS(wxGDIObject,wxObject) line to gdicmn.cpp so that we don't have to have several identical gdiobj.cpp files containing only it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-16 14:53:49 +00:00
Václav Slavík
869b59fc91 added wxRect::Inside(wxRect) for testing if a rectangle is completely within another rectangle
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40521 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-08 14:21:44 +00:00
Włodzimierz Skiba
48a1108eb8 Include wx/font.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-14 19:51:14 +00:00
Włodzimierz Skiba
7cf41a5d66 Include wx/colour.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-14 17:09:39 +00:00
Włodzimierz Skiba
0bca037363 Include wx/bitmap.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-14 10:02:19 +00:00
Paul Cornett
f79f1604a0 revert forward declaration of hashmap, it doesn't work with STL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39419 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-29 06:52:46 +00:00
Paul Cornett
e7445ff8ee move some data definitions to more appropriate places
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-26 16:12:31 +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
c8326d649c Include wx/cursor.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-22 07:11:26 +00:00
Włodzimierz Skiba
923d28da0e Include wx/icon.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-21 21:45:44 +00:00
Włodzimierz Skiba
559a723c1d Include wx/palette.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-20 19:43:09 +00:00
Włodzimierz Skiba
c64755ed1a Include wx/brush.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-19 19:47:45 +00:00
Włodzimierz Skiba
f559024395 Include wx/pen.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-19 09:37:38 +00:00
Włodzimierz Skiba
da80ae712a Include wx/dc.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-05 22:58:39 +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
670f993563 Include wx/app.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-28 12:44:37 +00:00
Włodzimierz Skiba
d5da0ce7cb Include wx/event.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-27 12:47:14 +00:00