projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix wxGTK1 compilation after wxTextEntry DoGetValue() change
[wxWidgets.git]
/
src
/
gtk
/
fontdlg.cpp
diff --git
a/src/gtk/fontdlg.cpp
b/src/gtk/fontdlg.cpp
index c20b8b55ab6f617572b029c9498ced2c854c551d..a1df8d00e544016679f80b02aff4b44271a6d47b 100644
(file)
--- a/
src/gtk/fontdlg.cpp
+++ b/
src/gtk/fontdlg.cpp
@@
-60,7
+60,7
@@
void gtk_fontdialog_ok_callback( GtkWidget *WXUNUSED(widget), wxFontDialog *dial
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
event.SetEventObject( dialog );
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_OK);
event.SetEventObject( dialog );
- dialog->
GetEventHandler()->Process
Event( event );
+ dialog->
HandleWindow
Event( event );
}
}
}
}
@@
-74,7
+74,7
@@
void gtk_fontdialog_cancel_callback( GtkWidget *WXUNUSED(w), wxFontDialog *dialo
{
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
event.SetEventObject( dialog );
{
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
event.SetEventObject( dialog );
- dialog->
GetEventHandler()->Process
Event( event );
+ dialog->
HandleWindow
Event( event );
}
}
}
}
@@
-86,8
+86,6
@@
IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
bool wxFontDialog::DoCreate(wxWindow *parent)
{
bool wxFontDialog::DoCreate(wxWindow *parent)
{
- m_needParent = false;
-
parent = GetParentForModalDialog(parent);
if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
parent = GetParentForModalDialog(parent);
if (!PreCreation( parent, wxDefaultPosition, wxDefaultSize ) ||
@@
-100,6
+98,7
@@
bool wxFontDialog::DoCreate(wxWindow *parent)
wxString m_message( _("Choose font") );
m_widget = gtk_font_selection_dialog_new( wxGTK_CONV( m_message ) );
wxString m_message( _("Choose font") );
m_widget = gtk_font_selection_dialog_new( wxGTK_CONV( m_message ) );
+ g_object_ref(m_widget);
if (parent)
gtk_window_set_transient_for(GTK_WINDOW(m_widget),
if (parent)
gtk_window_set_transient_for(GTK_WINDOW(m_widget),
@@
-143,7
+142,7
@@
wxFontDialog::~wxFontDialog()
void wxFontDialog::SetChosenFont(const char *fontname)
{
void wxFontDialog::SetChosenFont(const char *fontname)
{
- m_fontData.SetChosenFont(wxFont( wxString::From
Ascii
(fontname) ));
+ m_fontData.SetChosenFont(wxFont( wxString::From
UTF8
(fontname) ));
}
#endif // wxUSE_FONTDLG && !__WXGPE__
}
#endif // wxUSE_FONTDLG && !__WXGPE__