Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Partly reverted changes to Get(Current)Selection.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2006-06-18 19:25:41 +00:00
parent 7c2151fa69
commit 1ebd017e14
2 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/os2/choice.h
View File

@@ -22,7 +22,7 @@ class WXDLLEXPORT wxChoice: public wxChoiceBase
public: public:
// ctors // ctors
inline wxChoice() { Init(); } inline wxChoice() { }
virtual ~wxChoice(); virtual ~wxChoice();
inline wxChoice( wxWindow* pParent inline wxChoice( wxWindow* pParent
@@ -36,7 +36,6 @@ public:
,const wxString& rsName = wxChoiceNameStr ,const wxString& rsName = wxChoiceNameStr
) )
{ {
Init();
Create( pParent Create( pParent
,vId ,vId
,rPos ,rPos
@@ -59,7 +58,6 @@ public:
,const wxString& rsName = wxChoiceNameStr ,const wxString& rsName = wxChoiceNameStr
) )
{ {
Init();
Create( pParent Create( pParent
,vId ,vId
,rPos ,rPos
@@ -100,7 +98,7 @@ public:
virtual unsigned int GetCount() const; virtual unsigned int GetCount() const;
virtual int GetSelection(void) const; virtual int GetSelection(void) const;
virtual int GetCurrentSelection(void) const; virtual int GetCurrentSelection(void) const { return GetSelection(); }
virtual void SetSelection(int n); virtual void SetSelection(int n);
virtual wxString GetString(unsigned int n) const; virtual wxString GetString(unsigned int n) const;
@@ -118,9 +116,6 @@ public:
); );
protected: protected:
// common part of all ctors
void Init() { m_lastAcceptedSelection = wxID_NONE; }
virtual int DoAppend(const wxString& rsItem); virtual int DoAppend(const wxString& rsItem);
virtual int DoInsert(const wxString& rsItem, unsigned int pos); virtual int DoInsert(const wxString& rsItem, unsigned int pos);
virtual void DoSetItemClientData(unsigned int n, void* pClientData); virtual void DoSetItemClientData(unsigned int n, void* pClientData);
@@ -135,11 +130,6 @@ protected:
,int nsizeFlags = wxSIZE_AUTO ,int nsizeFlags = wxSIZE_AUTO
); );
void Free(void); 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 }; // end of CLASS wxChoice
#endif // _WX_CHOICE_H_ #endif // _WX_CHOICE_H_

11
src/os2/choice.cpp
View File

@@ -177,17 +177,6 @@ void wxChoice::Clear()
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
int wxChoice::GetSelection() const 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))); return((int)LONGFROMMR(::WinSendMsg(GetHwnd(), LM_QUERYSELECTION, (MPARAM)LIT_FIRST, (MPARAM)0)));
} // end of wxChoice::GetSelection } // end of wxChoice::GetSelection