// Created: 2004-09-25
// RCS-ID: $Id$
// Copyright: (c) Jaakko Salli
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
//
#include <wx/artprov.h>
-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
#include "../sample.xpm"
#endif
wxWindow* ctrl,
wxEvent& event ) const
{
- if ( event.GetEventType() == wxEVT_COMMAND_BUTTON_CLICKED )
+ if ( event.GetEventType() == wxEVT_BUTTON )
{
wxPGMultiButton* buttons = (wxPGMultiButton*) propGrid->GetEditorControlSecondary();
#endif // wxUSE_VALIDATORS
-// -----------------------------------------------------------------------
-// AdvImageFile Property
-// -----------------------------------------------------------------------
-
-class wxMyImageInfo;
-
-WX_DECLARE_OBJARRAY(wxMyImageInfo, wxArrayMyImageInfo);
-
-class wxMyImageInfo
-{
-public:
- wxString m_path;
- wxBitmap* m_pThumbnail1; // smaller thumbnail
- wxBitmap* m_pThumbnail2; // larger thumbnail
-
- wxMyImageInfo ( const wxString& str )
- {
- m_path = str;
- m_pThumbnail1 = (wxBitmap*) NULL;
- m_pThumbnail2 = (wxBitmap*) NULL;
- }
- virtual ~wxMyImageInfo()
- {
- if ( m_pThumbnail1 )
- delete m_pThumbnail1;
- if ( m_pThumbnail2 )
- delete m_pThumbnail2;
- }
-
-};
-
-
-#include <wx/arrimpl.cpp>
-WX_DEFINE_OBJARRAY(wxArrayMyImageInfo);
-
-wxArrayMyImageInfo g_myImageArray;
-
-
-// Preferred thumbnail height.
-#define PREF_THUMBNAIL_HEIGHT 64
-
-
-wxPGChoices wxAdvImageFileProperty::ms_choices;
-
-WX_PG_IMPLEMENT_PROPERTY_CLASS(wxAdvImageFileProperty,wxFileProperty,
- wxString,const wxString&,ChoiceAndButton)
-
-
-wxAdvImageFileProperty::wxAdvImageFileProperty( const wxString& label,
- const wxString& name,
- const wxString& value)
- : wxFileProperty(label,name,value)
-{
- m_wildcard = wxPGGetDefaultImageWildcard();
-
- m_index = -1;
-
- m_pImage = (wxImage*) NULL;
-
- // Only show names.
- m_flags &= ~(wxPG_PROP_SHOW_FULL_FILENAME);
-}
-
-wxAdvImageFileProperty::~wxAdvImageFileProperty ()
-{
- // Delete old image
- if ( m_pImage )
- {
- delete m_pImage;
- m_pImage = (wxImage*) NULL;
- }
-}
-
-void wxAdvImageFileProperty::OnSetValue()
-{
- wxFileProperty::OnSetValue();
-
- // Delete old image
- if ( m_pImage )
- {
- delete m_pImage;
- m_pImage = (wxImage*) NULL;
- }
-
- wxString imagename = GetValueAsString(0);
-
- if ( imagename.length() )
- {
- wxFileName filename = GetFileName();
- size_t prevCount = g_myImageArray.GetCount();
- int index = ms_choices.Index(imagename);
-
- // If not in table, add now.
- if ( index == wxNOT_FOUND )
- {
- ms_choices.Add( imagename );
- g_myImageArray.Add( new wxMyImageInfo( filename.GetFullPath() ) );
-
- index = g_myImageArray.GetCount() - 1;
- }
-
- // If no thumbnail ready, then need to load image.
- if ( !g_myImageArray[index].m_pThumbnail2 )
- {
- // Load if file exists.
- if ( filename.FileExists() )
- m_pImage = new wxImage( filename.GetFullPath() );
- }
-
- m_index = index;
-
- wxPropertyGrid* pg = GetGrid();
- wxWindow* control = pg->GetEditorControl();
-
- if ( pg->GetSelection() == this && control )
- {
- wxString name = GetValueAsString(0);
-
- if ( g_myImageArray.GetCount() != prevCount )
- {
- wxASSERT( g_myImageArray.GetCount() == (prevCount+1) );
-
- // Add to the control's array.
- // (should be added to own array earlier)
-
- if ( control )
- GetEditorClass()->InsertItem(control, name, -1);
- }
-
- if ( control )
- GetEditorClass()->UpdateControl(this, control);
- }
- }
- else
- m_index = -1;
-}
-
-bool wxAdvImageFileProperty::IntToValue( wxVariant& variant, int number, int WXUNUSED(argFlags) ) const
-{
- wxASSERT( number >= 0 );
- return StringToValue( variant, ms_choices.GetLabel(number), wxPG_FULL_VALUE );
-}
-
-bool wxAdvImageFileProperty::OnEvent( wxPropertyGrid* propgrid, wxWindow* primary,
- wxEvent& event )
-{
- if ( propgrid->IsMainButtonEvent(event) )
- {
- return wxFileProperty::OnEvent(propgrid,primary,event);
- }
- return false;
-}
-
-wxSize wxAdvImageFileProperty::OnMeasureImage( int item ) const
-{
- if ( item == -1 )
- return wxPG_DEFAULT_IMAGE_SIZE;
-
- return wxSize(PREF_THUMBNAIL_HEIGHT,PREF_THUMBNAIL_HEIGHT);
-}
-
-void wxAdvImageFileProperty::LoadThumbnails( size_t index )
-{
- wxMyImageInfo& mii = g_myImageArray[index];
-
- if ( !mii.m_pThumbnail2 )
- {
- wxFileName filename = GetFileName();
-
- if ( !m_pImage || !m_pImage->Ok() ||
- filename != mii.m_path
- )
- {
- if ( m_pImage )
- delete m_pImage;
- m_pImage = new wxImage( mii.m_path );
- }
-
- if ( m_pImage && m_pImage->Ok() )
- {
- int im_wid = m_pImage->GetWidth();
- int im_hei = m_pImage->GetHeight();
- if ( im_hei > PREF_THUMBNAIL_HEIGHT )
- {
- // TNW = (TNH*IW)/IH
- im_wid = (PREF_THUMBNAIL_HEIGHT*m_pImage->GetWidth())/m_pImage->GetHeight();
- im_hei = PREF_THUMBNAIL_HEIGHT;
- }
-
- m_pImage->Rescale( im_wid, im_hei );
-
- mii.m_pThumbnail2 = new wxBitmap( *m_pImage );
-
- wxSize cis = GetParentState()->GetGrid()->GetImageSize();
- m_pImage->Rescale ( cis.x, cis.y );
-
- mii.m_pThumbnail1 = new wxBitmap( *m_pImage );
-
- }
-
- if ( m_pImage )
- {
- delete m_pImage;
- m_pImage = (wxImage*) NULL;
- }
- }
-}
-
-void wxAdvImageFileProperty::OnCustomPaint( wxDC& dc,
- const wxRect& rect,
- wxPGPaintData& pd )
-{
- int index = m_index;
- if ( pd.m_choiceItem >= 0 )
- index = pd.m_choiceItem;
-
- //wxLogDebug(wxT("%i"),index);
-
- if ( index >= 0 )
- {
- LoadThumbnails(index);
-
- // Is this a measure item call?
- if ( rect.x < 0 )
- {
- // Variable height
- //pd.m_drawnHeight = PREF_THUMBNAIL_HEIGHT;
- wxBitmap* pBitmap = (wxBitmap*)g_myImageArray[index].m_pThumbnail2;
- if ( pBitmap )
- pd.m_drawnHeight = pBitmap->GetHeight();
- else
- pd.m_drawnHeight = 16;
- return;
- }
-
- // Draw the thumbnail
-
- wxBitmap* pBitmap;
-
- if ( pd.m_choiceItem >= 0 )
- pBitmap = (wxBitmap*)g_myImageArray[index].m_pThumbnail2;
- else
- pBitmap = (wxBitmap*)g_myImageArray[index].m_pThumbnail1;
-
- if ( pBitmap )
- {
- dc.DrawBitmap ( *pBitmap, rect.x, rect.y, FALSE );
-
- // Tell the caller how wide we drew.
- pd.m_drawnWidth = pBitmap->GetWidth();
-
- return;
- }
- }
-
- // No valid file - just draw a white box.
- dc.SetBrush ( *wxWHITE_BRUSH );
- dc.DrawRectangle ( rect );
-}
-
-
// -----------------------------------------------------------------------
// wxVectorProperty
// -----------------------------------------------------------------------
wxString s = ::wxGetSingleChoice(wxT("Message"),
wxT("Caption"),
m_choices.GetLabels());
- if ( s.length() )
+ if ( !s.empty() )
{
SetValue(s);
return true;
ID_RUNMINIMAL,
ID_ENABLELABELEDITING,
ID_VETOCOLDRAG,
- ID_SHOWHEADER
+ ID_SHOWHEADER,
+ ID_ONEXTENDEDKEYNAV
};
// -----------------------------------------------------------------------
EVT_MENU( ID_DELETEALL, FormMain::OnClearClick )
EVT_MENU( ID_ENABLE, FormMain::OnEnableDisable )
EVT_MENU( ID_SETREADONLY, FormMain::OnSetReadOnly )
- EVT_MENU( ID_HIDE, FormMain::OnHideShow )
+ EVT_MENU( ID_HIDE, FormMain::OnHide )
EVT_MENU( ID_ITERATE1, FormMain::OnIterate1Click )
EVT_MENU( ID_ITERATE2, FormMain::OnIterate2Click )
EVT_MENU( ID_ITERATE3, FormMain::OnIterate3Click )
EVT_MENU( ID_ITERATE4, FormMain::OnIterate4Click )
+ EVT_MENU( ID_ONEXTENDEDKEYNAV, FormMain::OnExtendedKeyNav )
EVT_MENU( ID_SETBGCOLOUR, FormMain::OnSetBackgroundColour )
EVT_MENU( ID_SETBGCOLOURRECUR, FormMain::OnSetBackgroundColour )
EVT_MENU( ID_CLEARMODIF, FormMain::OnClearModifyStatusClick )
event.Veto();
// Since we ask a question, it is better if we omit any validation
- // failure behavior.
+ // failure behaviour.
event.SetValidationFailureBehavior(0);
}
}
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;
- wxASSERT( font.Ok() );
+ wxFont font = wxANY_AS(value, wxFont);
+ wxASSERT( font.IsOk() );
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 );
}
}
pg->SetPropertyAttribute(wxT("Y"), wxPG_ATTR_UNITS, wxT("Pixels") );
pg->SetPropertyHelpString(wxT("Y"), wxT("This property uses \"Units\" attribute.") );
- const wxChar* disabledHelpString = wxT("This property is simply disabled. Inorder to have label disabled as well, ")
+ const wxChar* disabledHelpString = wxT("This property is simply disabled. In order to have label disabled as well, ")
wxT("you need to set wxPG_EX_GREY_LABEL_WHEN_DISABLED using SetExtraStyle.");
pg->Append( new wxPropertyCategory(wxT("Environment"),wxPG_LABEL) );
wxT("with custom action (dir dialog popup) defined.")
);
- pg->Append( new wxAdvImageFileProperty(wxT("AdvImageFileProperty"),wxPG_LABEL) );
- pg->SetPropertyHelpString( wxT("AdvImageFileProperty"),
- wxT("This demonstrates wxAdvImageFileProperty class defined in this sample app. ")
- wxT("Button can be used to add new images to the popup list.")
- );
-
wxArrayDouble arrdbl;
arrdbl.Add(-1.0);
arrdbl.Add(-0.5);
pg->SetPropertyHelpString( wxT("BoolProperty with CheckBox"),
wxT("Property attribute wxPG_BOOL_USE_CHECKBOX has been set to true.") );
- pid = pg->Append( new wxFloatProperty( wxT("FloatProperty"),
- wxPG_LABEL,
- 1234500.23 ) );
+ prop = pg->Append( new wxFloatProperty("FloatProperty",
+ wxPG_LABEL,
+ 1234500.23) );
+ prop->SetAttribute("Min", -100.12);
// A string property that can be edited in a separate editor dialog.
pg->Append( new wxLongStringProperty( wxT("LongStringProperty"), wxT("LongStringProp"),
#endif
pid = pg->Append( new wxColourProperty(wxT("ColourProperty"),wxPG_LABEL,*wxRED) );
- //pg->SetPropertyAttribute(pid,wxPG_COLOUR_ALLOW_CUSTOM,false);
pg->SetPropertyEditor( wxT("ColourProperty"), wxPGEditor_ComboBox );
- pg->GetProperty(wxT("ColourProperty"))->SetFlag(wxPG_PROP_AUTO_UNSPECIFIED);
+ pg->GetProperty(wxT("ColourProperty"))->SetAutoUnspecified(true);
pg->SetPropertyHelpString( wxT("ColourProperty"),
wxT("wxPropertyGrid::SetPropertyEditor method has been used to change ")
wxT("editor of this property to wxPGEditor_ComboBox)"));
+ pid = pg->Append( new wxColourProperty("ColourPropertyWithAlpha",
+ wxPG_LABEL,
+ wxColour(15, 200, 95, 128)) );
+ pg->SetPropertyAttribute("ColourPropertyWithAlpha", "HasAlpha", true);
+ pg->SetPropertyHelpString("ColourPropertyWithAlpha",
+ "Attribute \"HasAlpha\" is set to true for this property.");
+
//
// This demonstrates using alternative editor for colour property
// to trigger colour dialog directly from button.
mdc.DrawLine(0, 0, 60, 15);
mdc.SelectObject(wxNullBitmap);
pg->SetPropertyImage( wxT("StringPropertyWithBitmap"), myTestBitmap );
-
+
// this value array would be optional if values matched string indexes
//long flags_prop_values[] = { wxICONIZE, wxCAPTION, wxMINIMIZE_BOX, wxMAXIMIZE_BOX };
wxPropertyGridManager* pgman = m_pPropGridManager;
wxPropertyGridPage* pg = pgman->GetPage(wxT("wxWidgets Library Config"));
- // Set custom column proportions
- pg->SetColumnProportion(0, 3);
- pg->SetColumnProportion(1, 1);
+ // 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;
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 )
pgman->SetExtraStyle(extraStyle);
- m_pPropGridManager->SetValidationFailureBehavior( wxPG_VFB_BEEP | wxPG_VFB_MARK_CELL | wxPG_VFB_SHOW_MESSAGE );
+ // This is the default validation failure behaviour
+ m_pPropGridManager->SetValidationFailureBehavior( wxPG_VFB_MARK_CELL |
+ wxPG_VFB_SHOW_MESSAGEBOX );
m_pPropGridManager->GetGrid()->SetVerticalSpacing( 2 );
wxMenu *menuTools2 = new wxMenu;
wxMenu *menuHelp = new wxMenu;
- menuHelp->Append(ID_ABOUT, wxT("&About..."), wxT("Show about dialog") );
+ menuHelp->Append(ID_ABOUT, wxT("&About"), wxT("Show about dialog") );
menuTools1->Append(ID_APPENDPROP, wxT("Append New Property") );
menuTools1->Append(ID_APPENDCAT, wxT("Append New Category\tCtrl-S") );
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_ITERATE3, wxT("Reverse Iterate Over Properties") );
menuTools2->Append(ID_ITERATE4, wxT("Iterate Over Categories") );
menuTools2->AppendSeparator();
+ menuTools2->Append(ID_ONEXTENDEDKEYNAV, "Extend Keyboard Navigation",
+ "This will set Enter to navigate to next property, "
+ "and allows arrow keys to navigate even when in "
+ "editor control.");
+ menuTools2->AppendSeparator();
menuTools2->Append(ID_SETPROPERTYVALUE, wxT("Set Property Value") );
menuTools2->Append(ID_CLEARMODIF, wxT("Clear Modified Status"), wxT("Clears wxPG_MODIFIED flag from all properties.") );
menuTools2->AppendSeparator();
// -----------------------------------------------------------------------
+void FormMain::OnExtendedKeyNav( wxCommandEvent& WXUNUSED(event) )
+{
+ // Use AddActionTrigger() and DedicateKey() to set up Enter,
+ // Up, and Down keys for navigating between properties.
+ wxPropertyGrid* propGrid = m_pPropGridManager->GetGrid();
+
+ propGrid->AddActionTrigger(wxPG_ACTION_NEXT_PROPERTY,
+ WXK_RETURN);
+ propGrid->DedicateKey(WXK_RETURN);
+
+ // Up and Down keys are alredy associated with navigation,
+ // but we must also prevent them from being eaten by
+ // editor controls.
+ propGrid->DedicateKey(WXK_UP);
+ propGrid->DedicateKey(WXK_DOWN);
+}
+
+// -----------------------------------------------------------------------
+
void FormMain::OnFitColumnsClick( wxCommandEvent& WXUNUSED(event) )
{
wxPropertyGridPage* page = m_pPropGridManager->GetCurrentPage();
// -----------------------------------------------------------------------
-void FormMain::OnHideShow( wxCommandEvent& WXUNUSED(event) )
+void FormMain::OnHide( wxCommandEvent& WXUNUSED(event) )
{
wxPGProperty* id = m_pPropGridManager->GetGrid()->GetSelection();
if ( !id )
return;
}
- 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 )
- {
- wxLogDebug(wxT("VirtualHeight is %u, should be %u"), byPre, byAct);
- }
+ m_pPropGridManager->HideProperty( id, true );
}
// -----------------------------------------------------------------------
void FormMain::OnSelectStyle( wxCommandEvent& WXUNUSED(event) )
{
- int style;
- int extraStyle;
+ int style = 0;
+ int extraStyle = 0;
{
wxArrayString chs;
projects / wxWidgets.git / blobdiff