Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
57,204 Commits 1 Branch 330 Tags
70a5b9059ea94eab34e1f1ab8f11228cc0b8ed5c
Commit Graph

103 Commits

Author SHA1 Message Date
Vadim Zeitlin
35f6f71b19 Don't use ternary operator ?: with wxString and literal strings. 
This results in warnings about converting string literal to (non const) C
string.

Also remove the now unneeded calls to c_str() inside wxString::Printf().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-02-15 12:40:20 +00:00
Vadim Zeitlin
c8723b866e sAlways iInclude wx/encinfo.h from src/unix/fontutil.cpp. 
We use wxNativeEncodingInfo in this file, so we always need this header, not
just when not using PCH.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2013-02-15 12:40:17 +00:00
Vadim Zeitlin
a349dc1085 Handle underlined and strikethrough attributes in wxGTK native font info. 
These attributes were not handled by wxFont::GetNativeFontInfoDesc() as it
only serialized the Pango font description which doesn't support them.

Fix this by handling these attributes explicitly and prepending them to the
Pango font string if necessary.

Closes #14559.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-09-15 23:17:12 +00:00
Vadim Zeitlin
1b63698581 Use better face names first in wxGTK wxNativeFontInfo::SetFamily(). 
Try better matches and not the most widespread ones first when building a list
of face names to try for the given family. This gives better results when
these better fonts are indeed available and doesn't change anything if they
are not.

See #14126.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-05-09 14:24:03 +00:00
Paul Cornett
ab7049776d remove run-time check for now-required GTK 2.4 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-02-28 18:06:22 +00:00
Vadim Zeitlin
36cc76505c Use wxStrnicmp() instead of strncasecmp() in wxGTK code. 
This fixes compilation under Windows where strncasecmp() is not available --
but portable wxStrnicmp() always is.

Closes #14036.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-02-23 13:56:14 +00:00
Vadim Zeitlin
e9270aaac8 Also add wxNativeFontInfo::SetStrikethrough() stub for wxGTK2. 
This should have been done in r70563 which added the stub to wxGTK1 part only.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-02-11 16:26:39 +00:00
Vadim Zeitlin
ed7f03bbf3 Add stubs for wxNativeFontInfo::{Get,Set}Strikethrough() to wxGTK. 
These functions are not implemented currently (just as their
{Get,Set}Underlined() counterparts) but should still be defined to allow the
code using wxNativeFontInfo to link.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-02-10 23:34:42 +00:00
Vadim Zeitlin
f48a115976 No real changes, just use const_cast<> instead of C casts. 
Replace many comments indicating that the C cast used was really a
const_cast<> with the proper cast itself. There is no reason to not use it any
longer, all the supported compilers understand it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-10-22 14:17:30 +00:00
Vadim Zeitlin
0b2a860f0d Use wxString methods for UTF-8 conversions in wxX11 code. 
Use wxString::utf8_str() and FromUTF8() to convert to and from UTF-8. This is
more efficient than using wxConvUTF8 as the code did before as it avoids the
conversion entirely when wxString uses UTF-8 internally (as it does by default
in wxX11) and also has the advantage of compiling in STL build unlike the old
code.

Closes #12518.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-09-27 12:48:21 +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
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
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
6aea1e4a70 implement wxNativeFontInfo::SetFamily for wxGTK with the same logic used by wxMSW; remove the now useless m_family from wxGTK's wxFont implementation; better docs for many wxFont functions (don't use typeface term; use the 'face name' one instead) and wxFontFamily 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-04-12 22:53:26 +00:00
Francesco Montorsi
3a6a00822d add a comment about wxNativeFontInfo::SetFaceName return value 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-24 23:13:57 +00:00
Francesco Montorsi
c45f5ae8a3 no real change; just reformatting and better comments 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-16 14:46:00 +00:00
Francesco Montorsi
b5791cc7af add the wxFont(const wxSize& pixelSize, ...) ctor to all ports; add some wxCHECK_MSGs to ensure that the wxSize objects contains non-negative arguments; document that passing zero for the width parameter is allowed; other minor doc fixes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-15 16:28:33 +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
8d22935dcb unused parameter warning fixes for --disable-all-features build 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-11-11 12:55:43 +00:00
Vadim Zeitlin
ff654490b7 removed all compile- and run-time checks for GTK+ < 2.4; don't include the generic files which are now never used in wxGTK in the build 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-11-05 22:31:24 +00:00
Vadim Zeitlin
102798af35 compilation fix for switch(wxChar) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-03-19 01:38:37 +00:00
Vadim Zeitlin
47239bd6b6 wxX11 Unicode compilation fix 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-03-16 16:40:12 +00:00
Vadim Zeitlin
30083ad8e7 Support encodings in wxGTK_CONV_BACK() in the same way as we do it in 
wxGTK_CONV(), i.e. return the string containing text in ISO-8859-1 encoding
and not UTF-8 if the controls font was set to have ISO-8859-1 encoding


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-02-27 15:41:56 +00:00
Václav Slavík
c3a58b249e enable wxFontMapper in wxDFB port 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-01-22 14:05:07 +00:00
Vadim Zeitlin
29131e8a54 fixed X11 Unicode build compilation 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-19 15:25:59 +00:00
Włodzimierz Skiba
02761f6cd4 Include wx/module.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-08-31 19:31:43 +00:00
Vadim Zeitlin
85ab460e7d miscellaneous wxFont enhancements (patch 1496606): 
- made SetFaceName() bool and return false if the face name is not available
- corrected To/FromUserString() to complement each other


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-29 00:03:36 +00:00
Włodzimierz Skiba
d48d1eaeda Missing app.h include. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-24 17:03:11 +00:00
Vadim Zeitlin
8361f92be8 use wxGtkString instead of manual g_free()s (also fixed free/g_free mismatch) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-06 21:59:15 +00:00
Vadim Zeitlin
23f4f495a5 pango_font_description_get_family() can return NULL 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-06 21:48:02 +00:00
Vadim Zeitlin
c23d400420 compilation fix for the last check in 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-06 20:32:46 +00:00
Vadim Zeitlin
7c55c50ea9 clamp the point size of the font to a reaosnable range (second part of patch 1481722) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-05-06 20:23:36 +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
32d4c30a13 Include wx/hash.h according to precompiled headers of wx/wx.h (with other minor cleaning). 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-21 10:33:01 +00:00
Vadim Zeitlin
d0311dd366 all encodings are available in GTK+ 2 (because we always convert to UTF-8 anyhow) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38662 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-10 22:26:36 +00:00
Vadim Zeitlin
5f11fef543 use the encoding of the font which is used to draw the text when convering it to UTF-8 in wxGTK_CONV; the old wxGTK_CONV renamed to wxGTK_CONV_SYS (uses system encoding) and used in the contexts where no font is available 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-10 22:22:13 +00:00
Vadim Zeitlin
84a9b3f89e ISO8859-1 is also supported by GTK+ 2 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-09 20:42:40 +00:00
Vadim Zeitlin
8235976431 fixed wxFontMapper behaviour under wxGTK2: it now just maps all encodings to UTF-8 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-02-12 23:39:55 +00:00
Włodzimierz Skiba
550343399a Source cleaning. wxMotif/OS2 adjustements. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-10-03 16:39:45 +00:00
Vadim Zeitlin
fbfb8bcc3f added missing consts and pass objects by const reference instead of by value (patch 1205869) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-09-24 21:43:15 +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
Michael Wetherell
34a35823ea Fix wxGTK crash on startup on 64-bit solaris 10 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-09-20 12:01:54 +00:00
Mart Raudsepp
3c542a4de0 Remove assert from wxNativeFontInfo::GetFamily() due to, in case of some gtk+ setup/themes, querying for an 
nonexistent facenames family through wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT) on startup.
Document wxFont work in changes.txt


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35367 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-08-29 21:14:18 +00:00
Mart Raudsepp
c42f011ed6 [wxGTK2] Runtime check for pango_font_family_is_monospace in wxFont::GetFamily (gtk2.4 runtime check) to allow wxGTK2 
applications compiled against gtk2.4 or newer to work with gtk2.2 or older runtime. wxFontEnumerator TODO


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-08-29 01:18:07 +00:00
Mart Raudsepp
b20cb04588 [wxGTK2] Check if a family wasn't found for the description in GetFamily() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-08-25 12:46:57 +00:00
Mart Raudsepp
8a15e8ba7a [wxGTK2] Move wxFontRefData::SetPointSize to wxNativeFontInfo. Implement SetFaceName() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-08-23 00:03:27 +00:00
Mart Raudsepp
7533ba252b [wxGTK2] Move wxFontRefData::SetStyle/SetWeight to wxNativeFontInfo 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-08-22 23:56:01 +00:00
Mart Raudsepp
b67d14bee0 [wxGTK2] Do what we (I) can wrt the win32 centric wxNativeFontInfo::GetFamily 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-08-22 23:19:57 +00:00
Mart Raudsepp
38d446db26 [wxGTK2] Return wxTELETYPE with GetFamily() for monospaced fonts, fixing IsFixedWidth() after it broke completely 
after get accessor changes, and returning the right thing in GetFamily() in this case. Other families TODO.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-08-22 20:42:03 +00:00
Mattia Barbon
d946915c20 Return the correct encoding for X font spec construction 
under Japanese locale.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-07-30 17:26:06 +00:00