Rename wxWebNavigationError to wxWebViewNavigationError and wxWebNavigationEvent...

[wxWidgets.git] / src / generic / fontpickerg.cpp

diff --git a/src/generic/fontpickerg.cpp b/src/generic/fontpickerg.cpp
index 971f1cbdbbb28a61f870e99a3493d57614423a88..ffcbb91de357d3af9422660e6e6ea17395528686 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) ?

-                        wxEmptyString : // label will be updated by UpdateFont
-                        wxT("Choose font");
+                        wxString() : // 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,


@@ -59,7 +59,7 @@ bool wxGenericFontButton::Create( wxWindow *parent, wxWindowID id,
     }
 
     // and handle user clicks on it
     }
 
     // and handle user clicks on it

-    Connect(wxEVT_COMMAND_BUTTON_CLICKED,
+    Connect(GetId(), wxEVT_COMMAND_BUTTON_CLICKED,

             wxCommandEventHandler(wxGenericFontButton::OnButtonClick),
             NULL, this);
 
             wxCommandEventHandler(wxGenericFontButton::OnButtonClick),
             NULL, this);
 


@@ -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


@@ -97,7 +97,7 @@ void wxGenericFontButton::OnButtonClick(wxCommandEvent& WXUNUSED(ev))
 
 void wxGenericFontButton::UpdateFont()
 {
 
 void wxGenericFontButton::UpdateFont()
 {

-    if ( !m_selectedFont.Ok() )
+    if ( !m_selectedFont.IsOk() )

         return;
 
     SetForegroundColour(m_data.GetColour());
         return;
 
     SetForegroundColour(m_data.GetColour());