amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix some overload issues with wxWidgets.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1506 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
coppro
2010-08-30 21:44:17 +00:00
parent 38a3a48a67
commit 285fed3dbd
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/set/cards_panel.cpp
+7 -6
View File
@@ -63,10 +63,11 @@ class FilterCtrl : public wxControl {
void update();
bool hasFocus();
// wxWidgets appears to have developed an overload allergy
void onChange();
void onChange(wxCommandEvent&);
void onChangeEvent(wxCommandEvent&);
void onClear(wxCommandEvent&);
void onSize(wxSizeEvent&);
void onSizeEvent(wxSizeEvent&);
void onSize();
public:
void onSetFocus(wxFocusEvent&);
@@ -118,7 +119,7 @@ void FilterCtrl::update() {
changing = false;
}
void FilterCtrl::onChange(wxCommandEvent&) {
void FilterCtrl::onChangeEvent(wxCommandEvent&) {
if (!changing) {
setFilter(filter_ctrl->GetValue(),true);
}
@@ -128,7 +129,7 @@ void FilterCtrl::onClear(wxCommandEvent&) {
setFilter(String(),true);
}
void FilterCtrl::onSize(wxSizeEvent&) {
void FilterCtrl::onSizeEvent(wxSizeEvent&) {
onSize();
}
void FilterCtrl::onSize() {
@@ -155,8 +156,8 @@ bool FilterCtrl::hasFocus() {
BEGIN_EVENT_TABLE(FilterCtrl, wxControl)
EVT_BUTTON (wxID_ANY, FilterCtrl::onClear)
EVT_TEXT (wxID_ANY, FilterCtrl::onChange)
EVT_SIZE (FilterCtrl::onSize)
EVT_TEXT (wxID_ANY, FilterCtrl::onChangeEvent)
EVT_SIZE (FilterCtrl::onSizeEvent)
EVT_SET_FOCUS (FilterCtrl::onSetFocus)
EVT_KILL_FOCUS(FilterCtrl::onKillFocus)
END_EVENT_TABLE()