Try loading even English translations if provided.

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

diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index 2d845d5e3ab58e78c6605d34e33461c182043916..74a6e6fccf444bbc4921e26df22a99eeb657347e 100644 (file)
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     12.05.02
-// RCS-ID:      $Id$
 // Copyright:   (c) 1997-2002 wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -17,7 +16,7 @@
 #if wxUSE_FONTDLG
 
 #include "wx/dialog.h"          // the base class
-#include "wx/cmndata.h"         // wxFontData
+#include "wx/fontdata.h"
 
 // ----------------------------------------------------------------------------
 // wxFontDialog interface
@@ -37,8 +36,6 @@ public:
     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; }
@@ -58,7 +55,7 @@ protected:
 
     wxFontData m_fontData;
 
-    DECLARE_NO_COPY_CLASS(wxFontDialogBase)
+    wxDECLARE_NO_COPY_CLASS(wxFontDialogBase);
 };
 
 #if WXWIN_COMPATIBILITY_2_6
@@ -108,7 +105,7 @@ inline bool wxFontDialogBase::Create(wxWindow *parent, const wxFontData *data)
 
 // get the font from user and return it, returns wxNullFont if the dialog was
 // cancelled
-WXDLLIMPEXP_CORE wxFont wxGetFontFromUser(wxWindow *parent = (wxWindow *)NULL,
+WXDLLIMPEXP_CORE wxFont wxGetFontFromUser(wxWindow *parent = NULL,
                                           const wxFont& fontInit = wxNullFont,
                                           const wxString& caption = wxEmptyString);