X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c67daf87774c71ae9f73af9969008af220e52a11..d062e17fca1a1fc0b82b269da4a7ad271075ba2b:/include/wx/generic/fontdlgg.h?ds=sidebyside diff --git a/include/wx/generic/fontdlgg.h b/include/wx/generic/fontdlgg.h index c8a6e76c09..a32deeaffd 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; @@ -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