X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ba681060f36767a2682b8547871af2c6f8159955..448dd031e361dfc127046ce5713fa85eadcd08c3:/include/wx/generic/fontdlgg.h diff --git a/include/wx/generic/fontdlgg.h b/include/wx/generic/fontdlgg.h index b02d7093b0..a32deeaffd 100644 --- a/include/wx/generic/fontdlgg.h +++ b/include/wx/generic/fontdlgg.h @@ -72,7 +72,7 @@ class WXDLLEXPORT wxGenericFontDialog: public wxDialog // Internal functions void OnPaint(wxPaintEvent& event); - bool OnClose(void); + void OnCloseWindow(wxCloseEvent& event); virtual void CreateWidgets(void); virtual void InitializeFont(void); @@ -85,11 +85,11 @@ class WXDLLEXPORT wxGenericFontDialog: public wxDialog DECLARE_EVENT_TABLE() }; -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); +wxChar WXDLLEXPORT *wxFontFamilyIntToString(int family); +wxChar WXDLLEXPORT *wxFontWeightIntToString(int weight); +wxChar WXDLLEXPORT *wxFontStyleIntToString(int style); +int WXDLLEXPORT wxFontFamilyStringToInt(wxChar *family); +int WXDLLEXPORT wxFontWeightStringToInt(wxChar *weight); +int WXDLLEXPORT wxFontStyleStringToInt(wxChar *style); #endif