Commit Graph

72 Commits

Author SHA1 Message Date
Vadim Zeitlin
d66e7af9aa Don't use deprecated wxBOLD, wxNORMAL and similar constants.
Replace them with wxFONTWEIGHT_BOLD, wxFONTSTYLE_NORMAL or wxFONTWEIGHT_NORMAL
and equivalents in the code of the library itself and in the samples.

Also simplify font construction using wxFontInfo where possible to avoid
specifying these constants at all if they are not needed.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-01-11 14:25:30 +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
Dimitri Schoolwerth
6636ef8ddf Use wxString's empty() when checking if the string is (non-)empty throughout wx.
Instead of constructs such as if "( s.length() )" and "if (s.length() > 0)" use "if ( !s.empty() )" instead. Similarly for "if (s.length() == 0)" or "if ( s.IsNull() )", use "if ( s.empty() )".
No code changes intended except for a few instances where a construct like "if ( s.length() && wxFileExists(s) )" was changed to not check the length of the string and let wxFileExists handle such cases.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-22 14:38:36 +00:00
Paul Cornett
081d8d96db Move wxColourData and wxFontData into separate files.
This eliminates a linking dependency that would drag in the printing
code for any program that used wxColourDialog or wxFontDialog (which
is currently all of them, due to more link dependencies...)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-07 05:26:57 +00:00
Vadim Zeitlin
cdc48273b4 Fix bug with using uninitialized flags in GetParentForModalDialog().
GetParentForModalDialog() was called from the ctor initialized list before
m_windowStyle could be initialized by the base class ctor in several different
places, meaning that the check for wxDIALOG_NO_PARENT in this function was
using uninitialized variable.

Fix this by passing the style parameter explicitly to this function to allow
using it from derived class ctors. Still keep an overload which uses the
actual window parent and flags which is simpler to use for later calls to this
function.

Thanks valgrind for finding this one.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-04-18 00:05:37 +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
Václav Slavík
994f04a3f2 wxUSE_STL compilation fixes for wxGenericFontDialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-06-16 17:32:09 +00:00
Václav Slavík
3a3dde0d44 use wx/crt.h as the 'official' header for wxCRT wrappers instead of wxchar.h; add comments explaining that users should include wx/crt.h to implementation headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-06-11 06:08:13 +00:00
Vadim Zeitlin
81ec6f01f2 compilation fix for non-PCH build, include wx/wxchar.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-25 13:20:41 +00:00
Vadim Zeitlin
8f3447c289 don't use deprecated GetTextExtent() overload
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-05 21:39:04 +00:00
Vadim Zeitlin
2229243bdf added wxDialog::GetParentForModalDialog() and use it to try to always create modal dialogs with a parent (slightly modified patch 1702962)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-22 20:34:41 +00:00
Vadim Zeitlin
69ce77e25a removed deprecated wxADJUST_MINSIZE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-07 12:11:35 +00:00
Włodzimierz Skiba
ed2fbeb835 Include wx/sizer.h and wx/layout.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-08 06:57:39 +00:00
Włodzimierz Skiba
ce5d92e150 Include wx/cmndata.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-25 21:08:11 +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
f43255e838 No more avoiding wxSizer::Fit in wxWinCE builds.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-30 00:20:54 +00:00
Włodzimierz Skiba
cececf4db5 Don't send dummy wxCommandEvent. Make members private and use wxW coding standards for them.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 18:54:41 +00:00
Julian Smart
6b775e666c On WinCE, generic font dialog didn't work because the point size wxChoice
menu went off the display. Now a wxSpinCtrl is used. Also fixed the preview
window in PDA mode (was invisible).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-02 12:57:30 +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
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
d6b30150b2 colourSize was probably supposed to be used and not just defined and then forgot about (thanks for SGI CC for a nice warning)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-17 21:00:04 +00:00
Julian Smart
aa66250ba4 Further WinCE adaptations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-04-02 17:44:12 +00:00
Julian Smart
94f5392355 Standard dialogs becoming useable on WinCE.
Make standard button sizer horizontal on WinCE since
vertically it looks atrocious (app will need to reduce
number of buttons if they don't fit)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-16 15:37:09 +00:00
Kevin Hock
8ae6cfb696 Added checking of EnableEffects flag and not allowing changes to color or underlining if it is not set, consistent with MSW (GTK2 native control doesn't offer underlining or color, so flag is essentially always disabled on GTK2)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-11-07 05:38:02 +00:00
Julian Smart
4566d7db6f Improved the generic font dialog appearance.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-28 15:46:17 +00:00
Robin Dunn
448971f395 If no colour name then use "BLACK"
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-21 22:53:43 +00:00
Dimitri Schoolwerth
dabbc6a5a1 removed SetAutoLayout(true) calls when a corresponding SetSizer() was also called (the latter already calls SetAutoLayout(true) in case of a non-NULL window); usual cleanup: removing tabs and end of line whitespace, TRUE->true, FALSE->false, -1->wxID_ANY, Enable(false)->Disable(), ""->wxEmptyString
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-12 23:44:08 +00:00
Włodzimierz Skiba
23c47bc1f3 Generic font dialog is still an option in wxMSW in non Univ mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-06-11 19:24:59 +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
47e118ba9a GPE uses generic dialogs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-02-28 15:27:11 +00:00
Vadim Zeitlin
564a150b1f replaced all occurences of wxColourDatabase::FindColour() with Find(); minor code cleanup here and there
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-18 23:51:01 +00:00
Vadim Zeitlin
999836aaca warning fixes for BCC and OW (heavily modified patch 819146)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 10:28:15 +00:00
Robin Dunn
2d588cb2b0 Should not delete colours that come from the wxColourDatabase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-29 17:42:18 +00:00
Robert Roebling
a1696b86f8 Upported a number of patches to HEAD.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-09 18:04:57 +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
Julian Smart
ae500232a4 Added m_ prefix to wxColourData and wxFontData members for consistency.
Fixed some typos in comments.
Fixed wizard constructor doc.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-26 13:15:12 +00:00
Julian Smart
6aa89a22b8 Fixed copyrights and licence spelling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-17 11:55:54 +00:00
Vadim Zeitlin
2b5f62a0b2 merged 2.4 branch into the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-04 14:11:26 +00:00
Julian Smart
fc8eba27ef Removed #ifdef __WXMAC__ around dialog initialisation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-09-06 16:32:34 +00:00
Stefan Csomor
06e8a59de3 added creation of dialog - perhaps needed for all platforms
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-14 13:04:39 +00:00
Stefan Csomor
1bab9242a9 added creation of dialog - perhaps needed for all platforms
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-14 13:01:05 +00:00
Vadim Zeitlin
c2c59b2286 made wxGenericFontDialog derive from wxFontDialogBase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-06-29 00:46:11 +00:00
Julian Smart
baaae89f09 Updated font dialog constructors to use a reference to the font data
as per more recent convention


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-05-18 11:05:58 +00:00
Vadim Zeitlin
d0060e7705 corrected const char * to char * conversions (patch 543896)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-04-15 18:49:57 +00:00
Václav Slavík
53cf79fa4b rewrote wxGenericFileDialog to use sizers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-19 23:23:51 +00:00
Vadim Zeitlin
4234ea8be0 use fontdlgg.cpp under wxUniv/GTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-04 18:27:43 +00:00
Julian Smart
3808e19142 Added some more files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-29 17:21:17 +00:00
Václav Slavík
ad81651f00 removed USE_SHARED_LIBRARY(IES)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-14 23:57:30 +00:00