Apply patch (plus some additional changes) upgrading Scintilla to version 2.03. ...

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

diff --git a/interface/wx/fontpicker.h b/interface/wx/fontpicker.h
index 4476d3ce9845f64f53e9d2914c45bb90634018fa..48126f98565888ba1ad833631ce4a282f9db8071 100644 (file)
--- a/interface/wx/fontpicker.h
+++ b/interface/wx/fontpicker.h
@@ -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.
@@ -91,7 +91,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 long style = wxFNTP_DEFAULT_STYLE,
                 const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = "fontpickerctrl");
+                const wxString& name = wxFontPickerCtrlNameStr);
 
     /**
         Returns the maximum point size value allowed for the user-chosen font.
@@ -113,7 +113,7 @@ public:
         (see wxFNTP_USE_TEXTCTRL), it's a good idea to put a limit to the maximum
         font size when huge fonts do not make much sense.
     */
-    void GetMaxPointSize(unsigned int max);
+    void SetMaxPointSize(unsigned int max);
 
     /**
         Sets the currently selected font.