X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c801d85f158c4cba50b588807daabdcbd0ed3853..396bdd5ab1b1a66748642c67d8f81315a10557ad:/include/wx/generic/fontdlgg.h

diff --git a/include/wx/generic/fontdlgg.h b/include/wx/generic/fontdlgg.h
index 8afda5b745..b02d7093b0 100644
--- a/include/wx/generic/fontdlgg.h
+++ b/include/wx/generic/fontdlgg.h
@@ -46,7 +46,7 @@ class WXDLLEXPORT wxGenericFontDialog: public wxDialog
   wxWindow *dialogParent;
 
   // Area reserved for font display
-  wxRectangle fontRect;
+  wxRect fontRect;
 
   wxChoice *familyChoice;
   wxChoice *styleChoice;
@@ -54,15 +54,16 @@ class WXDLLEXPORT wxGenericFontDialog: public wxDialog
   wxChoice *colourChoice;
   wxCheckBox *underLineCheckBox;
   wxChoice   *pointSizeChoice;
+  bool       m_useEvents;
 
 //  static bool fontDialogCancelled;
  public:
  
   wxGenericFontDialog(void);
-  wxGenericFontDialog(wxWindow *parent, wxFontData *data = NULL);
+  wxGenericFontDialog(wxWindow *parent, wxFontData *data = (wxFontData *) NULL);
   ~wxGenericFontDialog(void);
 
-  bool Create(wxWindow *parent, wxFontData *data = NULL);
+  bool Create(wxWindow *parent, wxFontData *data = (wxFontData *) NULL);
 
   int ShowModal(void);
 
@@ -84,9 +85,9 @@ class WXDLLEXPORT wxGenericFontDialog: public wxDialog
 DECLARE_EVENT_TABLE()
 };
 
-char* WXDLLEXPORT wxFontFamilyIntToString(int family);
-char* WXDLLEXPORT wxFontWeightIntToString(int weight);
-char* WXDLLEXPORT wxFontStyleIntToString(int style);
+char WXDLLEXPORT *wxFontFamilyIntToString(int family);
+char WXDLLEXPORT *wxFontWeightIntToString(int weight);
+char WXDLLEXPORT *wxFontStyleIntToString(int style);
 int WXDLLEXPORT wxFontFamilyStringToInt(char *family);
 int WXDLLEXPORT wxFontWeightStringToInt(char *weight);
 int WXDLLEXPORT wxFontStyleStringToInt(char *style);