ID_INSERTPROP,
ID_INSERTCAT,
ID_ENABLE,
+ ID_SETREADONLY,
ID_HIDE,
ID_DELETE,
ID_DELETER,
EVT_MENU( ID_UNSPECIFY, FormMain::OnMisc )
EVT_MENU( ID_DELETEALL, FormMain::OnClearClick )
EVT_MENU( ID_ENABLE, FormMain::OnEnableDisable )
- EVT_MENU( ID_HIDE, FormMain::OnHideShow )
+ EVT_MENU( ID_SETREADONLY, FormMain::OnSetReadOnly )
+ EVT_MENU( ID_HIDE, FormMain::OnHide )
EVT_MENU( ID_ITERATE1, FormMain::OnIterate1Click )
EVT_MENU( ID_ITERATE2, FormMain::OnIterate2Click )
wxPGProperty* property = event.GetProperty();
const wxString& name = property->GetName();
- wxVariant value = property->GetValue();
+
+ // Properties store values internally as wxVariants, but it is preferred
+ // to use the more modern wxAny at the interface level
+ wxAny value = property->GetValue();
// Don't handle 'unspecified' values
if ( value.IsNull() )
return;
+ //
+ // FIXME-VC6: In order to compile on Visual C++ 6.0, wxANY_AS()
+ // macro is used. Unless you want to support this old
+ // compiler in your own code, you can use the more
+ // nicer form value.As<FOO>() instead of
+ // wxANY_AS(value, FOO).
+ //
+
// Some settings are disabled outside Windows platform
if ( name == wxT("X") )
- SetSize ( m_pPropGridManager->GetPropertyValueAsInt(property), -1, -1, -1, wxSIZE_USE_EXISTING );
+ SetSize( wxANY_AS(value, int), -1, -1, -1, wxSIZE_USE_EXISTING );
else if ( name == wxT("Y") )
// wxPGVariantToInt is safe long int value getter
- SetSize ( -1, value.GetLong(), -1, -1, wxSIZE_USE_EXISTING );
+ SetSize ( -1, wxANY_AS(value, int), -1, -1, wxSIZE_USE_EXISTING );
else if ( name == wxT("Width") )
- SetSize ( -1, -1, m_pPropGridManager->GetPropertyValueAsInt(property), -1, wxSIZE_USE_EXISTING );
+ SetSize ( -1, -1, wxANY_AS(value, int), -1, wxSIZE_USE_EXISTING );
else if ( name == wxT("Height") )
- SetSize ( -1, -1, -1, value.GetLong(), wxSIZE_USE_EXISTING );
+ SetSize ( -1, -1, -1, wxANY_AS(value, int), wxSIZE_USE_EXISTING );
else if ( name == wxT("Label") )
{
- SetTitle ( m_pPropGridManager->GetPropertyValueAsString(property) );
+ SetTitle( wxANY_AS(value, wxString) );
}
else if ( name == wxT("Password") )
{
else
if ( name == wxT("Font") )
{
- wxFont font;
- font << value;
+ wxFont font = wxANY_AS(value, wxFont);
wxASSERT( font.Ok() );
m_pPropGridManager->SetFont( font );
else
if ( name == wxT("Margin Colour") )
{
- wxColourPropertyValue cpv;
- cpv << value;
+ wxColourPropertyValue cpv = wxANY_AS(value, wxColourPropertyValue);
m_pPropGridManager->GetGrid()->SetMarginColour( cpv.m_colour );
}
else if ( name == wxT("Cell Colour") )
{
- wxColourPropertyValue cpv;
- cpv << value;
+ wxColourPropertyValue cpv = wxANY_AS(value, wxColourPropertyValue);
m_pPropGridManager->GetGrid()->SetCellBackgroundColour( cpv.m_colour );
}
else if ( name == wxT("Line Colour") )
{
- wxColourPropertyValue cpv;
- cpv << value;
+ wxColourPropertyValue cpv = wxANY_AS(value, wxColourPropertyValue);
m_pPropGridManager->GetGrid()->SetLineColour( cpv.m_colour );
}
else if ( name == wxT("Cell Text Colour") )
{
- wxColourPropertyValue cpv;
- cpv << value;
+ wxColourPropertyValue cpv = wxANY_AS(value, wxColourPropertyValue);
m_pPropGridManager->GetGrid()->SetCellTextColour( cpv.m_colour );
}
}
wxPropertyGridManager* pgman = m_pPropGridManager;
wxPropertyGridPage* pg = pgman->GetPage(wxT("wxWidgets Library Config"));
+ // Set custom column proportions (here in the sample app we need
+ // to check if the grid has wxPG_SPLITTER_AUTO_CENTER style. You usually
+ // need not to do it in your application).
+ if ( pgman->HasFlag(wxPG_SPLITTER_AUTO_CENTER) )
+ {
+ pg->SetColumnProportion(0, 3);
+ pg->SetColumnProportion(1, 1);
+ }
+
wxPGProperty* cat;
wxBitmap bmp = wxArtProvider::GetBitmap(wxART_REPORT_VIEW);
ADD_WX_LIB_CONF_GROUP(wxT("Unicode Support"))
ADD_WX_LIB_CONF( wxUSE_UNICODE )
ADD_WX_LIB_CONF( wxUSE_UNICODE_MSLU )
- ADD_WX_LIB_CONF( wxUSE_WCHAR_T )
ADD_WX_LIB_CONF_GROUP(wxT("Global Features"))
ADD_WX_LIB_CONF( wxUSE_EXCEPTIONS )
m_itemEnable = menuTools1->Append(ID_ENABLE, wxT("Enable"),
wxT("Toggles item's enabled state.") );
m_itemEnable->Enable( FALSE );
- menuTools1->Append(ID_HIDE, wxT("Hide"), wxT("Shows or hides a property") );
+ menuTools1->Append(ID_HIDE, "Hide", "Hides a property" );
+ menuTools1->Append(ID_SETREADONLY, "Set as Read-Only",
+ "Set property as read-only" );
menuTools2->Append(ID_ITERATE1, wxT("Iterate Over Properties") );
menuTools2->Append(ID_ITERATE2, wxT("Iterate Over Visible Items") );
// -----------------------------------------------------------------------
-void FormMain::OnHideShow( wxCommandEvent& WXUNUSED(event) )
+void FormMain::OnSetReadOnly( wxCommandEvent& WXUNUSED(event) )
{
- wxPGProperty* id = m_pPropGridManager->GetGrid()->GetSelection();
- if ( !id )
+ wxPGProperty* p = m_pPropGridManager->GetGrid()->GetSelection();
+ if ( !p )
{
wxMessageBox(wxT("First select a property."));
return;
}
+ m_pPropGridManager->SetPropertyReadOnly(p);
+}
- if ( m_pPropGridManager->IsPropertyShown( id ) )
- {
- m_pPropGridManager->HideProperty( id, true );
- m_itemEnable->SetItemLabel( wxT("Show") );
- }
- else
- {
- m_pPropGridManager->HideProperty( id, false );
- m_itemEnable->SetItemLabel( wxT("Hide") );
- }
-
- wxPropertyGridPage* curPage = m_pPropGridManager->GetCurrentPage();
-
- // Check for bottomY precalculation validity
- unsigned int byPre = curPage->GetVirtualHeight();
- unsigned int byAct = curPage->GetActualVirtualHeight();
+// -----------------------------------------------------------------------
- if ( byPre != byAct )
+void FormMain::OnHide( wxCommandEvent& WXUNUSED(event) )
+{
+ wxPGProperty* id = m_pPropGridManager->GetGrid()->GetSelection();
+ if ( !id )
{
- wxLogDebug(wxT("VirtualHeight is %u, should be %u"), byPre, byAct);
+ wxMessageBox(wxT("First select a property."));
+ return;
}
+
+ m_pPropGridManager->HideProperty( id, true );
}
// -----------------------------------------------------------------------
projects / wxWidgets.git / blobdiff