Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

[wxWidgets.git] / interface / wx / fontpicker.h

diff --git a/interface/wx/fontpicker.h b/interface/wx/fontpicker.h
index 6c37b1703cff6bcd58d791e9fc4373157ee60701..0cbb18adeba7f79eb253716f83a98e1943c861f5 100644 (file)
--- a/interface/wx/fontpicker.h
+++ b/interface/wx/fontpicker.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxFontPickerCtrl
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -33,7 +33,7 @@
            Uses the currently selected font to draw the label of the button.
     @endStyleTable
 
-    @beginEventTable{wxFontPickerEvent}
+    @beginEventEmissionTable{wxFontPickerEvent}
     @event{EVT_FONTPICKER_CHANGED(id, func)}
         The user changed the font selected in the control either using the button
         or using text control (see wxFNTP_USE_TEXTCTRL; note that in this case the
@@ -59,7 +59,7 @@ public:
                      const wxSize& size = wxDefaultSize,
                      long style = wxFNTP_DEFAULT_STYLE,
                      const wxValidator& validator = wxDefaultValidator,
-                     const wxString& name = "fontpickerctrl");
+                     const wxString& name = wxFontPickerCtrlNameStr);
 
     /**
         Creates this widget with given parameters.