// Author: Jaakko Salli
// Modified by:
// Created: 2007-05-16
-// RCS-ID: $Id:
+// RCS-ID: $Id$
// Copyright: (c) Jaakko Salli
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#include "sampleprops.h"
-// -----------------------------------------------------------------------
-// Declare custom test properties
-// -----------------------------------------------------------------------
-
-WX_PG_DECLARE_CUSTOM_FLAGS_PROPERTY(wxTestCustomFlagsProperty)
-
-WX_PG_DECLARE_CUSTOM_ENUM_PROPERTY(wxTestCustomEnumProperty)
-
-
// -----------------------------------------------------------------------
// wxTestCustomFlagsProperty
// -----------------------------------------------------------------------
-//
-// Constant definitions required by wxFlagsProperty examples.
-//
-
-static const wxChar* _fs_framestyle_labels[] = {
- wxT("wxCAPTION"),
- wxT("wxMINIMIZE"),
- wxT("wxMAXIMIZE"),
- wxT("wxCLOSE_BOX"),
- wxT("wxSTAY_ON_TOP"),
- wxT("wxSYSTEM_MENU"),
- wxT("wxRESIZE_BORDER"),
- wxT("wxFRAME_TOOL_WINDOW"),
- wxT("wxFRAME_NO_TASKBAR"),
- wxT("wxFRAME_FLOAT_ON_PARENT"),
- wxT("wxFRAME_SHAPED"),
- (const wxChar*) NULL
-};
-
-static const long _fs_framestyle_values[] = {
- wxCAPTION,
- wxMINIMIZE,
- wxMAXIMIZE,
- wxCLOSE_BOX,
- wxSTAY_ON_TOP,
- wxSYSTEM_MENU,
- wxRESIZE_BORDER,
- wxFRAME_TOOL_WINDOW,
- wxFRAME_NO_TASKBAR,
- wxFRAME_FLOAT_ON_PARENT,
- wxFRAME_SHAPED
-};
-
-
-WX_PG_IMPLEMENT_CUSTOM_FLAGS_PROPERTY(wxTestCustomFlagsProperty,
- _fs_framestyle_labels,
- _fs_framestyle_values,
- wxDEFAULT_FRAME_STYLE)
-
-WX_PG_IMPLEMENT_CUSTOM_ENUM_PROPERTY(wxTestCustomEnumProperty,
- _fs_framestyle_labels,
- _fs_framestyle_values,
- wxCAPTION)
-
-
-// Colour labels. Last (before NULL, if any) must be Custom.
-static const wxChar* mycolprop_labels[] = {
- wxT("Black"),
- wxT("Blue"),
- wxT("Brown"),
- wxT("Custom"),
- (const wxChar*) NULL
-};
-
-// Relevant colour values as unsigned longs.
-static unsigned long mycolprop_colours[] = {
- wxPG_COLOUR(0,0,0),
- wxPG_COLOUR(0,0,255),
- wxPG_COLOUR(166,124,81),
- wxPG_COLOUR(0,0,0)
-};
-
-// Implement property class. Third argument is optional values array,
-// but in this example we are only interested in creating a shortcut
-// for user to access the colour values. Last arg is itemcount, but
-// it will be deprecated in the future.
-WX_PG_DECLARE_CUSTOM_COLOUR_PROPERTY_USES_WXCOLOUR(wxMyColourProperty)
-WX_PG_IMPLEMENT_CUSTOM_COLOUR_PROPERTY_USES_WXCOLOUR(wxMyColourProperty,
- mycolprop_labels,
- (long*)NULL,
- mycolprop_colours)
-
-
-WX_PG_DECLARE_CUSTOM_COLOUR_PROPERTY(wxMyColour2Property)
-WX_PG_IMPLEMENT_CUSTOM_COLOUR_PROPERTY(wxMyColour2Property,
- mycolprop_labels,
- (long*)NULL,
- mycolprop_colours)
-
-
-
-// Just testing the macros
-WX_PG_DECLARE_STRING_PROPERTY(wxTestStringProperty)
-WX_PG_IMPLEMENT_STRING_PROPERTY(wxTestStringProperty,wxPG_NO_ESCAPE)
-bool wxTestStringProperty::OnButtonClick( wxPropertyGrid*,
- wxString& )
-{
- ::wxMessageBox(wxT("Button Clicked"));
- return true;
-}
-
-WX_PG_DECLARE_STRING_PROPERTY(wxTextStringPropertyWithValidator)
-WX_PG_IMPLEMENT_STRING_PROPERTY_WITH_VALIDATOR(wxTextStringPropertyWithValidator,
- wxPG_NO_ESCAPE)
-
-bool wxTextStringPropertyWithValidator::OnButtonClick( wxPropertyGrid* WXUNUSED(propgrid),
- wxString& WXUNUSED(value) )
-{
- ::wxMessageBox(wxT("Button Clicked"));
- return true;
-}
-
-wxValidator* wxTextStringPropertyWithValidator::DoGetValidator() const
-{
-#if wxUSE_VALIDATORS
- WX_PG_DOGETVALIDATOR_ENTRY()
- wxTextValidator* validator = new
- wxTextValidator(wxFILTER_INCLUDE_CHAR_LIST);
- wxArrayString oValid;
- oValid.Add(wxT("0"));
- oValid.Add(wxT("1"));
- oValid.Add(wxT("2"));
- oValid.Add(wxT("3"));
- oValid.Add(wxT("4"));
- oValid.Add(wxT("5"));
- oValid.Add(wxT("6"));
- oValid.Add(wxT("7"));
- oValid.Add(wxT("8"));
- oValid.Add(wxT("9"));
- oValid.Add(wxT("$"));
- validator->SetIncludes(oValid);
- WX_PG_DOGETVALIDATOR_EXIT(validator)
-#else
- return NULL;
-#endif
-}
-
-// -----------------------------------------------------------------------
-
//
// Test customizing wxColourProperty via subclassing
//
// * Includes custom colour entry.
// * Includes extra custom entry.
//
-class MyColourProperty3 : public wxColourProperty
+class MyColourProperty : public wxColourProperty
{
public:
- MyColourProperty3( const wxString& label = wxPG_LABEL,
+ MyColourProperty( const wxString& label = wxPG_LABEL,
const wxString& name = wxPG_LABEL,
const wxColour& value = *wxWHITE )
: wxColourProperty(label, name, value)
SetValue(variant);
}
- virtual ~MyColourProperty3()
+ virtual ~MyColourProperty()
{
}
void FormMain::AddTestProperties( wxPropertyGridPage* pg )
{
- pg->Append( new wxTestCustomFlagsProperty(wxT("Custom FlagsProperty"), wxPG_LABEL ) );
- pg->SetPropertyEditor( wxT("Custom FlagsProperty"), wxPG_EDITOR(TextCtrlAndButton) );
+ pg->Append( new MyColourProperty(wxT("CustomColourProperty"), wxPG_LABEL, *wxGREEN) );
+ pg->GetProperty(wxT("CustomColourProperty"))->SetFlag(wxPG_PROP_AUTO_UNSPECIFIED);
+ pg->SetPropertyEditor( wxT("CustomColourProperty"), wxPGEditor_ComboBox );
- pg->Append( new wxTestCustomEnumProperty(wxT("Custom EnumProperty"), wxPG_LABEL ) );
-
- pg->Append( new wxMyColourProperty(wxT("CustomColourProperty1")) );
-
- pg->SetPropertyHelpString(wxT("CustomColourProperty1"),
- wxT("This is a wxMyColourProperty from the sample app. ")
- wxT("It is built with WX_PG_IMPLEMENT_CUSTOM_COLOUR_PROPERTY_USES_WXCOLOUR macro ")
- wxT("and has wxColour as its data type"));
-
- pg->Append( new wxMyColour2Property(wxT("CustomColourProperty2")) );
-
- pg->SetPropertyHelpString(wxT("CustomColourProperty2"),
- wxT("This is a wxMyColour2Property from the sample app. ")
- wxT("It is built with WX_PG_IMPLEMENT_CUSTOM_COLOUR_PROPERTY macro ")
- wxT("and has wxColourPropertyValue as its data type"));
-
- pg->Append( new MyColourProperty3(wxT("CustomColourProperty3"), wxPG_LABEL, *wxGREEN) );
- pg->GetProperty(wxT("CustomColourProperty3"))->SetFlag(wxPG_PROP_AUTO_UNSPECIFIED);
- pg->SetPropertyEditor( wxT("CustomColourProperty3"), wxPG_EDITOR(ComboBox) );
-
- pg->SetPropertyHelpString(wxT("CustomColourProperty3"),
- wxT("This is a MyColourProperty3 from the sample app. ")
+ pg->SetPropertyHelpString(wxT("CustomColourProperty"),
+ wxT("This is a MyColourProperty from the sample app. ")
wxT("It is built by subclassing wxColourProperty."));
-
- pg->Append( new wxTextStringPropertyWithValidator(wxT("TestProp1"), wxPG_LABEL) );
}
// -----------------------------------------------------------------------
return arr;
}
-static void PropertiesToNames( wxPropertyGridInterface* WXUNUSED(iface),
- wxArrayString* names,
- const wxArrayPGProperty& properties )
-{
- unsigned int i;
- for ( i=0; i<properties.size(); i++ )
- names->Add( properties[i]->GetName() );
-}
-
-static void NamesToProperties( wxPropertyGridInterface* iface,
- wxArrayPGProperty* properties,
- const wxArrayString& names )
-{
- unsigned int i;
- for ( i=0; i<names.size(); i++ )
- {
- wxPGProperty* p = iface->GetPropertyByName(names[i]);
- if ( p )
- properties->push_back(p);
- }
-}
-
bool FormMain::RunTests( bool fullTest, bool interactive )
{
wxString t;
}
}
- {
- RT_START_TEST(GetPropertiesWithFlag)
-
- //
- // Get list of expanded properties
- wxArrayPGProperty array = pgman->GetExpandedProperties();
-
- // Make sure list only has items with children
- for ( i=0; i<array.size(); i++ )
- {
- wxPGProperty* p = array[i];
- if ( !p->IsKindOf(CLASSINFO(wxPGProperty)) )
- RT_FAILURE_MSG(wxString::Format(wxT("'%s' was returned by GetExpandedProperties(), but was not a parent"),p->GetName().c_str()).c_str());
- }
-
- wxArrayString names;
- PropertiesToNames( pgman, &names, array );
-
- //
- // ... and then collapse them
- wxArrayPGProperty array2;
- NamesToProperties( pgman, &array2, names );
-
- for ( i=0; i<array2.size(); i++ )
- {
- wxPGProperty* p = array[i];
- p->SetExpanded(false);
- }
-
- // Make sure everything is collapsed
- wxPGVIterator it;
-
- for ( it = pgman->GetVIterator(wxPG_ITERATE_ALL);
- !it.AtEnd();
- it.Next() )
- {
- wxPGProperty* p = it.GetProperty();
- if ( p->IsExpanded() )
- RT_FAILURE_MSG(wxString::Format(wxT("'%s.%s' was expanded"),p->GetParent()->GetName().c_str(),p->GetName().c_str()).c_str());
- }
-
- pgman->Refresh();
- }
-
{
//
// Delete everything in reverse order
{
//
- // Clear property value
- RT_START_TEST(ClearPropertyValue)
+ // Test property default values
+ RT_START_TEST(Default_Values)
wxPGVIterator it;
!it.AtEnd();
it.Next() )
{
- RT_MSG(wxString::Format(wxT("Clearing value of '%s'"),it.GetProperty()->GetLabel().c_str()));
- pgman->ClearPropertyValue(it.GetProperty());
+ wxPGProperty* p = it.GetProperty();
+ pgman->SetPropertyValue(p, p->GetDefaultValue());
}
// Recreate grid
pgman->SetPropertyValue(wxT("FloatProperty"),1024.0000000001);
pgman->SetPropertyValue(wxT("BoolProperty"),FALSE);
pgman->SetPropertyValue(wxT("EnumProperty"),120);
- pgman->SetPropertyValue(wxT("Custom FlagsProperty"),FLAG_TEST_SET1);
pgman->SetPropertyValue(wxT("ArrayStringProperty"),test_arrstr_1);
wxColour emptyCol;
pgman->SetPropertyValue(wxT("ColourProperty"),emptyCol);
pgman->SetPropertyValue(wxT("ColourProperty"),(wxObject*)wxBLACK);
- pgman->SetPropertyValue(wxT("Size"),wxSize(150,150));
- pgman->SetPropertyValue(wxT("Position"),wxPoint(150,150));
+ pgman->SetPropertyValue(wxT("Size"),WXVARIANT(wxSize(150,150)));
+ pgman->SetPropertyValue(wxT("Position"),WXVARIANT(wxPoint(150,150)));
pgman->SetPropertyValue(wxT("MultiChoiceProperty"),test_arrint_1);
#if wxUSE_DATETIME
pgman->SetPropertyValue(wxT("DateProperty"),dt1);
RT_FAILURE();
if ( pg->GetPropertyValueAsArrayString(wxT("ArrayStringProperty")) != test_arrstr_1 )
RT_FAILURE();
- if ( pg->GetPropertyValueAsLong(wxT("Custom FlagsProperty")) != FLAG_TEST_SET1 )
- RT_FAILURE();
wxColour col;
col << pgman->GetPropertyValue(wxT("ColourProperty"));
if ( col != *wxBLACK )
RT_FAILURE();
- if ( pg->GetPropertyValueAsSize(wxT("Size")) != wxSize(150,150) )
+ if ( wxSizeRefFromVariant(pg->GetPropertyValue(wxT("Size"))) != wxSize(150,150) )
RT_FAILURE();
- if ( pg->GetPropertyValueAsPoint(wxT("Position")) != wxPoint(150,150) )
+ if ( wxPointRefFromVariant(pg->GetPropertyValue(wxT("Position"))) != wxPoint(150,150) )
RT_FAILURE();
if ( !(pg->GetPropertyValueAsArrayInt(wxT("MultiChoiceProperty")) == test_arrint_1) )
RT_FAILURE();
pg->SetPropertyValue(wxT("BoolProperty"),TRUE);
pg->SetPropertyValue(wxT("EnumProperty"),80);
pg->SetPropertyValue(wxT("ArrayStringProperty"),test_arrstr_2);
- pg->SetPropertyValue(wxT("Custom FlagsProperty"),FLAG_TEST_SET2);
pg->SetPropertyValue(wxT("ColourProperty"),(wxObject*)wxWHITE);
- pg->SetPropertyValue(wxT("Size"),wxSize(300,300));
- pg->SetPropertyValue(wxT("Position"),wxPoint(300,300));
+ pg->SetPropertyValue(wxT("Size"),WXVARIANT(wxSize(300,300)));
+ pg->SetPropertyValue(wxT("Position"),WXVARIANT(wxPoint(300,300)));
pg->SetPropertyValue(wxT("MultiChoiceProperty"),test_arrint_2);
#if wxUSE_DATETIME
pg->SetPropertyValue(wxT("DateProperty"),dt2);
RT_FAILURE();
if ( pgman->GetPropertyValueAsArrayString(wxT("ArrayStringProperty")) != test_arrstr_2 )
RT_FAILURE();
- if ( pgman->GetPropertyValueAsLong(wxT("Custom FlagsProperty")) != FLAG_TEST_SET2 )
- RT_FAILURE();
col << pgman->GetPropertyValue(wxT("ColourProperty"));
if ( col != *wxWHITE )
RT_FAILURE();
- if ( pgman->GetPropertyValueAsSize(wxT("Size")) != wxSize(300,300) )
+ if ( wxSizeRefFromVariant(pgman->GetPropertyValue(wxT("Size"))) != wxSize(300,300) )
RT_FAILURE();
- if ( pgman->GetPropertyValueAsPoint(wxT("Position")) != wxPoint(300,300) )
+ if ( wxPointRefFromVariant(pgman->GetPropertyValue(wxT("Position"))) != wxPoint(300,300) )
RT_FAILURE();
if ( !(pgman->GetPropertyValueAsArrayInt(wxT("MultiChoiceProperty")) == test_arrint_2) )
RT_FAILURE();
if ( pgman->GetPropertyValueAsLongLong(wxT("IntProperty")) != wxLL(-80000000000) )
RT_FAILURE();
+ //
+ // Flexible wx(U)LongLong << operator safety conformance tests
+ wxPGProperty* prop;
+ wxLongLong ll;
+ wxULongLong ull;
+
+ prop = pgman->GetProperty(wxT("IntProperty"));
+ prop->SetValue(128);
+ ll << prop->GetValue();
+ if ( ll != 128 )
+ RT_FAILURE();
+
+ prop->SetValue(WXVARIANT(wxLL(68719476736)));
+ ll << prop->GetValue();
+ if ( ll.GetValue() != wxLL(68719476736) )
+ RT_FAILURE();
+
+#if wxUSE_LONGLONG_NATIVE
+ wxLongLong_t ll_t;
+ ll_t << prop->GetValue();
+ if ( ll_t != wxLL(68719476736) )
+ RT_FAILURE();
+#endif
+
+ prop->SetValue(256);
+ ll << prop->GetValue();
+ if ( ll != 256 )
+ RT_FAILURE();
+
+ prop = pgman->GetProperty(wxT("UIntProperty"));
+ prop->SetValue(128);
+ ull << prop->GetValue();
+ if ( ull != 128 )
+ RT_FAILURE();
+
+ prop->SetValue(WXVARIANT(wxULL(68719476739)));
+ ull << prop->GetValue();
+ if ( ull.GetValue() != wxULL(68719476739) )
+ RT_FAILURE();
+
+#if wxUSE_LONGLONG_NATIVE
+ wxULongLong_t ull_t;
+ ull_t << prop->GetValue();
+ if ( ull_t != wxLL(68719476739) )
+ RT_FAILURE();
+#endif
+
+ prop->SetValue(256);
+ ull << prop->GetValue();
+ if ( ull != 256 )
+ RT_FAILURE();
+
// Make sure children of composite parent get updated as well
// Original string value: "Lamborghini Diablo SV; 5707; [300; 3.9; 8.6] 300000"
pgman->SetPropertyValueUnspecified(wxT("BoolProperty"));
pgman->SetPropertyValueUnspecified(wxT("EnumProperty"));
pgman->SetPropertyValueUnspecified(wxT("ArrayStringProperty"));
- pgman->SetPropertyValueUnspecified(wxT("Custom FlagsProperty"));
pgman->SetPropertyValueUnspecified(wxT("ColourProperty"));
pgman->SetPropertyValueUnspecified(wxT("Size"));
pgman->SetPropertyValueUnspecified(wxT("Position"));
#endif
}
+ {
+ RT_START_TEST(Attributes)
+
+ wxPGProperty* prop = pgman->GetProperty(wxT("StringProperty"));
+ prop->SetAttribute(wxT("Dummy Attribute"), (long)15);
+
+ if ( prop->GetAttribute(wxT("Dummy Attribute")).GetLong() != 15 )
+ RT_FAILURE();
+
+ prop->SetAttribute(wxT("Dummy Attribute"), wxVariant());
+
+ if ( !prop->GetAttribute(wxT("Dummy Attribute")).IsNull() )
+ RT_FAILURE();
+ }
+
{
wxPropertyGridPage* page1;
wxPropertyGridPage* page2;
OnColourScheme(evt);
}
- {
- // Test ClearPropertyValue
- RT_START_TEST(ClearPropertyValue)
-
- for ( i=0; i<3; i++ )
- {
- wxPropertyGridPage* page = pgman->GetPage(i);
-
- // Iterate over all properties.
- wxPropertyGridIterator it;
-
- for ( it = page->GetIterator();
- !it.AtEnd();
- it++ )
- {
- wxLogDebug((*it)->GetLabel());
- pgman->ClearPropertyValue( *it );
- }
- }
-
- }
-
{
RT_START_TEST(ManagerClear)
pgman->Clear();
projects / wxWidgets.git / blobdiff