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 62261621a7f13848ac3dcd16a041d42e161a444a..36d4bf2c1b676758f09f95f704e0a6a9417e3faf 100644 (file)
--- a/interface/wx/windowid.h
+++ b/interface/wx/windowid.h
@@ -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);
 };