X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/os2/fontdlg.h?ds=sidebyside

diff --git a/include/wx/os2/fontdlg.h b/include/wx/os2/fontdlg.h
index 4dff23ca4b..c2e65c10e7 100644
--- a/include/wx/os2/fontdlg.h
+++ b/include/wx/os2/fontdlg.h
@@ -1,11 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        fontdlg.h
+// Name:        wx/os2/fontdlg.h
 // Purpose:     wxFontDialog class. Use generic version if no
 //              platform-specific implementation.
 // Author:      David Webster
 // Modified by:
 // Created:     10/06/99
-// RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,13 +13,12 @@
 #define _WX_FONTDLG_H_
 
 #include "wx/dialog.h"
-#include "wx/cmndata.h"
 
 /*
  * Font dialog
  */
 
-class WXDLLEXPORT wxFontDialog: public wxFontDialogBase
+class WXDLLIMPEXP_CORE wxFontDialog: public wxFontDialogBase
 {
 public:
     wxFontDialog() : wxFontDialogBase() { /* must be Create()d later */ }
@@ -39,24 +37,22 @@ public:
 
     virtual int ShowModal();
 
+#if WXWIN_COMPATIBILITY_2_6
     //
     // Deprecated interface, don't use
     //
-    wxFontDialog( wxWindow*         pParent
-                 ,const wxFontData* pData
-                )
-                : wxFontDialogBase( pParent
-                                   ,pData
-                                  )
-    {
-        Create( pParent
-               ,pData
-              );
-    }
+    wxDEPRECATED( wxFontDialog( wxWindow* pParent, const wxFontData* pData ) );
+#endif // WXWIN_COMPATIBILITY_2_6
+
 protected:
     DECLARE_DYNAMIC_CLASS(wxFontDialog)
 }; // end of CLASS wxFontDialog
 
+#if WXWIN_COMPATIBILITY_2_6
+    // deprecated interface, don't use
+inline wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData *data)
+        : wxFontDialogBase(parent) { InitFontData(data); Create(parent); }
+#endif // WXWIN_COMPATIBILITY_2_6
+
 #endif
     // _WX_FONTDLG_H_
-