Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

[wxWidgets.git] / interface / wx / windowid.h

diff --git a/interface/wx/windowid.h b/interface/wx/windowid.h
index 2f0308d5518e325cce32f6a40c7ec235ef2ee05c..36d4bf2c1b676758f09f95f704e0a6a9417e3faf 100644 (file)
--- a/interface/wx/windowid.h
+++ b/interface/wx/windowid.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxIdManager
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -19,7 +19,7 @@ typedef int wxWindowID;
     and can also be used be used directly.
 
     @library{wxcore}
-    @category{misc}
+    @category{cfg}
 
     @see wxWindow::NewControlId(), wxWindow::UnreserveControlId(),
          @ref overview_windowids
@@ -39,7 +39,7 @@ public:
 
         @return The value of the first ID in the sequence, or wxID_NONE.
     */
-    static wxWindowID ReserveControlId(int count = 1);
+    static wxWindowID ReserveId(int count = 1);
 
     /**
         Called directly by wxWindow::UnreserveControlId(), this function will
@@ -54,6 +54,6 @@ public:
 
         @return The value of the first ID in the sequence, or wxID_NONE.
     */
-    static wxWindowID UnreserveControlId(wxWindowID id, int count = 1);
+    static void UnreserveId(wxWindowID id, int count = 1);
 };