support retina display

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

diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index 5a2dca11957cc7d6f3d7818c529dc97d413514bf..c963c73364d42a4fada2adb434150ac2889a0ae7 100644 (file)
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -17,7 +17,7 @@
 #if wxUSE_FONTDLG
 
 #include "wx/dialog.h"          // the base class
 #if wxUSE_FONTDLG
 
 #include "wx/dialog.h"          // the base class

-#include "wx/cmndata.h"         // wxFontData
+#include "wx/fontdata.h"

 
 // ----------------------------------------------------------------------------
 // wxFontDialog interface
 
 // ----------------------------------------------------------------------------
 // wxFontDialog interface


@@ -37,8 +37,6 @@ public:
     bool Create(wxWindow *parent, const wxFontData& data)
         { InitFontData(&data); return Create(parent); }
 
     bool Create(wxWindow *parent, const wxFontData& data)
         { InitFontData(&data); return Create(parent); }
 

-    virtual ~wxFontDialogBase();
-

     // retrieve the font data
     const wxFontData& GetFontData() const { return m_fontData; }
     wxFontData& GetFontData() { return m_fontData; }
     // retrieve the font data
     const wxFontData& GetFontData() const { return m_fontData; }
     wxFontData& GetFontData() { return m_fontData; }


@@ -58,7 +56,7 @@ protected:
 
     wxFontData m_fontData;
 
 
     wxFontData m_fontData;
 

-    DECLARE_NO_COPY_CLASS(wxFontDialogBase)
+    wxDECLARE_NO_COPY_CLASS(wxFontDialogBase);

 };
 
 #if WXWIN_COMPATIBILITY_2_6
 };
 
 #if WXWIN_COMPATIBILITY_2_6