Add markup support to wxOSX/Cocoa wxStaticText and wxButton.

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

diff --git a/src/common/windowid.cpp b/src/common/windowid.cpp
index 10e57fa66c404bd4289d52d338b97141f059cc24..c4f16f0e82d9d03840914783eff7f43cb5b1cc0c 100644 (file)
--- a/src/common/windowid.cpp
+++ b/src/common/windowid.cpp
@@ -25,7 +25,7 @@
 // Not needed, included in defs.h
 // #include "wx/windowid.h"
 
-#define wxTRACE_WINDOWID _T("windowid")
+#define wxTRACE_WINDOWID wxT("windowid")
 
 namespace
 {
@@ -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