Merge branch 'vlistbox-current-accessors' of https://github.com/wsu-cb/wxWidgets

wxVListBox: add GetCurrent()/SetCurrent() accessors.

See #24204.

include/wx/glcanvas.h

@@ -258,11 +258,6 @@ public:
     // as a parameter
     wxGLContextAttrs& GetGLCTXAttrs() { return m_GLCTXAttrs; }
 
-#ifdef __WXUNIVERSAL__
-    // resolve the conflict with wxWindowUniv::SetCurrent()
-    virtual bool SetCurrent(bool doit) { return wxWindow::SetCurrent(doit); }
-#endif
-
 protected:
     // override this to implement SetColour() in GL_INDEX_MODE
     // (currently only implemented in wxX11)

include/wx/univ/bmpbuttn.h

@@ -50,7 +50,7 @@ public:
 
     virtual bool Enable(bool enable = true) override;
 
-    virtual bool SetCurrent(bool doit = true) override;
+    virtual bool WXMakeCurrent(bool doit = true) override;
 
     virtual void Press() override;
     virtual void Release() override;

include/wx/univ/window.h

@@ -126,7 +126,7 @@ public:
     int GetStateFlags() const;
 
     // set the "highlighted" flag and return true if it changed
-    virtual bool SetCurrent(bool doit = true);
+    virtual bool WXMakeCurrent(bool doit = true);
 
 #if wxUSE_SCROLLBAR
     // get the scrollbar (may be null) for the given orientation

include/wx/vlbox.h

@@ -95,6 +95,12 @@ public:
     bool IsCurrent() const { return wxVScrolledWindow::IsCurrent(); }
     #endif
 
+    // get current item
+    int GetCurrent() const { return m_current; }
+
+    // set current item
+    void SetCurrent(int current) { DoSetCurrent(current); }
+
     // is this item selected?
     bool IsSelected(size_t item) const;