// Author: Jaakko Salli
// Modified by:
// Created: 2008-08-24
-// RCS-ID: $Id:
+// RCS-ID: $Id$
// Copyright: (c) Jaakko Salli
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#pragma hdrstop
#endif
+#if wxUSE_PROPGRID
+
#ifndef WX_PRECOMP
#include "wx/defs.h"
#include "wx/object.h"
#include "wx/button.h"
#include "wx/pen.h"
#include "wx/brush.h"
- #include "wx/cursor.h"
- #include "wx/dialog.h"
#include "wx/settings.h"
- #include "wx/msgdlg.h"
- #include "wx/choice.h"
- #include "wx/stattext.h"
- #include "wx/scrolwin.h"
- #include "wx/dirdlg.h"
- #include "wx/layout.h"
#include "wx/sizer.h"
- #include "wx/textdlg.h"
- #include "wx/filedlg.h"
- #include "wx/statusbr.h"
#include "wx/intl.h"
- #include "wx/frame.h"
#endif
-#include <wx/propgrid/property.h>
-#include <wx/propgrid/propgrid.h>
-
-#include <typeinfo>
+#include "wx/propgrid/property.h"
+#include "wx/propgrid/propgrid.h"
const wxChar *wxPGTypeName_long = wxT("long");
// VariantDatas
// ----------------------------------------------------------------------------
-WX_PG_IMPLEMENT_VARIANT_DATA(wxPGVariantDataPoint, wxPoint)
-WX_PG_IMPLEMENT_VARIANT_DATA(wxPGVariantDataSize, wxSize)
-WX_PG_IMPLEMENT_VARIANT_DATA(wxPGVariantDataArrayInt, wxArrayInt)
-WX_PG_IMPLEMENT_VARIANT_DATA(wxPGVariantDataLongLong, wxLongLong)
-WX_PG_IMPLEMENT_VARIANT_DATA(wxPGVariantDataULongLong, wxULongLong)
+WX_PG_IMPLEMENT_VARIANT_DATA_EXPORTED(wxPoint, WXDLLIMPEXP_PROPGRID)
+WX_PG_IMPLEMENT_VARIANT_DATA_EXPORTED(wxSize, WXDLLIMPEXP_PROPGRID)
+WX_PG_IMPLEMENT_VARIANT_DATA_EXPORTED_DUMMY_EQ(wxArrayInt, WXDLLIMPEXP_PROPGRID)
-WX_PG_IMPLEMENT_WXOBJECT_VARIANT_DATA(wxPGVariantDataFont, wxFont)
-
-wxObject* wxPG_VariantToWxObject( const wxVariant& variant, wxClassInfo* classInfo )
+// For wxLongLong and wxULongLong have custom classname << variant
+// implementation for improved flexibility.
+WX_PG_IMPLEMENT_VARIANT_DATA_EXPORTED_NO_EQ_NO_GETTER(wxLongLong, WXDLLIMPEXP_PROPGRID)
+WX_PG_IMPLEMENT_VARIANT_DATA_EQ(wxLongLong, WXDLLIMPEXP_PROPGRID)
+WXDLLIMPEXP_PROPGRID wxLongLong& operator << ( wxLongLong &value, const wxVariant &variant )
{
- if ( !variant.IsValueKindOf(classInfo) )
- return (wxObject*) NULL;
-
- wxVariantData* vdata = variant.GetData();
-
- wxPGVariantData* pgvdata = wxDynamicCastVariantData(vdata, wxPGVariantData);
- if ( pgvdata )
- return (wxObject*) pgvdata->GetValuePtr();
-
- if ( wxPGIsVariantClassInfo(wxPGVariantDataGetClassInfo(vdata), wxobject) )
- return variant.GetWxObjectPtr();
+ wxLongLong_t ll;
+ if ( !wxPGVariantToLongLong(variant, &ll) )
+ {
+ wxFAIL_MSG("Cannot convert to wxLongLong");
+ }
+ value = ll;
+ return value;
+}
+WXDLLIMPEXP_PROPGRID wxLongLong_t& operator << ( wxLongLong_t &value, const wxVariant &variant )
+{
+ if ( !wxPGVariantToLongLong(variant, &value) )
+ {
+ wxFAIL_MSG("Cannot convert to wxLongLong");
+ }
+ return value;
+}
- return (wxObject*) NULL;
+WX_PG_IMPLEMENT_VARIANT_DATA_EXPORTED_NO_EQ_NO_GETTER(wxULongLong, WXDLLIMPEXP_PROPGRID)
+WX_PG_IMPLEMENT_VARIANT_DATA_EQ(wxULongLong, WXDLLIMPEXP_PROPGRID)
+WXDLLIMPEXP_PROPGRID wxULongLong& operator << ( wxULongLong &value, const wxVariant &variant )
+{
+ wxULongLong_t ull;
+ if ( !wxPGVariantToULongLong(variant, &ull) )
+ {
+ wxFAIL_MSG("Cannot convert to wxULongLong");
+ }
+ value = ull;
+ return value;
+}
+WXDLLIMPEXP_PROPGRID wxULongLong_t& operator << ( wxULongLong_t &value, const wxVariant &variant )
+{
+ if ( !wxPGVariantToULongLong(variant, &value) )
+ {
+ wxFAIL_MSG("Cannot convert to wxULongLong");
+ }
+ return value;
}
+IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxFont, WXDLLIMPEXP_PROPGRID)
+
// -----------------------------------------------------------------------
// wxVariant helpers
// -----------------------------------------------------------------------
if ( variant.IsNull() )
return defVal;
- if ( wxPGIsVariantType(variant, long) )
+ if ( variant.GetType() == wxS("long") )
return variant.GetLong();
- if ( wxPGIsVariantType(variant, bool) )
+ if ( variant.GetType() == wxS("bool") )
return variant.GetBool() ? 1 : 0;
- if ( typeid(*variant.GetData()) == typeid(wxPGVariantDataLongLong) )
+ if ( variant.GetType() == wxS("wxLongLong") )
{
- wxLongLong ll = ((const wxPGVariantDataLongLong&)variant).GetValue();
+ wxLongLong ll;
+ ll << variant;
if ( ll >= LONG_MAX )
return LONG_MAX;
else if ( ll <= LONG_MIN )
long l = defVal;
- if ( wxPGIsVariantType(variant, string) )
+ if ( variant.GetType() == wxPG_VARIANT_TYPE_STRING )
variant.GetString().ToLong(&l, 0);
return l;
if ( variant.IsNull() )
return false;
- if ( wxPGIsVariantType(variant, long) )
+ wxString variantType = variant.GetType();
+
+ if ( variantType == wxPG_VARIANT_TYPE_LONG )
{
*pResult = variant.GetLong();
return true;
}
- if ( typeid(*variant.GetData()) == typeid(wxPGVariantDataLongLong) )
+ if ( variantType == wxLongLong_VariantType )
{
- *pResult = ((const wxPGVariantDataLongLong&)variant).GetValue().GetValue();
+ // NOTE: << operator uses this functions, so we can't use it here
+ *pResult = wxLongLongRefFromVariant(variant).GetValue();
return true;
}
if ( variant.IsNull() )
return false;
- if ( wxPGIsVariantType(variant, long) )
+ wxString variantType = variant.GetType();
+
+ if ( variantType == wxPG_VARIANT_TYPE_LONG )
{
*pResult = (unsigned long)variant.GetLong();
return true;
}
- if ( typeid(*variant.GetData()) == typeid(wxPGVariantDataULongLong) )
+ if ( variantType == wxULongLong_VariantType )
{
- *pResult = ((const wxPGVariantDataULongLong&)variant).GetValue().GetValue();
+ // NOTE: << operator uses this functions, so we can't use it here
+ *pResult = wxULongLongRefFromVariant(variant).GetValue();
return true;
}
if ( variant.IsNull() )
return false;
- if ( wxPGIsVariantType(variant, double) )
+ wxString variantType = variant.GetType();
+
+ if ( variantType == wxPG_VARIANT_TYPE_DOUBLE )
{
*pResult = variant.GetDouble();
return true;
}
- if ( wxPGIsVariantType(variant, long) )
+ if ( variantType == wxPG_VARIANT_TYPE_LONG )
{
*pResult = (double)variant.GetLong();
return true;
}
- if ( typeid(*variant.GetData()) == typeid(wxPGVariantDataLongLong) )
+ if ( variantType == wxLongLong_VariantType )
{
- wxLongLong ll = ((const wxPGVariantDataLongLong&)variant).GetValue();
+ wxLongLong ll;
+ ll << variant;
*pResult = ll.ToDouble();
return true;
}
- if ( wxPGIsVariantType(variant, string) )
+ if ( variantType == wxPG_VARIANT_TYPE_STRING )
if ( variant.GetString().ToDouble(pResult) )
return true;
}
// -----------------------------------------------------------------------
-// Choice related methods
-// -----------------------------------------------------------------------
-
-void wxPropertyGridInterface::AddPropertyChoice( wxPGPropArg id,
- const wxString& label,
- int value )
-{
- wxPG_PROP_ARG_CALL_PROLOG()
-
- p->InsertChoice(label,-1,value);
-}
-
-
-void wxPropertyGridInterface::InsertPropertyChoice( wxPGPropArg id,
- const wxString& label,
- int index,
- int value )
-{
- wxPG_PROP_ARG_CALL_PROLOG()
-
- p->InsertChoice(label,index,value);
-}
-
-
-void wxPropertyGridInterface::DeletePropertyChoice( wxPGPropArg id,
- int index )
-{
- wxPG_PROP_ARG_CALL_PROLOG()
-
- p->DeleteChoice(index);
-}
-
+// wxPropertyGridInterface
// -----------------------------------------------------------------------
void wxPropertyGridInterface::RefreshGrid( wxPropertyGridPageState* state )
wxPGProperty* wxPropertyGridInterface::Insert( wxPGPropArg id, wxPGProperty* property )
{
wxPG_PROP_ARG_CALL_PROLOG_RETVAL(wxNullProperty)
- wxPGProperty* retp = m_pState->DoInsert(p->GetParent(), p->GetArrIndex(), property);
+ wxPGProperty* retp = m_pState->DoInsert(p->GetParent(), p->GetIndexInParent(), property);
RefreshGrid();
return retp;
}
p->GetParentState()->DoSetPropertyValueUnspecified(p);
}
+// -----------------------------------------------------------------------
+
+void wxPropertyGridInterface::ClearModifiedStatus()
+{
+ unsigned int pageIndex = 0;
+
+ for (;;)
+ {
+ wxPropertyGridPageState* page = GetPageState(pageIndex);
+ if ( !page ) break;
+
+ page->DoGetRoot()->SetFlagRecursively(wxPG_PROP_MODIFIED, false);
+
+ pageIndex++;
+ }
+}
+
// -----------------------------------------------------------------------
// wxPropertyGridInterface property value setting and getting
// -----------------------------------------------------------------------
-void wxPGGetFailed( const wxPGProperty* p, const wxChar* typestr )
+void wxPGGetFailed( const wxPGProperty* p, const wxString& typestr )
{
- wxPGTypeOperationFailed(p,typestr,wxT("Get"));
+ wxPGTypeOperationFailed(p, typestr, wxS("Get"));
}
// -----------------------------------------------------------------------
-void wxPGTypeOperationFailed( const wxPGProperty* p, const wxChar* typestr,
- const wxChar* op )
+void wxPGTypeOperationFailed( const wxPGProperty* p,
+ const wxString& typestr,
+ const wxString& op )
{
wxASSERT( p != NULL );
wxLogError( _("Type operation \"%s\" failed: Property labeled \"%s\" is of type \"%s\", NOT \"%s\"."),
- op,p->GetLabel().c_str(),p->GetValue().GetType().c_str(),typestr );
+ op.c_str(), p->GetLabel().c_str(), p->GetValue().GetType().c_str(), typestr.c_str() );
}
// -----------------------------------------------------------------------
// -----------------------------------------------------------------------
+void wxPropertyGridInterface::SetPropertyAttributeAll( const wxString& attrName,
+ wxVariant value )
+{
+ unsigned int pageIndex = 0;
+
+ for (;;)
+ {
+ wxPropertyGridPageState* page = GetPageState(pageIndex);
+ if ( !page ) break;
+
+ DoSetPropertyAttribute(page->DoGetRoot(), attrName, value, wxPG_RECURSE);
+
+ pageIndex++;
+ }
+}
+
+// -----------------------------------------------------------------------
+
void wxPropertyGridInterface::GetPropertiesWithFlag( wxArrayPGProperty* targetArr,
wxPGProperty::FlagType flags,
bool inverse,
// -----------------------------------------------------------------------
-void wxPropertyGridInterface::SetPropertiesFlag( const wxArrayPGProperty& srcArr,
- wxPGProperty::FlagType flags,
- bool inverse )
-{
- unsigned int i;
-
- for ( i=0; i<srcArr.size(); i++ )
- {
- wxPGProperty* property = srcArr[i];
-
- if ( !inverse )
- property->SetFlag(flags);
- else
- property->ClearFlag(flags);
- }
-
- // If collapsed flag or hidden was manipulated, we need to update virtual
- // size.
- wxPropertyGrid* pg = GetPropertyGrid();
- if ( flags & (wxPG_PROP_COLLAPSED|wxPG_PROP_HIDDEN) )
- {
- GetState()->VirtualHeightChanged();
- pg->RecalculateVirtualSize();
- }
-}
-
-// -----------------------------------------------------------------------
-
void wxPropertyGridInterface::SetBoolChoices( const wxString& trueChoice,
const wxString& falseChoice )
{
// -----------------------------------------------------------------------
-wxPGChoices gs_emptyChoices;
-
-wxPGChoices& wxPropertyGridInterface::GetPropertyChoices( wxPGPropArg id )
-{
- wxPG_PROP_ARG_CALL_PROLOG_RETVAL(gs_emptyChoices)
-
- wxPGChoiceInfo ci;
- ci.m_choices = (wxPGChoices*) NULL;
-
- p->GetChoiceInfo(&ci);
-
- if ( !ci.m_choices )
- return gs_emptyChoices;
-
- return *ci.m_choices;
-}
-
-// -----------------------------------------------------------------------
-
wxPGProperty* wxPropertyGridInterface::DoGetPropertyByName( const wxString& name ) const
{
return m_pState->BaseGetPropertyByName(name);
IMPLEMENT_GET_VALUE(long,long,Long,0)
IMPLEMENT_GET_VALUE(double,double,Double,0.0)
-IMPLEMENT_GET_VALUE(void,void*,VoidPtr,NULL)
-
-// wxObject is different than others.
-wxObject* wxPropertyGridInterface::GetPropertyValueAsWxObjectPtr( wxPGPropArg id ) const
-{
- wxPG_PROP_ARG_CALL_PROLOG_RETVAL((wxObject*)NULL)
-
- wxVariant value = p->GetValue();
- wxVariantData* vdata = value.GetData();
-
- if ( !vdata->GetValueClassInfo() )
- return (wxObject*) NULL;
-
- wxPGVariantData* pgvdata = wxDynamicCastVariantData(vdata, wxPGVariantData);
- if ( pgvdata )
- return (wxObject*) pgvdata->GetValuePtr();
-
- if ( wxPGIsVariantClassInfo(wxPGVariantDataGetClassInfo(vdata), wxobject) )
- return (wxObject*) value.GetWxObjectPtr();
-
- return (wxObject*) NULL;
-}
-
-// -----------------------------------------------------------------------
bool wxPropertyGridInterface::IsPropertyExpanded( wxPGPropArg id ) const
{
//
// Save state on page basis
- size_t pageIndex = 0;
- wxPropertyGridPageState* pageState = GetPageState(pageIndex);
+ unsigned int pageIndex = 0;
wxArrayPtrVoid pageStates;
- while ( pageState )
+
+ for (;;)
{
- pageStates.Add(pageState);
- pageIndex += 1;
- pageState = GetPageState(pageIndex);
+ wxPropertyGridPageState* page = GetPageState(pageIndex);
+ if ( !page ) break;
+
+ pageStates.Add(page);
+
+ pageIndex++;
}
for ( pageIndex=0; pageIndex < pageStates.size(); pageIndex++ )
else
result += wxS("0;");
}
+ if ( includedStates & DescBoxState )
+ {
+ wxVariant v = GetEditableStateItem(wxS("descboxheight"));
+ if ( !v.IsNull() )
+ result += wxString::Format(wxS("descboxheight=%i;"), (int)v.GetLong());
+ }
result.RemoveLast(); // Remove last semicolon
result += wxS("|");
}
}
}
}
+ else if ( key == wxS("descboxheight") )
+ {
+ if ( restoreStates & DescBoxState )
+ {
+ long descBoxHeight;
+ if ( values.size() == 1 && values[0].ToLong(&descBoxHeight) )
+ {
+ SetEditableStateItem(wxS("descboxheight"), descBoxHeight);
+ }
+ else
+ {
+ res = false;
+ }
+ }
+ }
else
{
res = false;
return res;
}
+#endif // wxUSE_PROPGRID
+
projects / wxWidgets.git / blobdiff