Partly reverted changes to Get(Current)Selection.

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

diff --git a/include/wx/os2/choice.h b/include/wx/os2/choice.h
index b04aee3d72986584051e06269597eeedff2841ce..1dbff3e6a6dca3c2e27dab35bde5b921edab55af 100644 (file)
--- a/include/wx/os2/choice.h
+++ b/include/wx/os2/choice.h
@@ -22,7 +22,7 @@ class WXDLLEXPORT wxChoice: public wxChoiceBase
 
 public:
     // ctors
-    inline wxChoice() { Init(); }
+    inline wxChoice() { }
     virtual ~wxChoice();
 
     inline wxChoice( wxWindow*          pParent
@@ -36,7 +36,6 @@ public:
                     ,const wxString&    rsName = wxChoiceNameStr
                    )
     {
-        Init();
         Create( pParent
                ,vId
                ,rPos
@@ -59,7 +58,6 @@ public:
                     ,const wxString&      rsName = wxChoiceNameStr
                    )
     {
-        Init();
         Create( pParent
                ,vId
                ,rPos
@@ -100,7 +98,7 @@ public:
 
     virtual unsigned int GetCount() const;
     virtual int      GetSelection(void) const;
-    virtual int      GetCurrentSelection(void) const;
+    virtual int      GetCurrentSelection(void) const { return GetSelection(); }
     virtual void     SetSelection(int n);
 
     virtual wxString GetString(unsigned int n) const;
@@ -118,9 +116,6 @@ public:
                                   );
 
 protected:
-    // common part of all ctors
-    void Init() { m_lastAcceptedSelection = wxID_NONE; }
-
     virtual int           DoAppend(const wxString& rsItem);
     virtual int           DoInsert(const wxString& rsItem, unsigned int pos);
     virtual void          DoSetItemClientData(unsigned int n, void* pClientData);
@@ -135,11 +130,6 @@ protected:
                                     ,int nsizeFlags = wxSIZE_AUTO
                                    );
     void                  Free(void);
-
-    // last "completed" selection, i.e. not the transient one while the user is
-    // browsing the popup list: this is only used when != wxID_NONE which is
-    // the case while the drop down is opened
-    int m_lastAcceptedSelection;
 }; // end of CLASS wxChoice
 
 #endif // _WX_CHOICE_H_

diff --git a/src/os2/choice.cpp b/src/os2/choice.cpp
index 50551d72a2e732c83ff4f338826eedd445c3c4d7..9510b57188f59413e07dbdb9e5176d5c919f9939 100644 (file)
--- a/src/os2/choice.cpp
+++ b/src/os2/choice.cpp
@@ -177,17 +177,6 @@ void wxChoice::Clear()
 // ----------------------------------------------------------------------------
 
 int wxChoice::GetSelection() const
-{
-    // if m_lastAcceptedSelection is set, it means that the dropdown is
-    // currently shown and that we want to use the last "permanent" selection
-    // instead of whatever is under the mouse pointer currently
-    //
-    // otherwise, get the selection from the control
-    return m_lastAcceptedSelection == wxID_NONE ? GetCurrentSelection()
-                                                : m_lastAcceptedSelection;
-}
-
-int wxChoice::GetCurrentSelection() const
 {
     return((int)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYSELECTION, (MPARAM)LIT_FIRST, (MPARAM)0)));
 } // end of wxChoice::GetSelection