update minimum GTK2 version requirement to 2.6

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

diff --git a/interface/wx/fontpicker.h b/interface/wx/fontpicker.h
index 33497c5bf153efde04778e15c7369bcf1759d8fd..e354fc37427746c3b409459633d02585c84bc293 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$
-// 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_COMMAND_FONTPICKER_CHANGED;
+
+
 /**
     @class wxFontPickerCtrl
 
@@ -33,7 +43,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
@@ -49,6 +59,8 @@
 class wxFontPickerCtrl : public wxPickerBase
 {
 public:
+    wxFontPickerCtrl();
+    
     /**
         Initializes the object and calls Create() with
         all the parameters.