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

Fix various warnings that only appear for release builds

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2008-11-01 16:49:32 +00:00
parent e79d4945d7
commit b0f0eda8ce
4 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/propgrid/advprops.cpp
View File

@@ -929,7 +929,7 @@ void wxSystemColourProperty::OnSetValue()
m_value = TranslateVal(val); m_value = TranslateVal(val);
} }
int ind; int ind = wxNOT_FOUND;
if ( m_value.GetType() == wxS("wxColourPropertyValue") ) if ( m_value.GetType() == wxS("wxColourPropertyValue") )
{ {

4
src/propgrid/property.cpp
View File

@@ -544,10 +544,8 @@ void wxPGProperty::InitAfterAdded( wxPropertyGridPageState* pageState,
// Has initial children // Has initial children
if ( GetChildCount() ) if ( GetChildCount() )
{ {
FlagType parentalFlags = m_flags & wxPG_PROP_PARENTAL_FLAGS;
// Check parental flags // Check parental flags
wxASSERT_MSG( parentalFlags, wxASSERT_MSG( (m_flags & wxPG_PROP_PARENTAL_FLAGS),
"Call SetFlag(wxPG_PROP_MISC_PARENT) or" "Call SetFlag(wxPG_PROP_MISC_PARENT) or"
"SetFlag(wxPG_PROP_AGGREGATE) before calling" "SetFlag(wxPG_PROP_AGGREGATE) before calling"
"wxPGProperty::AddChild()." ); "wxPGProperty::AddChild()." );

6
src/propgrid/propgrid.cpp
View File

@@ -3311,8 +3311,6 @@ void wxPropertyGrid::FreeEditors()
// Call with NULL to de-select property // Call with NULL to de-select property
bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags ) bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
{ {
wxPanel* canvas = GetPanel();
/* /*
if (p) if (p)
wxLogDebug(wxT("SelectProperty( %s (%s[%i]) )"),p->m_label.c_str(), wxLogDebug(wxT("SelectProperty( %s (%s[%i]) )"),p->m_label.c_str(),
@@ -3490,7 +3488,7 @@ bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
if ( m_wndEditor ) if ( m_wndEditor )
{ {
wxASSERT_MSG( m_wndEditor->GetParent() == canvas, wxASSERT_MSG( m_wndEditor->GetParent() == GetPanel(),
wxT("CreateControls must use result of wxPropertyGrid::GetPanel() as parent of controls.") ); wxT("CreateControls must use result of wxPropertyGrid::GetPanel() as parent of controls.") );
// Set validator, if any // Set validator, if any
@@ -3554,7 +3552,7 @@ bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
if ( m_wndEditor2 ) if ( m_wndEditor2 )
{ {
wxASSERT_MSG( m_wndEditor2->GetParent() == canvas, wxASSERT_MSG( m_wndEditor2->GetParent() == GetPanel(),
wxT("CreateControls must use result of wxPropertyGrid::GetPanel() as parent of controls.") ); wxT("CreateControls must use result of wxPropertyGrid::GetPanel() as parent of controls.") );
// Get proper id for wndSecondary // Get proper id for wndSecondary

1
src/propgrid/props.cpp
View File

@@ -2054,6 +2054,7 @@ bool wxArrayEditorDialog::Create( wxWindow *parent,
// On wxMAC the dialog shows incorrectly if style is not exactly wxCAPTION // On wxMAC the dialog shows incorrectly if style is not exactly wxCAPTION
// FIXME: This should be only a temporary fix. // FIXME: This should be only a temporary fix.
#ifdef __WXMAC__ #ifdef __WXMAC__
wxUnusedVar(style);
int useStyle = wxCAPTION; int useStyle = wxCAPTION;
#else #else
int useStyle = style; int useStyle = style;