#define _WX_FONTPICKER_H_
#include "wx/button.h"
-#include "wx/cmndata.h"
+#include "wx/fontdata.h"
//-----------------------------------------------------------------------------
-// wxGenericFontButton: a button which brings up a wxColourDialog
+// wxGenericFontButton: a button which brings up a wxFontDialog
//-----------------------------------------------------------------------------
class WXDLLIMPEXP_CORE wxGenericFontButton : public wxButton,
// 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:
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)