projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove old libpng 1.2.7
[wxWidgets.git]
/
src
/
common
/
choiccmn.cpp
diff --git
a/src/common/choiccmn.cpp
b/src/common/choiccmn.cpp
index 06345dbdc6e7198961e0f1bd16b271a62036da2c..db5fea5e20adcd11e8c5a4c1a3ce2876297d4aab 100644
(file)
--- a/
src/common/choiccmn.cpp
+++ b/
src/common/choiccmn.cpp
@@
-1,12
+1,12
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: common/choiccmn.cpp
+// Name:
src/
common/choiccmn.cpp
// Purpose: common (to all ports) wxChoice functions
// Author: Vadim Zeitlin
// Modified by:
// Created: 26.07.99
// RCS-ID: $Id$
// Purpose: common (to all ports) wxChoice functions
// Author: Vadim Zeitlin
// Modified by:
// Created: 26.07.99
// RCS-ID: $Id$
-// Copyright: (c) wxWi
ndow
s team
-// Licence: wxWindows licen
s
e
+// Copyright: (c) wxWi
dget
s team
+// Licence: wxWindows licen
c
e
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
@@
-17,10
+17,6
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "choicebase.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
@@
-30,27
+26,20
@@
#if wxUSE_CHOICE
#if wxUSE_CHOICE
+#include "wx/choice.h"
+
#ifndef WX_PRECOMP
#ifndef WX_PRECOMP
- #include "wx/choice.h"
#endif
#endif
+const wxChar wxChoiceNameStr[] = wxT("choice");
+
// ============================================================================
// implementation
// ============================================================================
// ============================================================================
// implementation
// ============================================================================
-// ----------------------------------------------------------------------------
-// selection
-// ----------------------------------------------------------------------------
-
-bool wxChoiceBase::SetStringSelection(const wxString& s)
+wxChoiceBase::~wxChoiceBase()
{
{
- int sel = FindString(s);
- wxCHECK_MSG( sel != -1, FALSE,
- wxT("invalid string in wxChoice::SetStringSelection") );
-
- Select(sel);
-
- return TRUE;
+ // this destructor is required for Darwin
}
// ----------------------------------------------------------------------------
}
// ----------------------------------------------------------------------------
@@
-59,9
+48,8
@@
bool wxChoiceBase::SetStringSelection(const wxString& s)
void wxChoiceBase::Command(wxCommandEvent& event)
{
void wxChoiceBase::Command(wxCommandEvent& event)
{
- SetSelection(event.
m_commandInt
);
+ SetSelection(event.
GetInt()
);
(void)ProcessEvent(event);
}
#endif // wxUSE_CHOICE
(void)ProcessEvent(event);
}
#endif // wxUSE_CHOICE
-