Renamed wx.FutureCall to wx.CallLater so it is named more like

[wxWidgets.git] / include / wx / fontdlg.h

diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index 778dbd3a25a7938b694473ae03dce400bb26d279..da2fba946d41f7b896619d5526edf1b4c48fda42 100644 (file)
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -43,12 +43,12 @@ public:
     const wxFontData& GetFontData() const { return m_fontData; }
     wxFontData& GetFontData() { return m_fontData; }
 
+#if WXWIN_COMPATIBILITY_2_6
     // deprecated interface, for compatibility only, don't use
-    wxFontDialogBase(wxWindow *parent, const wxFontData *data)
-        { m_parent = parent; InitFontData(data); }
+    wxDEPRECATED( wxFontDialogBase(wxWindow *parent, const wxFontData *data) );
 
-    bool Create(wxWindow *parent, const wxFontData *data)
-        { InitFontData(data); return Create(parent); }
+    wxDEPRECATED( bool Create(wxWindow *parent, const wxFontData *data) );
+#endif // WXWIN_COMPATIBILITY_2_6
 
 protected:
     virtual bool DoCreate(wxWindow *parent) { m_parent = parent; return true; }
@@ -61,6 +61,15 @@ protected:
     DECLARE_NO_COPY_CLASS(wxFontDialogBase)
 };
 
+#if WXWIN_COMPATIBILITY_2_6
+    // deprecated interface, for compatibility only, don't use
+inline wxFontDialogBase::wxFontDialogBase(wxWindow *parent, const wxFontData *data)
+{ m_parent = parent; InitFontData(data); }
+
+inline bool wxFontDialogBase::Create(wxWindow *parent, const wxFontData *data)
+{ InitFontData(data); return Create(parent); }
+#endif // WXWIN_COMPATIBILITY_2_6
+
 // ----------------------------------------------------------------------------
 // platform-specific wxFontDialog implementation
 // ----------------------------------------------------------------------------