wxUniv compilation fixes (patch 559620)

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

diff --git a/include/wx/generic/fontdlgg.h b/include/wx/generic/fontdlgg.h
index acf9d1d16ab1ae4655a927471fa3370c2d979135..742bf813ef5825fa4564a2ad1f43f197b2edce9a 100644 (file)
--- a/include/wx/generic/fontdlgg.h
+++ b/include/wx/generic/fontdlgg.h
@@ -59,10 +59,10 @@ class WXDLLEXPORT wxGenericFontDialog: public wxDialog
  public:
  
   wxGenericFontDialog(void);
-  wxGenericFontDialog(wxWindow *parent, wxFontData *data = (wxFontData *) NULL);
+  wxGenericFontDialog(wxWindow *parent, const wxFontData& data);
   ~wxGenericFontDialog(void);
 
-  bool Create(wxWindow *parent, wxFontData *data = (wxFontData *) NULL);
+  bool Create(wxWindow *parent, const wxFontData& data);
 
   int ShowModal(void);
 
@@ -79,9 +79,9 @@ class WXDLLEXPORT wxGenericFontDialog: public wxDialog
 DECLARE_EVENT_TABLE()
 };
 
-wxChar WXDLLEXPORT *wxFontFamilyIntToString(int family);
-wxChar WXDLLEXPORT *wxFontWeightIntToString(int weight);
-wxChar WXDLLEXPORT *wxFontStyleIntToString(int style);
+const wxChar WXDLLEXPORT *wxFontFamilyIntToString(int family);
+const wxChar WXDLLEXPORT *wxFontWeightIntToString(int weight);
+const wxChar WXDLLEXPORT *wxFontStyleIntToString(int style);
 int WXDLLEXPORT wxFontFamilyStringToInt(wxChar *family);
 int WXDLLEXPORT wxFontWeightStringToInt(wxChar *weight);
 int WXDLLEXPORT wxFontStyleStringToInt(wxChar *style);