Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use wxDynamicCast() instead of IsKindOf() checks.

Browse Source
This commit is contained in:
Artur Wieczorek
2015-05-28 19:20:12 +02:00
parent ee973e1fe7
commit 6908275ed2
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/propgrid/editors.cpp
View File

@@ -353,7 +353,7 @@ void wxPGTextCtrlEditor::DrawValue( wxDC& dc, wxPGProperty* property, const wxRe
// Code below should no longer be needed, as the obfuscation // Code below should no longer be needed, as the obfuscation
// is now done in GetValueAsString. // is now done in GetValueAsString.
/*if ( property->HasFlag(wxPG_PROP_PASSWORD) && /*if ( property->HasFlag(wxPG_PROP_PASSWORD) &&
property->IsKindOf(WX_PG_CLASSINFO(wxStringProperty)) ) wxDynamicCast(property, wxStringProperty) )
{ {
size_t a = drawStr.length(); size_t a = drawStr.length();
drawStr.Empty(); drawStr.Empty();

14
src/propgrid/manager.cpp
View File

@@ -345,18 +345,16 @@ private:
virtual bool ProcessEvent( wxEvent& event ) wxOVERRIDE virtual bool ProcessEvent( wxEvent& event ) wxOVERRIDE
{ {
if ( event.IsKindOf(wxCLASSINFO(wxHeaderCtrlEvent)) ) wxHeaderCtrlEvent* hcEvent = wxDynamicCast(&event, wxHeaderCtrlEvent);
if ( hcEvent )
{ {
wxHeaderCtrlEvent& hcEvent =
static_cast<wxHeaderCtrlEvent&>(event);
wxPropertyGrid* pg = m_manager->GetGrid(); wxPropertyGrid* pg = m_manager->GetGrid();
int col = hcEvent.GetColumn(); int col = hcEvent->GetColumn();
wxEventType evtType = event.GetEventType(); wxEventType evtType = event.GetEventType();
if ( evtType == wxEVT_HEADER_RESIZING ) if ( evtType == wxEVT_HEADER_RESIZING )
{ {
int colWidth = hcEvent.GetWidth(); int colWidth = hcEvent->GetWidth();
OnSetColumnWidth(col, colWidth); OnSetColumnWidth(col, colWidth);
@@ -370,12 +368,12 @@ private:
{ {
// Never allow column resize if layout is static // Never allow column resize if layout is static
if ( m_manager->HasFlag(wxPG_STATIC_SPLITTER) ) if ( m_manager->HasFlag(wxPG_STATIC_SPLITTER) )
hcEvent.Veto(); hcEvent->Veto();
// Allow application to veto dragging // Allow application to veto dragging
else if ( pg->SendEvent(wxEVT_PG_COL_BEGIN_DRAG, else if ( pg->SendEvent(wxEVT_PG_COL_BEGIN_DRAG,
NULL, NULL, 0, NULL, NULL, 0,
(unsigned int)col) ) (unsigned int)col) )
hcEvent.Veto(); hcEvent->Veto();
return true; return true;
} }

2
src/propgrid/property.cpp
View File

@@ -504,7 +504,7 @@ void wxPGProperty::InitAfterAdded( wxPropertyGridPageState* pageState,
// (so propgrid can be NULL, too). // (so propgrid can be NULL, too).
wxPGProperty* parent = m_parent; wxPGProperty* parent = m_parent;
bool parentIsRoot = parent->IsKindOf(wxCLASSINFO(wxPGRootProperty)); bool parentIsRoot = wxDynamicCast(parent, wxPGRootProperty) != NULL;
// //
// Convert invalid cells to default ones in this grid // Convert invalid cells to default ones in this grid