X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d7e2b52235d70e25d7797ce1dccd97fa6989f4b5..94e0018723919fe2ca2f5b5f0a42804c16dbf3a1:/src/propgrid/editors.cpp?ds=sidebyside diff --git a/src/propgrid/editors.cpp b/src/propgrid/editors.cpp index fb60bdaa5f..97647f7e30 100644 --- a/src/propgrid/editors.cpp +++ b/src/propgrid/editors.cpp @@ -6,7 +6,7 @@ // Created: 2007-04-14 // RCS-ID: $Id$ // Copyright: (c) Jaakko Salli -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // For compilers that support precompilation, includes "wx/wx.h". @@ -71,16 +71,12 @@ #define wxPG_TEXTCTRL_AND_BUTTON_SPACING 4 #else #define wxPG_TEXTCTRL_AND_BUTTON_SPACING 2 -#endif +#endif #define wxPG_BUTTON_SIZEDEC 0 #include "wx/odcombo.h" -#ifdef __WXMSW__ - #include "wx/msw/private.h" -#endif - // ----------------------------------------------------------------------- #if defined(__WXMSW__) @@ -144,15 +140,16 @@ // for odcombo #ifdef __WXMAC__ #define wxPG_CHOICEXADJUST -3 // required because wxComboCtrl reserves 3pixels for wxTextCtrl's focus ring -#define wxPG_CHOICEYADJUST -3 +#define wxPG_CHOICEYADJUST -3 #else #define wxPG_CHOICEXADJUST 0 #define wxPG_CHOICEYADJUST 0 #endif -#define ODCB_CUST_PAINT_MARGIN 6 // Number added to image width for SetCustomPaintWidth +// Number added to image width for SetCustomPaintWidth +#define ODCB_CUST_PAINT_MARGIN 6 -// Milliseconds to wait for two mouse-ups after focus inorder +// Milliseconds to wait for two mouse-ups after focus in order // to trigger a double-click. #define DOUBLE_CLICK_CONVERSION_TRESHOLD 500 @@ -172,10 +169,11 @@ wxString wxPGEditor::GetName() const return GetClassInfo()->GetClassName(); } -void wxPGEditor::DrawValue( wxDC& dc, const wxRect& rect, wxPGProperty* property, const wxString& text ) const +void wxPGEditor::DrawValue( wxDC& dc, const wxRect& rect, + wxPGProperty* WXUNUSED(property), + const wxString& text ) const { - if ( !property->IsValueUnspecified() ) - dc.DrawText( text, rect.x+wxPG_XBEFORETEXT, rect.y ); + dc.DrawText( text, rect.x+wxPG_XBEFORETEXT, rect.y ); } bool wxPGEditor::GetValueFromControl( wxVariant&, wxPGProperty*, wxWindow* ) const @@ -209,6 +207,108 @@ void wxPGEditor::OnFocus( wxPGProperty*, wxWindow* ) const { } +void wxPGEditor::SetControlAppearance( wxPropertyGrid* pg, + wxPGProperty* property, + wxWindow* ctrl, + const wxPGCell& cell, + const wxPGCell& oCell, + bool unspecified ) const +{ + // Get old editor appearance + wxTextCtrl* tc = NULL; + wxComboCtrl* cb = NULL; + if ( ctrl->IsKindOf(CLASSINFO(wxTextCtrl)) ) + { + tc = (wxTextCtrl*) ctrl; + } + else + { + if ( ctrl->IsKindOf(CLASSINFO(wxComboCtrl)) ) + { + cb = (wxComboCtrl*) ctrl; + tc = cb->GetTextCtrl(); + } + } + + if ( tc || cb ) + { + wxString tcText; + bool changeText = false; + + if ( cell.HasText() && !pg->IsEditorFocused() ) + { + tcText = cell.GetText(); + changeText = true; + } + else if ( oCell.HasText() ) + { + tcText = property->GetValueAsString( + property->HasFlag(wxPG_PROP_READONLY)?0:wxPG_EDITABLE_VALUE); + changeText = true; + } + + if ( changeText ) + { + // This prevents value from being modified + if ( tc ) + { + pg->SetupTextCtrlValue(tcText); + tc->SetValue(tcText); + } + else + { + cb->SetText(tcText); + } + } + } + + // Do not make the mistake of calling GetClassDefaultAttributes() + // here. It is static, while GetDefaultAttributes() is virtual + // and the correct one to use. + wxVisualAttributes vattrs = ctrl->GetDefaultAttributes(); + + // Foreground colour + const wxColour& fgCol = cell.GetFgCol(); + if ( fgCol.IsOk() ) + { + ctrl->SetForegroundColour(fgCol); + } + else if ( oCell.GetFgCol().IsOk() ) + { + ctrl->SetForegroundColour(vattrs.colFg); + } + + // Background colour + const wxColour& bgCol = cell.GetBgCol(); + if ( bgCol.IsOk() ) + { + ctrl->SetBackgroundColour(bgCol); + } + else if ( oCell.GetBgCol().IsOk() ) + { + ctrl->SetBackgroundColour(vattrs.colBg); + } + + // Font + const wxFont& font = cell.GetFont(); + if ( font.IsOk() ) + { + ctrl->SetFont(font); + } + else if ( oCell.GetFont().IsOk() ) + { + ctrl->SetFont(vattrs.font); + } + + // Also call the old SetValueToUnspecified() + if ( unspecified ) + SetValueToUnspecified(property, ctrl); +} + +void wxPGEditor::SetValueToUnspecified( wxPGProperty* WXUNUSED(property), + wxWindow* WXUNUSED(ctrl) ) const +{ +} bool wxPGEditor::CanContainCustomImage() const { @@ -233,18 +333,20 @@ wxPGWindowList wxPGTextCtrlEditor::CreateControls( wxPropertyGrid* propGrid, // If has children, and limited editing is specified, then don't create. if ( (property->GetFlags() & wxPG_PROP_NOEDITOR) && property->GetChildCount() ) - return (wxWindow*) NULL; + return NULL; - if ( !property->IsValueUnspecified() ) - text = property->GetValueAsString(property->HasFlag(wxPG_PROP_READONLY) ? - 0 : wxPG_EDITABLE_VALUE); + int argFlags = 0; + if ( !property->HasFlag(wxPG_PROP_READONLY) && + !property->IsValueUnspecified() ) + argFlags |= wxPG_EDITABLE_VALUE; + text = property->GetValueAsString(argFlags); int flags = 0; if ( (property->GetFlags() & wxPG_PROP_PASSWORD) && property->IsKindOf(CLASSINFO(wxStringProperty)) ) flags |= wxTE_PASSWORD; - wxWindow* wnd = propGrid->GenerateEditorTextCtrl(pos,sz,text,(wxWindow*)NULL,flags, + wxWindow* wnd = propGrid->GenerateEditorTextCtrl(pos,sz,text,NULL,flags, property->GetMaxLength()); return wnd; @@ -283,9 +385,16 @@ void wxPGTextCtrlEditor::UpdateControl( wxPGProperty* property, wxWindow* ctrl ) else s = property->GetDisplayedString(); - tc->SetValue(s); -} + wxPropertyGrid* pg = property->GetGrid(); + + pg->SetupTextCtrlValue(s); + tc->SetValue(s); + // + // Fix indentation, just in case (change in font boldness is one good + // reason). + tc->SetMargins(0); +} // Provided so that, for example, ComboBox editor can use the same code // (multiple inheritance would get way too messy). @@ -335,7 +444,7 @@ bool wxPGTextCtrlEditor::GetTextCtrlValueFromControl( wxVariant& variant, wxPGPr wxTextCtrl* tc = wxStaticCast(ctrl, wxTextCtrl); wxString textVal = tc->GetValue(); - if ( property->UsesAutoUnspecified() && !textVal.length() ) + if ( property->UsesAutoUnspecified() && textVal.empty() ) { variant.MakeNull(); return true; @@ -359,17 +468,6 @@ bool wxPGTextCtrlEditor::GetValueFromControl( wxVariant& variant, wxPGProperty* } -void wxPGTextCtrlEditor::SetValueToUnspecified( wxPGProperty* property, wxWindow* ctrl ) const -{ - wxTextCtrl* tc = wxStaticCast(ctrl, wxTextCtrl); - - wxPropertyGrid* pg = property->GetGrid(); - wxASSERT(pg); // Really, property grid should exist if editor does - if ( pg ) - tc->SetValue(wxEmptyString); -} - - void wxPGTextCtrlEditor::SetControlStringValue( wxPGProperty* property, wxWindow* ctrl, const wxString& txt ) const { wxTextCtrl* tc = wxStaticCast(ctrl, wxTextCtrl); @@ -377,19 +475,44 @@ void wxPGTextCtrlEditor::SetControlStringValue( wxPGProperty* property, wxWindow wxPropertyGrid* pg = property->GetGrid(); wxASSERT(pg); // Really, property grid should exist if editor does if ( pg ) + { + pg->SetupTextCtrlValue(txt); tc->SetValue(txt); + } } -void wxPGTextCtrlEditor::OnFocus( wxPGProperty*, wxWindow* wnd ) const +void wxPGTextCtrlEditor_OnFocus( wxPGProperty* property, + wxTextCtrl* tc ) { - wxTextCtrl* tc = wxStaticCast(wnd, wxTextCtrl); + // Make sure there is correct text (instead of unspecified value + // indicator or hint text) + int flags = property->HasFlag(wxPG_PROP_READONLY) ? + 0 : wxPG_EDITABLE_VALUE; + wxString correctText = property->GetValueAsString(flags); + + if ( tc->GetValue() != correctText ) + { + property->GetGrid()->SetupTextCtrlValue(correctText); + tc->SetValue(correctText); + } tc->SetSelection(-1,-1); } +void wxPGTextCtrlEditor::OnFocus( wxPGProperty* property, + wxWindow* wnd ) const +{ + wxTextCtrl* tc = wxStaticCast(wnd, wxTextCtrl); + wxPGTextCtrlEditor_OnFocus(property, tc); +} -wxPGTextCtrlEditor::~wxPGTextCtrlEditor() { } +wxPGTextCtrlEditor::~wxPGTextCtrlEditor() +{ + // Reset the global pointer. Useful when wxPropertyGrid is accessed + // from an external main loop. + wxPG_EDITOR(TextCtrl) = NULL; +} // ----------------------------------------------------------------------- @@ -494,7 +617,7 @@ public: wxPGComboBox() : wxOwnerDrawnComboBox() { - m_dclickProcessor = (wxPGDoubleClickProcessor*) NULL; + m_dclickProcessor = NULL; m_sizeEventCalled = false; } @@ -528,31 +651,47 @@ public: name ) ) return false; - m_dclickProcessor = new wxPGDoubleClickProcessor(this, GetGrid()->GetSelection() ); + m_dclickProcessor = new + wxPGDoubleClickProcessor( this, GetGrid()->GetSelection() ); PushEventHandler(m_dclickProcessor); return true; } - virtual void OnDrawItem( wxDC& dc, const wxRect& rect, int item, int flags ) const + virtual void OnDrawItem( wxDC& dc, + const wxRect& rect, + int item, + int flags ) const { wxPropertyGrid* pg = GetGrid(); - pg->OnComboItemPaint((wxPGCustomComboControl*)this,item,dc,(wxRect&)rect,flags); + + // Handle hint text via super class + if ( (flags & wxODCB_PAINTING_CONTROL) && + ShouldUseHintText(flags) ) + { + wxOwnerDrawnComboBox::OnDrawItem(dc, rect, item, flags); + } + else + { + pg->OnComboItemPaint( this, item, &dc, (wxRect&)rect, flags ); + } } + virtual wxCoord OnMeasureItem( size_t item ) const { wxPropertyGrid* pg = GetGrid(); wxRect rect; rect.x = -1; rect.width = 0; - pg->OnComboItemPaint((wxPGCustomComboControl*)this,item,*((wxDC*)NULL),rect,0); + pg->OnComboItemPaint( this, item, NULL, rect, 0 ); return rect.height; } wxPropertyGrid* GetGrid() const { - wxPropertyGrid* pg = wxDynamicCast(GetParent()->GetParent(),wxPropertyGrid); + wxPropertyGrid* pg = wxDynamicCast(GetParent(), + wxPropertyGrid); wxASSERT(pg); return pg; } @@ -563,15 +702,20 @@ public: wxRect rect; rect.x = -1; rect.width = -1; - pg->OnComboItemPaint((wxPGCustomComboControl*)this,item,*((wxDC*)NULL),rect,0); + pg->OnComboItemPaint( this, item, NULL, rect, 0 ); return rect.width; } - virtual void PositionTextCtrl( int WXUNUSED(textCtrlXAdjust), int WXUNUSED(textCtrlYAdjust) ) + virtual void PositionTextCtrl( int textCtrlXAdjust, + int WXUNUSED(textCtrlYAdjust) ) { wxPropertyGrid* pg = GetGrid(); + #ifdef wxPG_TEXTCTRLXADJUST + textCtrlXAdjust = wxPG_TEXTCTRLXADJUST - + (wxPG_XBEFOREWIDGET+wxPG_CONTROL_MARGIN+1) - 1, + #endif wxOwnerDrawnComboBox::PositionTextCtrl( - wxPG_TEXTCTRLXADJUST - (wxPG_XBEFOREWIDGET+wxPG_CONTROL_MARGIN+1) - 1, + textCtrlXAdjust, pg->GetSpacingY() + 2 ); } @@ -582,18 +726,16 @@ private: }; -void wxPropertyGrid::OnComboItemPaint( wxPGCustomComboControl* pCc, +void wxPropertyGrid::OnComboItemPaint( const wxPGComboBox* pCb, int item, - wxDC& dc, + wxDC* pDc, wxRect& rect, int flags ) { - wxPGComboBox* pCb = (wxPGComboBox*)pCc; - // Sanity check wxASSERT( IsKindOf(CLASSINFO(wxPropertyGrid)) ); - wxPGProperty* p = m_selected; + wxPGProperty* p = GetSelection(); wxString text; const wxPGChoices& choices = p->GetChoices(); @@ -632,7 +774,7 @@ void wxPropertyGrid::OnComboItemPaint( wxPGCustomComboControl* pCc, const wxBitmap* itemBitmap = NULL; - if ( item >= 0 && choices.IsOk() && choices.Item(item).GetBitmap().Ok() && comValIndex == -1 ) + if ( item >= 0 && choices.IsOk() && choices.Item(item).GetBitmap().IsOk() && comValIndex == -1 ) itemBitmap = &choices.Item(item).GetBitmap(); // @@ -653,7 +795,7 @@ void wxPropertyGrid::OnComboItemPaint( wxPGCustomComboControl* pCc, if ( rect.width < 0 ) { wxCoord x, y; - GetTextExtent(text, &x, &y, 0, 0, &m_font); + pCb->GetTextExtent(text, &x, &y, 0, 0); rect.width = cis.x + wxCC_CUSTOM_IMAGE_MARGIN1 + wxCC_CUSTOM_IMAGE_MARGIN2 + 9 + x; } @@ -669,30 +811,64 @@ void wxPropertyGrid::OnComboItemPaint( wxPGCustomComboControl* pCc, if ( (flags & wxODCB_PAINTING_CONTROL) ) paintdata.m_choiceItem = -1; - if ( &dc ) - dc.SetBrush(*wxWHITE_BRUSH); + if ( pDc ) + pDc->SetBrush(*wxWHITE_BRUSH); + + wxPGCellRenderer* renderer = NULL; + const wxPGChoiceEntry* cell = NULL; if ( rect.x >= 0 ) { // // DrawItem call + wxDC& dc = *pDc; wxPoint pt(rect.x + wxPG_CONTROL_MARGIN - wxPG_CHOICEXADJUST - 1, rect.y + 1); int renderFlags = wxPGCellRenderer::DontUseCellColours; + bool useCustomPaintProcedure; - if ( flags & wxODCB_PAINTING_CONTROL ) - renderFlags |= wxPGCellRenderer::Control; + // If custom image had some size, we will start from the assumption + // that custom paint procedure is required + if ( cis.x > 0 ) + useCustomPaintProcedure = true; + else + useCustomPaintProcedure = false; if ( flags & wxODCB_PAINTING_SELECTED ) renderFlags |= wxPGCellRenderer::Selected; - if ( cis.x > 0 && (p->HasFlag(wxPG_PROP_CUSTOMIMAGE) || !(flags & wxODCB_PAINTING_CONTROL)) && - ( !p->m_valueBitmap || item == pCb->GetSelection() ) && - ( item >= 0 || (flags & wxODCB_PAINTING_CONTROL) ) && - !itemBitmap - ) + if ( flags & wxODCB_PAINTING_CONTROL ) + { + renderFlags |= wxPGCellRenderer::Control; + + // If wxPG_PROP_CUSTOMIMAGE was set, then that means any custom + // image will not appear on the control row (it may be too + // large to fit, for instance). Also do not draw custom image + // if no choice was selected. + if ( !p->HasFlag(wxPG_PROP_CUSTOMIMAGE) || item < 0 ) + useCustomPaintProcedure = false; + } + else + { + renderFlags |= wxPGCellRenderer::ChoicePopup; + + // For consistency, always use normal font when drawing drop down + // items + dc.SetFont(GetFont()); + } + + // If not drawing a selected popup item, then give property's + // m_valueBitmap a chance. + if ( p->m_valueBitmap && item != pCb->GetSelection() ) + useCustomPaintProcedure = false; + // If current choice had a bitmap set by the application, then + // use it instead of any custom paint procedure. + else if ( itemBitmap ) + useCustomPaintProcedure = false; + + if ( useCustomPaintProcedure ) { pt.x += wxCC_CUSTOM_IMAGE_MARGIN1; wxRect r(pt.x,pt.y,cis.x,cis.y); @@ -737,11 +913,13 @@ void wxPropertyGrid::OnComboItemPaint( wxPGCustomComboControl* pCc, if ( choices.IsOk() && item >= 0 && comValIndex < 0 ) { - const wxPGChoiceEntry& cell = choices.Item(item); - wxPGCellRenderer* renderer = wxPGGlobalVars->m_defaultRenderer; - int imageOffset = renderer->PreDrawCell( dc, rect, cell, renderFlags ); + cell = &choices.Item(item); + renderer = wxPGGlobalVars->m_defaultRenderer; + int imageOffset = renderer->PreDrawCell(dc, rect, *cell, + renderFlags ); if ( imageOffset ) - imageOffset += wxCC_CUSTOM_IMAGE_MARGIN1 + wxCC_CUSTOM_IMAGE_MARGIN2; + imageOffset += wxCC_CUSTOM_IMAGE_MARGIN1 + + wxCC_CUSTOM_IMAGE_MARGIN2; pt.x += imageOffset; } } @@ -755,11 +933,15 @@ void wxPropertyGrid::OnComboItemPaint( wxPGCustomComboControl* pCc, pt.x += 1; dc.DrawText( text, pt.x + wxPG_XBEFORETEXT, pt.y ); + + if ( renderer ) + renderer->PostDrawCell(dc, this, *cell, renderFlags); } else { // // MeasureItem call + wxDC& dc = *pDc; p->OnCustomPaint( dc, rect, paintdata ); rect.height = paintdata.m_drawnHeight + 2; @@ -772,23 +954,35 @@ bool wxPGChoiceEditor_SetCustomPaintWidth( wxPropertyGrid* propGrid, wxPGComboBo wxPGProperty* property = propGrid->GetSelectedProperty(); wxASSERT( property ); + wxSize imageSize; + bool res; + + // TODO: Do this always when cell has custom text. + if ( property->IsValueUnspecified() ) + { + cb->SetCustomPaintWidth( 0 ); + return true; + } + if ( cmnVal >= 0 ) { // Yes, a common value is being selected property->SetCommonValue( cmnVal ); - wxSize imageSize = propGrid->GetCommonValue(cmnVal)-> + imageSize = propGrid->GetCommonValue(cmnVal)-> GetRenderer()->GetImageSize(property, 1, cmnVal); - if ( imageSize.x ) imageSize.x += ODCB_CUST_PAINT_MARGIN; - cb->SetCustomPaintWidth( imageSize.x ); - return false; + res = false; } else { - wxSize imageSize = propGrid->GetImageSize(property, -1); - if ( imageSize.x ) imageSize.x += ODCB_CUST_PAINT_MARGIN; - cb->SetCustomPaintWidth( imageSize.x ); - return true; + imageSize = propGrid->GetImageSize(property, -1); + res = true; } + + if ( imageSize.x ) + imageSize.x += ODCB_CUST_PAINT_MARGIN; + cb->SetCustomPaintWidth( imageSize.x ); + + return res; } // CreateControls calls this with CB_READONLY in extraStyle @@ -798,14 +992,21 @@ wxWindow* wxPGChoiceEditor::CreateControlsBase( wxPropertyGrid* propGrid, const wxSize& sz, long extraStyle ) const { + // Since it is not possible (yet) to create a read-only combo box in + // the same sense that wxTextCtrl is read-only, simply do not create + // the control in this case. + if ( property->HasFlag(wxPG_PROP_READONLY) ) + return NULL; + const wxPGChoices& choices = property->GetChoices(); wxString defString; int index = property->GetChoiceSelection(); - bool isUnspecified = property->IsValueUnspecified(); - - if ( !isUnspecified ) - defString = property->GetDisplayedString(); + int argFlags = 0; + if ( !property->HasFlag(wxPG_PROP_READONLY) && + !property->IsValueUnspecified() ) + argFlags |= wxPG_EDITABLE_VALUE; + defString = property->GetValueAsString(argFlags); wxArrayString labels = choices.GetLabels(); @@ -822,12 +1023,16 @@ wxWindow* wxPGChoiceEditor::CreateControlsBase( wxPropertyGrid* propGrid, int odcbFlags = extraStyle | wxBORDER_NONE | wxTE_PROCESS_ENTER; + if ( (property->GetFlags() & wxPG_PROP_USE_DCC) && + (property->IsKindOf(CLASSINFO(wxBoolProperty)) ) ) + odcbFlags |= wxODCB_DCLICK_CYCLES; + // // If common value specified, use appropriate index unsigned int cmnVals = property->GetDisplayedCommonValueCount(); if ( cmnVals ) { - if ( !isUnspecified ) + if ( !property->IsValueUnspecified() ) { int cmnVal = property->GetCommonValue(); if ( cmnVal >= 0 ) @@ -854,29 +1059,29 @@ wxWindow* wxPGChoiceEditor::CreateControlsBase( wxPropertyGrid* propGrid, odcbFlags); cb->SetButtonPosition(si.y,0,wxRIGHT); - cb->SetTextIndent(wxPG_XBEFORETEXT-1); + cb->SetMargins(wxPG_XBEFORETEXT-1); - wxPGChoiceEditor_SetCustomPaintWidth( propGrid, cb, property->GetCommonValue() ); + // Set hint text + cb->SetHint(property->GetHintText()); + + wxPGChoiceEditor_SetCustomPaintWidth( propGrid, cb, + property->GetCommonValue() ); if ( index >= 0 && index < (int)cb->GetCount() ) { cb->SetSelection( index ); - if ( defString.length() ) + if ( !defString.empty() ) cb->SetText( defString ); } - else if ( !(extraStyle & wxCB_READONLY) && defString.length() ) + else if ( !(extraStyle & wxCB_READONLY) && !defString.empty() ) + { + propGrid->SetupTextCtrlValue(defString); cb->SetValue( defString ); + } else + { cb->SetSelection( -1 ); - - // Connect event handling - wxWindowID id = cb->GetId(); - propGrid->Connect(id, wxEVT_COMMAND_COMBOBOX_SELECTED, - wxEventHandler(wxPropertyGrid::OnCustomEditorEvent)); - propGrid->Connect(id, wxEVT_COMMAND_TEXT_UPDATED, - wxEventHandler(wxPropertyGrid::OnCustomEditorEvent)); - propGrid->Connect(id, wxEVT_COMMAND_TEXT_ENTER, - wxEventHandler(wxPropertyGrid::OnCustomEditorEvent)); + } #ifdef __WXMSW__ cb->Show(); @@ -948,11 +1153,16 @@ bool wxPGChoiceEditor::OnEvent( wxPropertyGrid* propGrid, wxPGProperty* property propGrid->SetInternalFlag(wxPG_FL_VALUE_CHANGE_IN_EVENT); property->SetValueToUnspecified(); if ( !cb->HasFlag(wxCB_READONLY) ) - cb->GetTextCtrl()->SetValue(wxEmptyString); + { + wxString unspecValueText; + unspecValueText = propGrid->GetUnspecifiedValueText(); + propGrid->SetupTextCtrlValue(unspecValueText); + cb->GetTextCtrl()->SetValue(unspecValueText); + } return false; } } - return wxPGChoiceEditor_SetCustomPaintWidth( propGrid, cb, cmnValIndex ); + return wxPGChoiceEditor_SetCustomPaintWidth( propGrid, cb, cmnValIndex ); } return false; } @@ -976,10 +1186,13 @@ bool wxPGChoiceEditor::GetValueFromControl( wxVariant& variant, wxPGProperty* pr } -void wxPGChoiceEditor::SetControlStringValue( wxPGProperty* WXUNUSED(property), wxWindow* ctrl, const wxString& txt ) const +void wxPGChoiceEditor::SetControlStringValue( wxPGProperty* property, + wxWindow* ctrl, + const wxString& txt ) const { wxOwnerDrawnComboBox* cb = (wxOwnerDrawnComboBox*)ctrl; wxASSERT( cb ); + property->GetGrid()->SetupTextCtrlValue(txt); cb->SetValue(txt); } @@ -992,10 +1205,13 @@ void wxPGChoiceEditor::SetControlIntValue( wxPGProperty* WXUNUSED(property), wxW } -void wxPGChoiceEditor::SetValueToUnspecified( wxPGProperty* WXUNUSED(property), wxWindow* ctrl ) const +void wxPGChoiceEditor::SetValueToUnspecified( wxPGProperty* WXUNUSED(property), + wxWindow* ctrl ) const { wxOwnerDrawnComboBox* cb = (wxOwnerDrawnComboBox*)ctrl; - cb->SetSelection(-1); + + if ( cb->HasFlag(wxCB_READONLY) ) + cb->SetSelection(-1); } @@ -1005,7 +1221,10 @@ bool wxPGChoiceEditor::CanContainCustomImage() const } -wxPGChoiceEditor::~wxPGChoiceEditor() { } +wxPGChoiceEditor::~wxPGChoiceEditor() +{ + wxPG_EDITOR(Choice) = NULL; +} // ----------------------------------------------------------------------- @@ -1021,7 +1240,9 @@ WX_PG_IMPLEMENT_INTERNAL_EDITOR_CLASS(ComboBox, void wxPGComboBoxEditor::UpdateControl( wxPGProperty* property, wxWindow* ctrl ) const { wxOwnerDrawnComboBox* cb = (wxOwnerDrawnComboBox*)ctrl; - cb->SetValue(property->GetValueAsString(wxPG_EDITABLE_VALUE)); + wxString s = property->GetValueAsString(wxPG_EDITABLE_VALUE); + property->GetGrid()->SetupTextCtrlValue(s); + cb->SetValue(s); // TODO: If string matches any selection, then select that. } @@ -1041,8 +1262,8 @@ bool wxPGComboBoxEditor::OnEvent( wxPropertyGrid* propGrid, wxWindow* ctrl, wxEvent& event ) const { - wxOwnerDrawnComboBox* cb = (wxOwnerDrawnComboBox*) NULL; - wxWindow* textCtrl = (wxWindow*) NULL; + wxOwnerDrawnComboBox* cb = NULL; + wxWindow* textCtrl = NULL; if ( ctrl ) { @@ -1062,7 +1283,7 @@ bool wxPGComboBoxEditor::GetValueFromControl( wxVariant& variant, wxPGProperty* wxOwnerDrawnComboBox* cb = (wxOwnerDrawnComboBox*)ctrl; wxString textVal = cb->GetValue(); - if ( property->UsesAutoUnspecified() && !textVal.length() ) + if ( property->UsesAutoUnspecified() && textVal.empty() ) { variant.MakeNull(); return true; @@ -1079,14 +1300,19 @@ bool wxPGComboBoxEditor::GetValueFromControl( wxVariant& variant, wxPGProperty* } -void wxPGComboBoxEditor::OnFocus( wxPGProperty*, wxWindow* ctrl ) const +void wxPGComboBoxEditor::OnFocus( wxPGProperty* property, + wxWindow* ctrl ) const { wxOwnerDrawnComboBox* cb = (wxOwnerDrawnComboBox*)ctrl; - cb->GetTextCtrl()->SetSelection(-1,-1); + wxPGTextCtrlEditor_OnFocus(property, cb->GetTextCtrl()); } -wxPGComboBoxEditor::~wxPGComboBoxEditor() { } +wxPGComboBoxEditor::~wxPGComboBoxEditor() +{ + wxPG_EDITOR(ComboBox) = NULL; +} + // ----------------------------------------------------------------------- @@ -1138,8 +1364,10 @@ wxPGWindowList wxPGChoiceAndButtonEditor::CreateControls( wxPropertyGrid* propGr } -wxPGChoiceAndButtonEditor::~wxPGChoiceAndButtonEditor() { } - +wxPGChoiceAndButtonEditor::~wxPGChoiceAndButtonEditor() +{ + wxPG_EDITOR(ChoiceAndButton) = NULL; +} // ----------------------------------------------------------------------- // wxPGTextCtrlAndButtonEditor @@ -1163,8 +1391,10 @@ wxPGWindowList wxPGTextCtrlAndButtonEditor::CreateControls( wxPropertyGrid* prop } -wxPGTextCtrlAndButtonEditor::~wxPGTextCtrlAndButtonEditor() { } - +wxPGTextCtrlAndButtonEditor::~wxPGTextCtrlAndButtonEditor() +{ + wxPG_EDITOR(TextCtrlAndButton) = NULL; +} // ----------------------------------------------------------------------- // wxPGCheckBoxEditor @@ -1177,17 +1407,34 @@ WX_PG_IMPLEMENT_INTERNAL_EDITOR_CLASS(CheckBox, wxPGEditor) -// state argument: 0x01 = set if checked -// 0x02 = set if rectangle should be bold -static void DrawSimpleCheckBox( wxDC& dc, const wxRect& rect, int box_hei, int state, const wxColour& linecol ) +// Check box state flags +enum { + wxSCB_STATE_UNCHECKED = 0, + wxSCB_STATE_CHECKED = 1, + wxSCB_STATE_BOLD = 2, + wxSCB_STATE_UNSPECIFIED = 4 +}; +const int wxSCB_SETVALUE_CYCLE = 2; + + +static void DrawSimpleCheckBox( wxDC& dc, const wxRect& rect, int box_hei, + int state ) +{ // Box rectangle. - wxRect r(rect.x+wxPG_XBEFORETEXT,rect.y+((rect.height-box_hei)/2),box_hei,box_hei); + wxRect r(rect.x+wxPG_XBEFORETEXT,rect.y+((rect.height-box_hei)/2), + box_hei,box_hei); + wxColour useCol = dc.GetTextForeground(); + + if ( state & wxSCB_STATE_UNSPECIFIED ) + { + useCol = wxColour(220, 220, 220); + } // Draw check mark first because it is likely to overdraw the // surrounding rectangle. - if ( state & 1 ) + if ( state & wxSCB_STATE_CHECKED ) { wxRect r2(r.x+wxPG_CHECKMARK_XADJ, r.y+wxPG_CHECKMARK_YADJ, @@ -1201,18 +1448,17 @@ static void DrawSimpleCheckBox( wxDC& dc, const wxRect& rect, int box_hei, int s // This would draw a simple cross check mark. // dc.DrawLine(r.x,r.y,r.x+r.width-1,r.y+r.height-1); // dc.DrawLine(r.x,r.y+r.height-1,r.x+r.width-1,r.y); - } - if ( !(state & 2) ) + if ( !(state & wxSCB_STATE_BOLD) ) { // Pen for thin rectangle. - dc.SetPen(linecol); + dc.SetPen(useCol); } else { // Pen for bold rectangle. - wxPen linepen(linecol,2,wxSOLID); + wxPen linepen(useCol,2,wxSOLID); linepen.SetJoin(wxJOIN_MITER); // This prevents round edges. dc.SetPen(linepen); r.x++; @@ -1246,178 +1492,149 @@ public: SetFont( parent->GetFont() ); m_state = 0; - wxPropertyGrid* pg = (wxPropertyGrid*) parent->GetParent(); - wxASSERT( pg->IsKindOf(CLASSINFO(wxPropertyGrid)) ); - m_boxHeight = pg->GetFontHeight(); - SetBackgroundStyle( wxBG_STYLE_COLOUR ); + m_boxHeight = 12; + + SetBackgroundStyle( wxBG_STYLE_CUSTOM ); } virtual ~wxSimpleCheckBox(); - virtual bool ProcessEvent(wxEvent& event); - int m_state; int m_boxHeight; +private: + void OnPaint( wxPaintEvent& event ); + void OnLeftClick( wxMouseEvent& event ); + void OnKeyDown( wxKeyEvent& event ); + + void OnResize( wxSizeEvent& event ) + { + Refresh(); + event.Skip(); + } + static wxBitmap* ms_doubleBuffer; + DECLARE_EVENT_TABLE() }; +BEGIN_EVENT_TABLE(wxSimpleCheckBox, wxControl) + EVT_PAINT(wxSimpleCheckBox::OnPaint) + EVT_LEFT_DOWN(wxSimpleCheckBox::OnLeftClick) + EVT_LEFT_DCLICK(wxSimpleCheckBox::OnLeftClick) + EVT_KEY_DOWN(wxSimpleCheckBox::OnKeyDown) + EVT_SIZE(wxSimpleCheckBox::OnResize) +END_EVENT_TABLE() + wxSimpleCheckBox::~wxSimpleCheckBox() { - delete ms_doubleBuffer; - ms_doubleBuffer = NULL; + wxDELETE(ms_doubleBuffer); } +wxBitmap* wxSimpleCheckBox::ms_doubleBuffer = NULL; -wxBitmap* wxSimpleCheckBox::ms_doubleBuffer = (wxBitmap*) NULL; - -// value = 2 means toggle (sorry, too lazy to do constants) -void wxSimpleCheckBox::SetValue( int value ) +void wxSimpleCheckBox::OnPaint( wxPaintEvent& WXUNUSED(event) ) { - if ( value > 1 ) - { - m_state++; - if ( m_state > 1 ) m_state = 0; - } - else - { - m_state = value; - } - Refresh(); + wxSize clientSize = GetClientSize(); + wxAutoBufferedPaintDC dc(this); - wxCommandEvent evt(wxEVT_COMMAND_CHECKBOX_CLICKED,GetParent()->GetId()); + dc.Clear(); + wxRect rect(0,0,clientSize.x,clientSize.y); + rect.y += 1; + rect.width += 1; - wxPropertyGrid* propGrid = (wxPropertyGrid*) GetParent()->GetParent(); - wxASSERT( propGrid->IsKindOf(CLASSINFO(wxPropertyGrid)) ); - propGrid->OnCustomEditorEvent(evt); -} + wxColour bgcol = GetBackgroundColour(); + dc.SetBrush( bgcol ); + dc.SetPen( bgcol ); + dc.DrawRectangle( rect ); + dc.SetTextForeground(GetForegroundColour()); -bool wxSimpleCheckBox::ProcessEvent(wxEvent& event) -{ - wxPropertyGrid* propGrid = (wxPropertyGrid*) GetParent()->GetParent(); - wxASSERT( propGrid->IsKindOf(CLASSINFO(wxPropertyGrid)) ); + int state = m_state; + if ( !(state & wxSCB_STATE_UNSPECIFIED) && + GetFont().GetWeight() == wxBOLD ) + state |= wxSCB_STATE_BOLD; - if ( ( (event.GetEventType() == wxEVT_LEFT_DOWN || event.GetEventType() == wxEVT_LEFT_DCLICK) - && ((wxMouseEvent&)event).m_x > (wxPG_XBEFORETEXT-2) - && ((wxMouseEvent&)event).m_x <= (wxPG_XBEFORETEXT-2+m_boxHeight) ) - ) + DrawSimpleCheckBox(dc, rect, m_boxHeight, state); +} + +void wxSimpleCheckBox::OnLeftClick( wxMouseEvent& event ) +{ + if ( (event.m_x > (wxPG_XBEFORETEXT-2)) && + (event.m_x <= (wxPG_XBEFORETEXT-2+m_boxHeight)) ) { - SetValue(2); - return true; + SetValue(wxSCB_SETVALUE_CYCLE); } - else if ( event.GetEventType() == wxEVT_PAINT ) - { - wxSize clientSize = GetClientSize(); - wxPaintDC dc(this); - - /* - // Buffered paint DC doesn't seem to do much good - if ( !ms_doubleBuffer || - clientSize.x > ms_doubleBuffer->GetWidth() || - clientSize.y > ms_doubleBuffer->GetHeight() ) - { - delete ms_doubleBuffer; - ms_doubleBuffer = new wxBitmap(clientSize.x+25,clientSize.y+25); - } - - wxBufferedPaintDC dc(this,*ms_doubleBuffer); - */ - - wxRect rect(0,0,clientSize.x,clientSize.y); - //rect.x -= 1; - rect.y += 1; - rect.width += 1; - - m_boxHeight = propGrid->GetFontHeight(); - - wxColour bgcol = GetBackgroundColour(); - dc.SetBrush( bgcol ); - dc.SetPen( bgcol ); - dc.DrawRectangle( rect ); - - wxColour txcol = GetForegroundColour(); - - int state = m_state; - if ( m_font.GetWeight() == wxBOLD ) - state |= 2; - - DrawSimpleCheckBox(dc,rect,m_boxHeight,state,txcol); - - // If focused, indicate it somehow. - /* - if ( wxWindow::FindFocus() == this ) - { - rect.x += 1; - rect.width -= 1; - - wxPGDrawFocusRect(dc,rect); - } - */ +} - return true; +void wxSimpleCheckBox::OnKeyDown( wxKeyEvent& event ) +{ + if ( event.GetKeyCode() == WXK_SPACE ) + { + SetValue(wxSCB_SETVALUE_CYCLE); } - else if ( event.GetEventType() == wxEVT_SIZE || - event.GetEventType() == wxEVT_SET_FOCUS || - event.GetEventType() == wxEVT_KILL_FOCUS - ) +} + +void wxSimpleCheckBox::SetValue( int value ) +{ + if ( value == wxSCB_SETVALUE_CYCLE ) { - Refresh(); + if ( m_state & wxSCB_STATE_CHECKED ) + m_state &= ~wxSCB_STATE_CHECKED; + else + m_state |= wxSCB_STATE_CHECKED; } - else if ( event.GetEventType() == wxEVT_KEY_DOWN ) + else { - wxKeyEvent& keyEv = (wxKeyEvent&) event; - - if ( keyEv.GetKeyCode() == WXK_SPACE ) - { - SetValue(2); - return true; - } + m_state = value; } - return wxControl::ProcessEvent(event); -} + Refresh(); + + wxCommandEvent evt(wxEVT_COMMAND_CHECKBOX_CLICKED,GetParent()->GetId()); + wxPropertyGrid* propGrid = (wxPropertyGrid*) GetParent(); + wxASSERT( propGrid->IsKindOf(CLASSINFO(wxPropertyGrid)) ); + propGrid->HandleCustomEditorEvent(evt); +} wxPGWindowList wxPGCheckBoxEditor::CreateControls( wxPropertyGrid* propGrid, wxPGProperty* property, const wxPoint& pos, const wxSize& size ) const { + if ( property->HasFlag(wxPG_PROP_READONLY) ) + return NULL; + wxPoint pt = pos; pt.x -= wxPG_XBEFOREWIDGET; wxSize sz = size; sz.x = propGrid->GetFontHeight() + (wxPG_XBEFOREWIDGET*2) + 4; - wxSimpleCheckBox* cb = new wxSimpleCheckBox(propGrid->GetPanel(),wxPG_SUBID1,pt,sz); + wxSimpleCheckBox* cb = new wxSimpleCheckBox(propGrid->GetPanel(), + wxPG_SUBID1, pt, sz); cb->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW)); - cb->Connect( wxPG_SUBID1, wxEVT_LEFT_DOWN, - (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) - &wxPropertyGrid::OnCustomEditorEvent, NULL, propGrid ); + UpdateControl(property, cb); - cb->Connect( wxPG_SUBID1, wxEVT_LEFT_DCLICK, - (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) - &wxPropertyGrid::OnCustomEditorEvent, NULL, propGrid ); - - if ( property->GetChoiceSelection() > 0 && - !property->IsValueUnspecified() ) - cb->m_state = 1; - - // If mouse cursor was on the item, toggle the value now. - if ( propGrid->GetInternalFlags() & wxPG_FL_ACTIVATION_BY_CLICK ) + if ( !property->IsValueUnspecified() ) { - wxPoint pt = cb->ScreenToClient(::wxGetMousePosition()); - if ( pt.x <= (wxPG_XBEFORETEXT-2+cb->m_boxHeight) ) + // If mouse cursor was on the item, toggle the value now. + if ( propGrid->GetInternalFlags() & wxPG_FL_ACTIVATION_BY_CLICK ) { - cb->m_state++; - - if ( cb->m_state > 1 ) - cb->m_state = 0; - - // Makes sure wxPG_EVT_CHANGING etc. is sent for this initial click - propGrid->ChangePropertyValue(property, wxPGVariant_Bool(cb->m_state)); + wxPoint pt = cb->ScreenToClient(::wxGetMousePosition()); + if ( pt.x <= (wxPG_XBEFORETEXT-2+cb->m_boxHeight) ) + { + if ( cb->m_state & wxSCB_STATE_CHECKED ) + cb->m_state &= ~wxSCB_STATE_CHECKED; + else + cb->m_state |= wxSCB_STATE_CHECKED; + + // Makes sure wxPG_EVT_CHANGING etc. is sent for this initial + // click + propGrid->ChangePropertyValue(property, + wxPGVariant_Bool(cb->m_state)); + } } } @@ -1426,53 +1643,42 @@ wxPGWindowList wxPGCheckBoxEditor::CreateControls( wxPropertyGrid* propGrid, return cb; } -/* -class wxPGCheckBoxRenderer : public wxPGDefaultRenderer +void wxPGCheckBoxEditor::DrawValue( wxDC& dc, const wxRect& rect, + wxPGProperty* property, + const wxString& WXUNUSED(text) ) const { -public: + int state = wxSCB_STATE_UNCHECKED; - virtual void Render( wxDC& dc, const wxRect& rect, - const wxPropertyGrid* WXUNUSED(propertyGrid), wxPGProperty* property, - int WXUNUSED(column), int WXUNUSED(item), int WXUNUSED(flags) ) const + if ( !property->IsValueUnspecified() ) { - int state = 0; - if ( !(property->GetFlags() & wxPG_PROP_UNSPECIFIED) ) - { - state = ((wxPGProperty*)property)->GetChoiceInfo((wxPGChoiceInfo*)NULL); - if ( dc.GetFont().GetWeight() == wxBOLD ) state |= 2; - } - DrawSimpleCheckBox(dc,rect,dc.GetCharHeight(),state,dc.GetTextForeground()); + state = property->GetChoiceSelection(); + if ( dc.GetFont().GetWeight() == wxBOLD ) + state |= wxSCB_STATE_BOLD; + } + else + { + state |= wxSCB_STATE_UNSPECIFIED; } -protected: -}; - -wxPGCheckBoxRenderer g_wxPGCheckBoxRenderer; - -wxPGCellRenderer* wxPGCheckBoxEditor::GetCellRenderer() const -{ - return &g_wxPGCheckBoxRenderer; + DrawSimpleCheckBox(dc, rect, dc.GetCharHeight(), state); } -*/ -void wxPGCheckBoxEditor::DrawValue( wxDC& dc, const wxRect& rect, wxPGProperty* property, const wxString& WXUNUSED(text) ) const +void wxPGCheckBoxEditor::UpdateControl( wxPGProperty* property, + wxWindow* ctrl ) const { - int state = 0; + wxSimpleCheckBox* cb = (wxSimpleCheckBox*) ctrl; + wxASSERT( cb ); + if ( !property->IsValueUnspecified() ) - { - state = property->GetChoiceSelection(); - if ( dc.GetFont().GetWeight() == wxBOLD ) state |= 2; - } - DrawSimpleCheckBox(dc,rect,dc.GetCharHeight(),state,dc.GetTextForeground()); -} + cb->m_state = property->GetChoiceSelection(); + else + cb->m_state = wxSCB_STATE_UNSPECIFIED; -void wxPGCheckBoxEditor::UpdateControl( wxPGProperty* property, wxWindow* ctrl ) const -{ - wxASSERT( ctrl ); - ((wxSimpleCheckBox*)ctrl)->m_state = property->GetChoiceSelection(); - ctrl->Refresh(); -} + wxPropertyGrid* propGrid = property->GetGrid(); + cb->m_boxHeight = propGrid->GetFontHeight(); + cb->Refresh(); +} bool wxPGCheckBoxEditor::OnEvent( wxPropertyGrid* WXUNUSED(propGrid), wxPGProperty* WXUNUSED(property), wxWindow* WXUNUSED(ctrl), wxEvent& event ) const @@ -1513,13 +1719,15 @@ void wxPGCheckBoxEditor::SetControlIntValue( wxPGProperty* WXUNUSED(property), w void wxPGCheckBoxEditor::SetValueToUnspecified( wxPGProperty* WXUNUSED(property), wxWindow* ctrl ) const { - ((wxSimpleCheckBox*)ctrl)->m_state = 0; + ((wxSimpleCheckBox*)ctrl)->m_state = wxSCB_STATE_UNSPECIFIED; ctrl->Refresh(); } -wxPGCheckBoxEditor::~wxPGCheckBoxEditor() { } - +wxPGCheckBoxEditor::~wxPGCheckBoxEditor() +{ + wxPG_EDITOR(CheckBox) = NULL; +} #endif // wxPG_INCLUDE_CHECKBOX @@ -1539,12 +1747,11 @@ wxWindow* wxPropertyGrid::GetEditorControl() const void wxPropertyGrid::CorrectEditorWidgetSizeX() { - if ( m_selColumn == -1 ) - return; - int secWid = 0; - int newSplitterx = m_pState->DoGetSplitterPosition(m_selColumn-1); - int newWidth = newSplitterx + m_pState->m_colWidths[m_selColumn]; + + // Use fixed selColumn 1 for main editor widgets + int newSplitterx = m_pState->DoGetSplitterPosition(0); + int newWidth = newSplitterx + m_pState->m_colWidths[1]; if ( m_wndEditor2 ) { @@ -1584,25 +1791,41 @@ void wxPropertyGrid::CorrectEditorWidgetSizeX() void wxPropertyGrid::CorrectEditorWidgetPosY() { - if ( m_selected && (m_wndEditor || m_wndEditor2) ) - { - wxRect r = GetEditorWidgetRect(m_selected, m_selColumn); + wxPGProperty* selected = GetSelection(); - if ( m_wndEditor ) + if ( selected ) + { + if ( m_labelEditor ) { - wxPoint pos = m_wndEditor->GetPosition(); + wxRect r = GetEditorWidgetRect(selected, m_selColumn); + wxPoint pos = m_labelEditor->GetPosition(); // Calculate y offset int offset = pos.y % m_lineHeight; - m_wndEditor->Move(pos.x, r.y + offset); + m_labelEditor->Move(pos.x, r.y + offset); } - if ( m_wndEditor2 ) + if ( m_wndEditor || m_wndEditor2 ) { - wxPoint pos = m_wndEditor2->GetPosition(); + wxRect r = GetEditorWidgetRect(selected, 1); + + if ( m_wndEditor ) + { + wxPoint pos = m_wndEditor->GetPosition(); - m_wndEditor2->Move(pos.x, r.y); + // Calculate y offset + int offset = pos.y % m_lineHeight; + + m_wndEditor->Move(pos.x, r.y + offset); + } + + if ( m_wndEditor2 ) + { + wxPoint pos = m_wndEditor2->GetPosition(); + + m_wndEditor2->Move(pos.x, r.y); + } } } } @@ -1611,7 +1834,9 @@ void wxPropertyGrid::CorrectEditorWidgetPosY() // Fixes position of wxTextCtrl-like control (wxSpinCtrl usually // fits into that category as well). -void wxPropertyGrid::FixPosForTextCtrl( wxWindow* ctrl, const wxPoint& offset ) +void wxPropertyGrid::FixPosForTextCtrl( wxWindow* ctrl, + unsigned int WXUNUSED(forColumn), + const wxPoint& offset ) { // Center the control vertically wxRect finalPos = ctrl->GetRect(); @@ -1624,7 +1849,14 @@ void wxPropertyGrid::FixPosForTextCtrl( wxWindow* ctrl, const wxPoint& offset ) finalPos.y += y_adj; finalPos.height -= (y_adj+sz_dec); - const int textCtrlXAdjust = wxPG_TEXTCTRLXADJUST; +#ifndef wxPG_TEXTCTRLXADJUST + int textCtrlXAdjust = wxPG_XBEFORETEXT - 1; + + wxTextCtrl* tc = static_cast(ctrl); + tc->SetMargins(0); +#else + int textCtrlXAdjust = wxPG_TEXTCTRLXADJUST; +#endif finalPos.x += textCtrlXAdjust; finalPos.width -= textCtrlXAdjust; @@ -1642,15 +1874,16 @@ wxWindow* wxPropertyGrid::GenerateEditorTextCtrl( const wxPoint& pos, const wxString& value, wxWindow* secondary, int extraStyle, - int maxLen ) + int maxLen, + unsigned int forColumn ) { wxWindowID id = wxPG_SUBID1; - wxPGProperty* selected = m_selected; - wxASSERT(selected); + wxPGProperty* prop = GetSelection(); + wxASSERT(prop); int tcFlags = wxTE_PROCESS_ENTER | extraStyle; - if ( selected->HasFlag(wxPG_PROP_READONLY) ) + if ( prop->HasFlag(wxPG_PROP_READONLY) && forColumn == 1 ) tcFlags |= wxTE_READONLY; wxPoint p(pos.x,pos.y); @@ -1661,7 +1894,11 @@ wxWindow* wxPropertyGrid::GenerateEditorTextCtrl( const wxPoint& pos, s.x -= 8; #endif - // Take button into acccount + // For label editors, trim the size to allow better splitter grabbing + if ( forColumn != 1 ) + s.x -= 2; + + // Take button into acccount if ( secondary ) { s.x -= (secondary->GetSize().x + wxPG_TEXTCTRL_AND_BUTTON_SPACING); @@ -1686,15 +1923,38 @@ wxWindow* wxPropertyGrid::GenerateEditorTextCtrl( const wxPoint& pos, #endif SetupTextCtrlValue(value); tc->Create(ctrlParent,id,value, p, s,tcFlags); - - wxWindow* ed = tc; + +#if defined(__WXMSW__) + // On Windows, we need to override read-only text ctrl's background + // colour to white. One problem with native 'grey' background is that + // tc->GetBackgroundColour() doesn't seem to return correct value + // for it. + if ( tcFlags & wxTE_READONLY ) + { + wxVisualAttributes vattrs = tc->GetDefaultAttributes(); + tc->SetBackgroundColour(vattrs.colBg); + } +#endif + + // This code is repeated from DoSelectProperty(). However, font boldness + // must be set before margin is set up below in FixPosForTextCtrl(). + if ( forColumn == 1 && + prop->HasFlag(wxPG_PROP_MODIFIED) && + HasFlag(wxPG_BOLD_MODIFIED) ) + tc->SetFont( m_captionFont ); // Center the control vertically if ( !hasSpecialSize ) - FixPosForTextCtrl(ed); + FixPosForTextCtrl(tc, forColumn); + + if ( forColumn != 1 ) + { + tc->SetBackgroundColour(m_colSelBack); + tc->SetForegroundColour(m_colSelFore); + } #ifdef __WXMSW__ - ed->Show(); + tc->Show(); if ( secondary ) secondary->Show(); #endif @@ -1703,14 +1963,17 @@ wxWindow* wxPropertyGrid::GenerateEditorTextCtrl( const wxPoint& pos, if ( maxLen > 0 ) tc->SetMaxLength( maxLen ); - // Connect event handling - id = ed->GetId(); - this->Connect(id, wxEVT_COMMAND_TEXT_UPDATED, - wxEventHandler(wxPropertyGrid::OnCustomEditorEvent)); - this->Connect(id, wxEVT_COMMAND_TEXT_ENTER, - wxEventHandler(wxPropertyGrid::OnCustomEditorEvent)); + wxVariant attrVal = prop->GetAttribute(wxPG_ATTR_AUTOCOMPLETE); + if ( !attrVal.IsNull() ) + { + wxASSERT(attrVal.GetType() == wxS("arrstring")); + tc->AutoComplete(attrVal.GetArrayString()); + } + + // Set hint text + tc->SetHint(prop->GetHintText()); - return (wxWindow*) ed; + return tc; } // ----------------------------------------------------------------------- @@ -1718,7 +1981,7 @@ wxWindow* wxPropertyGrid::GenerateEditorTextCtrl( const wxPoint& pos, wxWindow* wxPropertyGrid::GenerateEditorButton( const wxPoint& pos, const wxSize& sz ) { wxWindowID id = wxPG_SUBID2; - wxPGProperty* selected = m_selected; + wxPGProperty* selected = GetSelection(); wxASSERT(selected); #ifdef __WXMAC__ @@ -1736,7 +1999,7 @@ wxWindow* wxPropertyGrid::GenerateEditorButton( const wxPoint& pos, const wxSize p.x = pos.x + sz.x - but->GetSize().x - 2; but->Move(p); -#else +#else wxSize s(sz.y-(wxPG_BUTTON_SIZEDEC*2)+(wxPG_NAT_BUTTON_BORDER_Y*2), sz.y-(wxPG_BUTTON_SIZEDEC*2)+(wxPG_NAT_BUTTON_BORDER_Y*2)); @@ -1771,11 +2034,6 @@ wxWindow* wxPropertyGrid::GenerateEditorButton( const wxPoint& pos, const wxSize if ( selected->HasFlag(wxPG_PROP_READONLY) ) but->Disable(); - // Connect event handling - id = but->GetId(); - this->Connect(id, wxEVT_COMMAND_BUTTON_CLICKED, - wxEventHandler(wxPropertyGrid::OnCustomEditorEvent)); - return but; } @@ -1796,7 +2054,7 @@ wxWindow* wxPropertyGrid::GenerateEditorTextCtrlAndButton( const wxPoint& pos, // There is button Show in GenerateEditorTextCtrl as well but->Show(); #endif - return (wxWindow*) NULL; + return NULL; } wxString text; @@ -1809,6 +2067,28 @@ wxWindow* wxPropertyGrid::GenerateEditorTextCtrlAndButton( const wxPoint& pos, // ----------------------------------------------------------------------- +void wxPropertyGrid::SetEditorAppearance( const wxPGCell& cell, + bool unspecified ) +{ + wxPGProperty* property = GetSelection(); + if ( !property ) + return; + wxWindow* ctrl = GetEditorControl(); + if ( !ctrl ) + return; + + property->GetEditorClass()->SetControlAppearance( this, + property, + ctrl, + cell, + m_editorAppearance, + unspecified ); + + m_editorAppearance = cell; +} + +// ----------------------------------------------------------------------- + wxTextCtrl* wxPropertyGrid::GetEditorTextCtrl() const { wxWindow* wnd = GetEditorControl(); @@ -1873,49 +2153,48 @@ wxPGMultiButton::wxPGMultiButton( wxPropertyGrid* pg, const wxSize& sz ) SetBackgroundColour(pg->GetCellBackgroundColour()); } -void wxPGMultiButton::Finalize( wxPropertyGrid* propGrid, const wxPoint& pos ) +void wxPGMultiButton::Finalize( wxPropertyGrid* WXUNUSED(propGrid), + const wxPoint& pos ) { Move( pos.x + m_fullEditorSize.x - m_buttonsWidth, pos.y ); - - // Connect event handling - for ( unsigned int i=0; iConnect(id, wxEVT_COMMAND_BUTTON_CLICKED, - wxEventHandler(wxPropertyGrid::OnCustomEditorEvent)); - } } -int wxPGMultiButton::GenId( int id ) const +int wxPGMultiButton::GenId( int itemid ) const { - if ( id < -1 ) + if ( itemid < -1 ) { if ( m_buttons.size() ) - id = GetButton(m_buttons.size()-1)->GetId() + 1; + itemid = GetButton(m_buttons.size()-1)->GetId() + 1; else - id = wxPG_SUBID2; + itemid = wxPG_SUBID2; } - return id; + return itemid; } #if wxUSE_BMPBUTTON -void wxPGMultiButton::Add( const wxBitmap& bitmap, int id ) +void wxPGMultiButton::Add( const wxBitmap& bitmap, int itemid ) { - id = GenId(id); + itemid = GenId(itemid); wxSize sz = GetSize(); - wxButton* button = new wxBitmapButton( this, id, bitmap, wxPoint(sz.x, 0), wxSize(sz.y, sz.y) ); - m_buttons.push_back(button); - int bw = button->GetSize().x; - SetSize(wxSize(sz.x+bw,sz.y)); - m_buttonsWidth += bw; + wxButton* button = new wxBitmapButton( this, itemid, bitmap, + wxPoint(sz.x, 0), + wxSize(sz.y, sz.y) ); + DoAddButton( button, sz ); } #endif -void wxPGMultiButton::Add( const wxString& label, int id ) +void wxPGMultiButton::Add( const wxString& label, int itemid ) { - id = GenId(id); + itemid = GenId(itemid); wxSize sz = GetSize(); - wxButton* button = new wxButton( this, id, label, wxPoint(sz.x, 0), wxSize(sz.y, sz.y) ); + wxButton* button = new wxButton( this, itemid, label, wxPoint(sz.x, 0), + wxSize(sz.y, sz.y) ); + DoAddButton( button, sz ); +} + +void wxPGMultiButton::DoAddButton( wxWindow* button, + const wxSize& sz ) +{ m_buttons.push_back(button); int bw = button->GetSize().x; SetSize(wxSize(sz.x+bw,sz.y));