Don't look for catalogs in AddCatalogLookupPathPrefix() path directly.

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

diff --git a/interface/wx/fontpicker.h b/interface/wx/fontpicker.h
index defa80b439e97a3109de66b133c75c7950a6adbb..b0db89b181a0b4825794a98960f32850282f8790 100644 (file)
--- a/interface/wx/fontpicker.h
+++ b/interface/wx/fontpicker.h
@@ -3,9 +3,19 @@
 // Purpose:     interface of wxFontPickerCtrl
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxFontPickerCtrl
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+
+#define wxFNTP_FONTDESC_AS_LABEL      0x0008
+#define wxFNTP_USEFONT_FOR_LABEL      0x0010
+#define wxFONTBTN_DEFAULT_STYLE       (wxFNTP_FONTDESC_AS_LABEL | wxFNTP_USEFONT_FOR_LABEL)
+#define wxFNTP_USE_TEXTCTRL           (wxPB_USE_TEXTCTRL)
+#define wxFNTP_DEFAULT_STYLE          (wxFNTP_FONTDESC_AS_LABEL|wxFNTP_USEFONT_FOR_LABEL)
+
+wxEventType wxEVT_FONTPICKER_CHANGED;
+
+

 /**
     @class wxFontPickerCtrl
 
 /**
     @class wxFontPickerCtrl
 


@@ -33,7 +43,7 @@
            Uses the currently selected font to draw the label of the button.
     @endStyleTable
 
            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
     @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


@@ -42,13 +52,15 @@
 
     @library{wxcore}
     @category{pickers}
 
     @library{wxcore}
     @category{pickers}

-    @appearance{fontpickerctrl.png}
+    @appearance{fontpickerctrl}

 
     @see wxFontDialog, wxFontPickerEvent
 */
 class wxFontPickerCtrl : public wxPickerBase
 {
 public:
 
     @see wxFontDialog, wxFontPickerEvent
 */
 class wxFontPickerCtrl : public wxPickerBase
 {
 public:

+    wxFontPickerCtrl();
+    

     /**
         Initializes the object and calls Create() with
         all the parameters.
     /**
         Initializes the object and calls Create() with
         all the parameters.


@@ -59,7 +71,7 @@ public:
                      const wxSize& size = wxDefaultSize,
                      long style = wxFNTP_DEFAULT_STYLE,
                      const wxValidator& validator = wxDefaultValidator,
                      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.
 
     /**
         Creates this widget with given parameters.


@@ -113,7 +125,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.
     */
         (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 SetMaxPointSize(unsigned int) const;
+    void SetMaxPointSize(unsigned int max);

 
     /**
         Sets the currently selected font.
 
     /**
         Sets the currently selected font.