Fix various warnings that only appear for release builds

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/propgrid/advprops.cpp b/src/propgrid/advprops.cpp
index 158a45d680d203bdd3b04d2fe725aa1907768e95..c93ca5fdcf4051e8c68a814c96071eab17144182 100644 (file)
--- a/src/propgrid/advprops.cpp
+++ b/src/propgrid/advprops.cpp
@@ -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") )
     {

diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp
index 31f6f9dd9afcfb334b5d79e8b68aa320f0c413d4..328084687586732832936a0c784d045ae464c334 100644 (file)
--- a/src/propgrid/property.cpp
+++ b/src/propgrid/property.cpp
@@ -544,10 +544,8 @@ void wxPGProperty::InitAfterAdded( wxPropertyGridPageState* pageState,
     // Has initial children
     if ( GetChildCount() )
     {
     // Has initial children
     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"
                       "SetFlag(wxPG_PROP_AGGREGATE) before calling"
                       "wxPGProperty::AddChild()." );
                       "Call SetFlag(wxPG_PROP_MISC_PARENT) or"
                       "SetFlag(wxPG_PROP_AGGREGATE) before calling"
                       "wxPGProperty::AddChild()." );

diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index fa2baef34a25fcfa8511d7943b4741c2dd2936bd..2e4b1a5fa9ecf1429c1488597b189db32f084b06 100644 (file)
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -3311,8 +3311,6 @@ void wxPropertyGrid::FreeEditors()
 // Call with NULL to de-select property
 bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
 {
 // Call with NULL to de-select property
 bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
 {

-    wxPanel* canvas = GetPanel();
-

     /*
     if (p)
         wxLogDebug(wxT("SelectProperty( %s (%s[%i]) )"),p->m_label.c_str(),
     /*
     if (p)
         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.") );
 
                     // Set validator, if any
                                   wxT("CreateControls must use result of wxPropertyGrid::GetPanel() as parent of controls.") );
 
                     // 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.") );
 
                     // Get proper id for wndSecondary
                                   wxT("CreateControls must use result of wxPropertyGrid::GetPanel() as parent of controls.") );
 
                     // Get proper id for wndSecondary

diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp
index 566572ff877c6abf7a94de864d591a67fc486893..bb9d18a7a0184576b6d46f288dbed763cb1c7f1d 100644 (file)
--- a/src/propgrid/props.cpp
+++ b/src/propgrid/props.cpp
@@ -2054,6 +2054,7 @@ bool wxArrayEditorDialog::Create( wxWindow *parent,
     // On wxMAC the dialog shows incorrectly if style is not exactly wxCAPTION
     // FIXME: This should be only a temporary fix.
 #ifdef __WXMAC__
     // On wxMAC the dialog shows incorrectly if style is not exactly wxCAPTION
     // FIXME: This should be only a temporary fix.
 #ifdef __WXMAC__

+    wxUnusedVar(style);

     int useStyle = wxCAPTION;
 #else
     int useStyle = style;
     int useStyle = wxCAPTION;
 #else
     int useStyle = style;