Use wxWindowID in wxNewId() and related functions.

wxNewId(), wxRegisterId() and wxGetCurrentId() functions all work with
window IDs, so they should use the dedicated type. Previously, they
worked with long, which is not even the same type (wxWindowID is int),
causing implicit type conversion warnings.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/utils.h b/include/wx/utils.h
index 3df820da5737c656e889c433c0a22541fe11c766..edbd7de380d091b0196d506a5bfd1035881663d1 100644 (file)
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -273,13 +273,13 @@ inline bool wxPlatformIs(int platform) { return wxPlatform::Is(platform); }
 // ----------------------------------------------------------------------------
 
 // Ensure subsequent IDs don't clash with this one
 // ----------------------------------------------------------------------------
 
 // Ensure subsequent IDs don't clash with this one

-WXDLLIMPEXP_BASE void wxRegisterId(long id);
+WXDLLIMPEXP_BASE void wxRegisterId(wxWindowID id);

 
 // Return the current ID
 
 // Return the current ID

-WXDLLIMPEXP_BASE long wxGetCurrentId();
+WXDLLIMPEXP_BASE wxWindowID wxGetCurrentId();

 
 // Generate a unique ID
 
 // Generate a unique ID

-WXDLLIMPEXP_BASE long wxNewId();
+WXDLLIMPEXP_BASE wxWindowID wxNewId();

 
 // ----------------------------------------------------------------------------
 // Various conversions
 
 // ----------------------------------------------------------------------------
 // Various conversions

diff --git a/interface/wx/utils.h b/interface/wx/utils.h
index 34a9e15347460572c0d182de67325c60e1614f1c..ad37f8030cde5a5b5d9f5288fefc21691459d3e0 100644 (file)
--- a/interface/wx/utils.h
+++ b/interface/wx/utils.h
@@ -459,7 +459,7 @@ int wxFindMenuItemId(wxFrame* frame, const wxString& menuString,
 
     @header{wx/utils.h}
 */
 
     @header{wx/utils.h}
 */

-long wxNewId();
+wxWindowID wxNewId();

 
 /**
     Ensures that Ids subsequently generated by wxNewId() do not clash with the
 
 /**
     Ensures that Ids subsequently generated by wxNewId() do not clash with the


@@ -467,7 +467,7 @@ long wxNewId();
 
     @header{wx/utils.h}
 */
 
     @header{wx/utils.h}
 */

-void wxRegisterId(long id);
+void wxRegisterId(wxWindowID id);

 
 /**
     Opens the @a document in the application associated with the files of this
 
 /**
     Opens the @a document in the application associated with the files of this

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index f5ba00045b353b1969facff50324b6799bb591cb..5cd3d8e3c7977a08d60127148b6020d4d023b4d4 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -714,9 +714,9 @@ long wxExecute(const wxString& command,
 // ----------------------------------------------------------------------------
 
 // Id generation
 // ----------------------------------------------------------------------------
 
 // Id generation

-static long wxCurrentId = 100;
+static wxWindowID wxCurrentId = 100;

 
 

-long wxNewId()
+wxWindowID wxNewId()

 {
     // skip the part of IDs space that contains hard-coded values:
     if (wxCurrentId == wxID_LOWEST)
 {
     // skip the part of IDs space that contains hard-coded values:
     if (wxCurrentId == wxID_LOWEST)


@@ -725,11 +725,11 @@ long wxNewId()
     return wxCurrentId++;
 }
 
     return wxCurrentId++;
 }
 

-long
+wxWindowID

 wxGetCurrentId(void) { return wxCurrentId; }
 
 void
 wxGetCurrentId(void) { return wxCurrentId; }
 
 void

-wxRegisterId (long id)
+wxRegisterId (wxWindowID id)

 {
   if (id >= wxCurrentId)
     wxCurrentId = id + 1;
 {
   if (id >= wxCurrentId)
     wxCurrentId = id + 1;