projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add GetPageText to MSW IE and to GTK WebKit. Add stub for OSX and document.
[wxWidgets.git]
/
src
/
generic
/
fontpickerg.cpp
diff --git
a/src/generic/fontpickerg.cpp
b/src/generic/fontpickerg.cpp
index 56963130797c12d8ab1da306e74a726cb3d5bc9f..7d1cfb908a1dd08058f8f97c97b9c677dcf8d1f8 100644
(file)
--- a/
src/generic/fontpickerg.cpp
+++ b/
src/generic/fontpickerg.cpp
@@
-47,8
+47,8
@@
bool wxGenericFontButton::Create( wxWindow *parent, wxWindowID id,
const wxValidator& validator, const wxString &name)
{
wxString label = (style & wxFNTP_FONTDESC_AS_LABEL) ?
const wxValidator& validator, const wxString &name)
{
wxString label = (style & wxFNTP_FONTDESC_AS_LABEL) ?
- wx
EmptyString
: // label will be updated by UpdateFont
-
wxT
("Choose font");
+ wx
String()
: // label will be updated by UpdateFont
+
_
("Choose font");
// create this button
if (!wxButton::Create( parent, id, label, pos,
// create this button
if (!wxButton::Create( parent, id, label, pos,
@@
-79,7
+79,7
@@
void wxGenericFontButton::InitFontData()
void wxGenericFontButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev))
{
void wxGenericFontButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev))
{
- // update the wxFontData to be shown in the
the
dialog
+ // update the wxFontData to be shown in the dialog
m_data.SetInitialFont(m_selectedFont);
// create the font dialog and display it
m_data.SetInitialFont(m_selectedFont);
// create the font dialog and display it