Fix activation handling in generic wxDataViewCtrl renderers.

[wxWidgets.git] / include / wx / generic / fontpickerg.h

diff --git a/include/wx/generic/fontpickerg.h b/include/wx/generic/fontpickerg.h
index a0ca64d3e583ce53771db71d5f211ba801063c77..369c46677e72abeb2d62649ac7b8e64848c846f4 100644 (file)
--- a/include/wx/generic/fontpickerg.h
+++ b/include/wx/generic/fontpickerg.h
@@ -13,16 +13,12 @@
 #define _WX_FONTPICKER_H_
 
 #include "wx/button.h"
 #define _WX_FONTPICKER_H_
 
 #include "wx/button.h"

-
-class WXDLLIMPEXP_CORE wxFontData;
+#include "wx/cmndata.h"

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// wxGenericFontButton: a button which brings up a wxColourDialog
+// wxGenericFontButton: a button which brings up a wxFontDialog

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-#define wxFONTBTN_DEFAULT_STYLE \
-    (wxFNTP_FONTDESC_AS_LABEL | wxFNTP_USEFONT_FOR_LABEL)
-

 class WXDLLIMPEXP_CORE wxGenericFontButton : public wxButton,
                                              public wxFontPickerWidgetBase
 {
 class WXDLLIMPEXP_CORE wxGenericFontButton : public wxButton,
                                              public wxFontPickerWidgetBase
 {


@@ -30,7 +26,7 @@ public:
     wxGenericFontButton() {}
     wxGenericFontButton(wxWindow *parent,
                         wxWindowID id,
     wxGenericFontButton() {}
     wxGenericFontButton(wxWindow *parent,
                         wxWindowID id,

-                        const wxFont &initial = *wxNORMAL_FONT,
+                        const wxFont &initial = wxNullFont,

                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         long style = wxFONTBTN_DEFAULT_STYLE,
                         const wxPoint& pos = wxDefaultPosition,
                         const wxSize& size = wxDefaultSize,
                         long style = wxFONTBTN_DEFAULT_STYLE,


@@ -48,8 +44,8 @@ public:     // API extensions specific for wxGenericFontButton
     // user can override this to init font data in a different way
     virtual void InitFontData();
 
     // user can override this to init font data in a different way
     virtual void InitFontData();
 

-    // returns the font data shown in wxColourDialog
-    wxFontData *GetFontData() { return &ms_data; }
+    // returns the font data shown in wxFontDialog
+    wxFontData *GetFontData() { return &m_data; }

 
 
 public:
 
 
 public:


@@ -70,10 +66,7 @@ protected:
 
     void UpdateFont();
 
 
     void UpdateFont();
 

-    // the colour data shown in wxColourPickerCtrlGeneric
-    // controls. This member is static so that all colour pickers
-    // in the program share the same set of custom colours.
-    static wxFontData ms_data;
+    wxFontData m_data;

 
 private:
    DECLARE_DYNAMIC_CLASS(wxGenericFontButton)
 
 private:
    DECLARE_DYNAMIC_CLASS(wxGenericFontButton)