don't mark GetTraceMask() deprecated as we use it in the same header which provokes...

[wxWidgets.git] / src / common / windowid.cpp

diff --git a/src/common/windowid.cpp b/src/common/windowid.cpp
index aace85973c18766bb63e2a93ee4d714125c900ab..a254d023d778cf73d5f00f6322c5903c068905cc 100644 (file)
--- a/src/common/windowid.cpp
+++ b/src/common/windowid.cpp
@@ -118,7 +118,7 @@ void DecIdRefCount(wxWindowID id)
     // so it should never be reserved, but test anyway
     if(gs_autoIdsRefCount[id] == ID_RESERVED)
     {
-        wxASSERT_MSG(false, wxT("reserve id being decreased"));
+        wxFAIL_MSG(wxT("reserve id being decreased"));
         gs_autoIdsRefCount[id] = ID_FREE;
     }
     else
@@ -202,7 +202,7 @@ wxWindowID wxIdManager::ReserveId(int count)
                     while(count--)
                         ReserveIdRefCount(id--);
 
-                    return id;
+                    return id + 1;
                 }
             }
             else
@@ -212,7 +212,7 @@ wxWindowID wxIdManager::ReserveId(int count)
         }
     }
 
-    ::wxLogError(_("Out of window IDs.  Recommend shutting down application."));
+    wxLogError(_("Out of window IDs.  Recommend shutting down application."));
     return wxID_NONE;
 #else // !wxUSE_AUTOID_MANAGEMENT
     // Make sure enough in the range