// Created: 2006-03-05
// RCS-ID: $Id$
// Copyright: (c) Jaakko Salli
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wx.h"
#endif
+#include "wx/fontdlg.h"
+
// -----------------------------------------------------------------------
// Custom version of wxFontProperty that also holds colour in the value.
// Original version by Vladimir Vainer.
-#include <wx/fontdlg.h>
-
IMPLEMENT_VARIANT_OBJECT_SHALLOWCMP(wxFontData)
WX_PG_IMPLEMENT_PROPERTY_CLASS(wxFontDataProperty,wxFontProperty,
// Fix value.
fontData.SetChosenFont(value.GetInitialFont());
- if ( !fontData.GetColour().Ok() )
+ if ( !fontData.GetColour().IsOk() )
fontData.SetColour(*wxBLACK);
// Set initial value - should be done in a simpler way like this
fontData << m_value_wxFontData;
wxFont font = fontData.GetChosenFont();
- if ( !font.Ok() )
+ if ( !font.IsOk() )
font = wxFont(10,wxSWISS,wxNORMAL,wxNORMAL);
m_value = WXVARIANT(font);
// Dirs Property
// -----------------------------------------------------------------------
-WX_PG_IMPLEMENT_ARRAYSTRING_PROPERTY_WITH_VALIDATOR(wxDirsProperty,wxT(','),wxT("Browse"))
+WX_PG_IMPLEMENT_ARRAYSTRING_PROPERTY_WITH_VALIDATOR(wxDirsProperty, ',',
+ "Browse")
#if wxUSE_VALIDATORS
WX_PG_TOKENIZER1_BEGIN(text,delimiter)
- if ( token.length() )
+ if ( !token.empty() )
{
// If token was invalid, exit the loop now