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

[wxWidgets.git] / include / wx / generic / fontdlgg.h

diff --git a/include/wx/generic/fontdlgg.h b/include/wx/generic/fontdlgg.h
index e1a81c3d1a4c8ff61f6fded10491ae3d93b9db20..892d840008330d5414cf63c1cda2b8de1ab6fb79 100644 (file)
--- a/include/wx/generic/fontdlgg.h
+++ b/include/wx/generic/fontdlgg.h
@@ -20,7 +20,7 @@
 
 #ifdef __WXWINCE__
 #define USE_SPINCTRL_FOR_POINT_SIZE 1
 
 #ifdef __WXWINCE__
 #define USE_SPINCTRL_FOR_POINT_SIZE 1

-class WXDLLEXPORT wxSpinEvent;
+class WXDLLIMPEXP_FWD_CORE wxSpinEvent;

 #else
 #define USE_SPINCTRL_FOR_POINT_SIZE 0
 #endif
 #else
 #define USE_SPINCTRL_FOR_POINT_SIZE 0
 #endif


@@ -29,10 +29,10 @@ class WXDLLEXPORT wxSpinEvent;
  * FONT DIALOG
  */
 
  * FONT DIALOG
  */
 

-class WXDLLEXPORT wxChoice;
-class WXDLLEXPORT wxText;
-class WXDLLEXPORT wxCheckBox;
-class WXDLLEXPORT wxFontPreviewer;
+class WXDLLIMPEXP_FWD_CORE wxChoice;
+class WXDLLIMPEXP_FWD_CORE wxText;
+class WXDLLIMPEXP_FWD_CORE wxCheckBox;
+class WXDLLIMPEXP_FWD_CORE wxFontPreviewer;

 
 enum
 {
 
 enum
 {


@@ -44,19 +44,22 @@ enum
     wxID_FONT_SIZE
 };
 
     wxID_FONT_SIZE
 };
 

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

 {
 public:
     wxGenericFontDialog() { Init(); }
 {
 public:
     wxGenericFontDialog() { Init(); }

+    wxGenericFontDialog(wxWindow *parent)
+        : wxFontDialogBase(parent) { Init(); }

     wxGenericFontDialog(wxWindow *parent, const wxFontData& data)
         : wxFontDialogBase(parent, data) { Init(); }
     virtual ~wxGenericFontDialog();
 
     virtual int ShowModal();
 
     wxGenericFontDialog(wxWindow *parent, const wxFontData& data)
         : wxFontDialogBase(parent, data) { Init(); }
     virtual ~wxGenericFontDialog();
 
     virtual int ShowModal();
 

+#if WXWIN_COMPATIBILITY_2_6

     // deprecated, for backwards compatibility only
     // 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);
 
     // Internal functions
     void OnCloseWindow(wxCloseEvent& event);


@@ -101,11 +104,10 @@ private:
     DECLARE_DYNAMIC_CLASS(wxGenericFontDialog)
 };
 
     DECLARE_DYNAMIC_CLASS(wxGenericFontDialog)
 };
 

-WXDLLEXPORT const wxChar *wxFontFamilyIntToString(int family);
-WXDLLEXPORT const wxChar *wxFontWeightIntToString(int weight);
-WXDLLEXPORT const wxChar *wxFontStyleIntToString(int style);
-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
 
 #endif // _WX_GENERIC_FONTDLGG_H