Cast for argument to delete[] - VC6 doesn't want to delete a const pointer

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

diff --git a/include/wx/os2/fontdlg.h b/include/wx/os2/fontdlg.h
index 4dff23ca4b07043c963629b5f112751977759c38..fadd23e1cb03279545e8f2ece0c17dba87300faa 100644 (file)
--- a/include/wx/os2/fontdlg.h
+++ b/include/wx/os2/fontdlg.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        fontdlg.h
+// Name:        wx/os2/fontdlg.h

 // Purpose:     wxFontDialog class. Use generic version if no
 //              platform-specific implementation.
 // Author:      David Webster
 // Purpose:     wxFontDialog class. Use generic version if no
 //              platform-specific implementation.
 // Author:      David Webster


@@ -20,7 +20,7 @@
  * Font dialog
  */
 
  * Font dialog
  */
 

-class WXDLLEXPORT wxFontDialog: public wxFontDialogBase
+class WXDLLIMPEXP_CORE wxFontDialog: public wxFontDialogBase

 {
 public:
     wxFontDialog() : wxFontDialogBase() { /* must be Create()d later */ }
 {
 public:
     wxFontDialog() : wxFontDialogBase() { /* must be Create()d later */ }


@@ -39,24 +39,22 @@ public:
 
     virtual int ShowModal();
 
 
     virtual int ShowModal();
 

+#if WXWIN_COMPATIBILITY_2_6

     //
     // Deprecated interface, don't use
     //
     //
     // 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
 
 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_
 #endif
     // _WX_FONTDLG_H_

-