X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6b775e666ce1fbc40084ff54fcbe44fcce3d7263..dbaf49a996b4f8496a07f860297f3dca4a1817fd:/include/wx/generic/fontdlgg.h

diff --git a/include/wx/generic/fontdlgg.h b/include/wx/generic/fontdlgg.h
index 9a2a38dfcf..485b99fdd3 100644
--- a/include/wx/generic/fontdlgg.h
+++ b/include/wx/generic/fontdlgg.h
@@ -54,9 +54,10 @@ public:
 
     virtual int ShowModal();
 
+#if WXWIN_COMPATIBILITY_2_6
     // deprecated, for backwards compatibility only
-    wxGenericFontDialog(wxWindow *parent, const wxFontData *data)
-        : wxFontDialogBase(parent, data) { Init(); }
+    wxDEPRECATED( wxGenericFontDialog(wxWindow *parent, const wxFontData *data) );
+#endif // WXWIN_COMPATIBILITY_2_6
 
     // Internal functions
     void OnCloseWindow(wxCloseEvent& event);
@@ -71,21 +72,26 @@ public:
 #endif
 
 protected:
+
+    virtual bool DoCreate(wxWindow *parent);
+
+private:
+
     // common part of all ctors
     void Init();
 
-    virtual bool DoCreate(wxWindow *parent);
+    void DoChangeFont();
 
-    wxFont dialogFont;
+    wxFont m_dialogFont;
 
-    wxChoice *familyChoice;
-    wxChoice *styleChoice;
-    wxChoice *weightChoice;
-    wxChoice *colourChoice;
-    wxCheckBox *underLineCheckBox;
+    wxChoice *m_familyChoice;
+    wxChoice *m_styleChoice;
+    wxChoice *m_weightChoice;
+    wxChoice *m_colourChoice;
+    wxCheckBox *m_underLineCheckBox;
 
 #if !USE_SPINCTRL_FOR_POINT_SIZE
-    wxChoice   *pointSizeChoice;
+    wxChoice   *m_pointSizeChoice;
 #endif
 
     wxFontPreviewer *m_previewer;
@@ -103,4 +109,10 @@ WXDLLEXPORT int wxFontFamilyStringToInt(wxChar *family);
 WXDLLEXPORT int wxFontWeightStringToInt(wxChar *weight);
 WXDLLEXPORT int wxFontStyleStringToInt(wxChar *style);
 
+#if WXWIN_COMPATIBILITY_2_6
+    // deprecated, for backwards compatibility only
+inline wxGenericFontDialog::wxGenericFontDialog(wxWindow *parent, const wxFontData *data)
+                           :wxFontDialogBase(parent) { Init(); InitFontData(data); Create(parent); }
+#endif // WXWIN_COMPATIBILITY_2_6
+
 #endif // _WX_GENERIC_FONTDLGG_H