X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83a21afbcb5335b0f07fa4e2e1aaa1711c2b7dca..3dc0174140ffc52a08fd5b64cf839babad09e5cf:/include/wx/generic/fontdlgg.h

diff --git a/include/wx/generic/fontdlgg.h b/include/wx/generic/fontdlgg.h
index a32deeaffd..59c87eacff 100644
--- a/include/wx/generic/fontdlgg.h
+++ b/include/wx/generic/fontdlgg.h
@@ -29,6 +29,7 @@
 class WXDLLEXPORT wxChoice;
 class WXDLLEXPORT wxText;
 class WXDLLEXPORT wxCheckBox;
+class WXDLLEXPORT wxFontPreviewer;
 
 #define wxID_FONT_UNDERLINE 3000
 #define wxID_FONT_STYLE     3001
@@ -45,15 +46,13 @@ class WXDLLEXPORT wxGenericFontDialog: public wxDialog
   wxFont dialogFont;
   wxWindow *dialogParent;
 
-  // Area reserved for font display
-  wxRect fontRect;
-
   wxChoice *familyChoice;
   wxChoice *styleChoice;
   wxChoice *weightChoice;
   wxChoice *colourChoice;
   wxCheckBox *underLineCheckBox;
   wxChoice   *pointSizeChoice;
+  wxFontPreviewer *m_previewer;
   bool       m_useEvents;
 
 //  static bool fontDialogCancelled;
@@ -70,24 +69,19 @@ class WXDLLEXPORT wxGenericFontDialog: public wxDialog
   inline wxFontData& GetFontData(void) { return fontData; }
 
   // Internal functions
-  void OnPaint(wxPaintEvent& event);
-
   void OnCloseWindow(wxCloseEvent& event);
 
   virtual void CreateWidgets(void);
   virtual void InitializeFont(void);
   
-  virtual void PaintFontBackground(wxDC& dc);
-  virtual void PaintFont(wxDC& dc);
-
   void OnChangeFont(wxCommandEvent& event);
 
 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);