]> git.saurik.com Git - wxWidgets.git/blobdiff - include/wx/generic/fontdlgg.h
Added some column width contrl code.
[wxWidgets.git] / include / wx / generic / fontdlgg.h
index e1a81c3d1a4c8ff61f6fded10491ae3d93b9db20..485b99fdd3a1492bc9287f127162200feeeff3e5 100644 (file)
@@ -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);
@@ -108,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