Reorganize wxCollapsiblePane event and layout code under GTK+

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

diff --git a/src/common/windowid.cpp b/src/common/windowid.cpp
index aace85973c18766bb63e2a93ee4d714125c900ab..8db065e0151340dc62e51d886e760b13eea50b7e 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)
     {
     // 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
         gs_autoIdsRefCount[id] = ID_FREE;
     }
     else


@@ -202,7 +202,7 @@ wxWindowID wxIdManager::ReserveId(int count)
                     while(count--)
                         ReserveIdRefCount(id--);
 
                     while(count--)
                         ReserveIdRefCount(id--);
 

-                    return id;
+                    return id + 1;

                 }
             }
             else
                 }
             }
             else