ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Got rid of two unneeded C macros 

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1263 a31d4220-a93d-0410-bf67-fe4944624d44
This commit is contained in:
wowzaman12 2015-03-28 03:50:49 +00:00
parent 3dc751cc02
commit 5e96d2855f
1 changed files with 43 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
src/wx/guiinit.cpp
View File

@ -2260,16 +2260,13 @@ bool MainFrame::InitMore(void)
wxDialog *d = NULL; wxDialog *d = NULL;
#define vfld(dialog_pointer, name, type) SafeXRCCTRL<type>(dialog_pointer,name) #define vfld(dialog_pointer, name, type) SafeXRCCTRL<type>(dialog_pointer,name)
#define getfld(return_value, dialog_pointer, name, type) return_value=SafeXRCCTRL<type>(dialog_pointer,name)
#define getfldv(return_value, dialog_pointer, name, type) \
return_value=SafeXRCCTRL<type>(dialog_pointer,ToString(name).c_str())
//// displayed during run //// displayed during run
d=LoadXRCDialog("GBPrinter"); d=LoadXRCDialog("GBPrinter");
// just verify preview window & mag sel present // just verify preview window & mag sel present
{ {
wxPanel *prev; wxPanel *prev;
getfld(prev, d, "Preview", wxPanel); prev=vfld(d, "Preview", wxPanel);
if(!wxDynamicCast(prev->GetParent(), wxScrolledWindow)) if(!wxDynamicCast(prev->GetParent(), wxScrolledWindow))
throw std::runtime_error("Unable to load a dialog control from the builtin xrc file: Preview"); throw std::runtime_error("Unable to load a dialog control from the builtin xrc file: Preview");
SafeXRCCTRL<wxControlWithItems>(d, "Magnification"); SafeXRCCTRL<wxControlWithItems>(d, "Magnification");
@ -2279,7 +2276,7 @@ bool MainFrame::InitMore(void)
LoadXRCDialog("GBAROMInfo"); LoadXRCDialog("GBAROMInfo");
// just verify fields present // just verify fields present
wxControl *lab; wxControl *lab;
#define getlab(n) getfld(lab, d, n, wxControl) #define getlab(n) lab=vfld(d, n, wxControl)
getlab("Title"); getlab("Title");
getlab("GameCode"); getlab("GameCode");
getlab("MakerCode"); getlab("MakerCode");
@ -2321,21 +2318,21 @@ bool MainFrame::InitMore(void)
#endif #endif
wxRadioButton *rb; wxRadioButton *rb;
#define getrbi(n, o, v) do { \ #define getrbi(n, o, v) do { \
getfld(rb, d, n, wxRadioButton); \ rb=vfld(d, n, wxRadioButton); \
rb->SetValidator(wxBoolIntValidator(&o, v)); \ rb->SetValidator(wxBoolIntValidator(&o, v)); \
} while(0) } while(0)
#define getrbb(n, o) do { \ #define getrbb(n, o) do { \
getfld(rb, d, n, wxRadioButton); \ rb=vfld(d, n, wxRadioButton); \
rb->SetValidator(wxGenericValidator(&o)); \ rb->SetValidator(wxGenericValidator(&o)); \
} while(0) } while(0)
#define getrbbr(n, o) do { \ #define getrbbr(n, o) do { \
getfld(rb, d, n, wxRadioButton); \ rb=vfld(d, n, wxRadioButton); \
rb->SetValidator(wxBoolRevValidator(&o)); \ rb->SetValidator(wxBoolRevValidator(&o)); \
} while(0) } while(0)
wxBoolEnValidator *benval; wxBoolEnValidator *benval;
wxBoolEnHandler *ben; wxBoolEnHandler *ben;
#define getbe(n, o, cv, t, wt) do { \ #define getbe(n, o, cv, t, wt) do { \
getfld(cv, d, n, t); \ cv=vfld(d, n, t); \
cv->SetValidator(wxBoolEnValidator(&o)); \ cv->SetValidator(wxBoolEnValidator(&o)); \
benval = wxStaticCast(cv->GetValidator(), wxBoolEnValidator); \ benval = wxStaticCast(cv->GetValidator(), wxBoolEnValidator); \
static wxBoolEnHandler _ben; \ static wxBoolEnHandler _ben; \
@ -2346,7 +2343,7 @@ bool MainFrame::InitMore(void)
// of checkboxes. A lot of work for little benefit. // of checkboxes. A lot of work for little benefit.
wxBoolRevEnValidator *brenval; wxBoolRevEnValidator *brenval;
#define getbre(n, o, cv, t, wt) do { \ #define getbre(n, o, cv, t, wt) do { \
getfld(cv, d, n, t); \ cv=vfld(d, n, t); \
cv->SetValidator(wxBoolRevEnValidator(&o)); \ cv->SetValidator(wxBoolRevEnValidator(&o)); \
brenval = wxStaticCast(cv->GetValidator(), wxBoolRevEnValidator); \ brenval = wxStaticCast(cv->GetValidator(), wxBoolRevEnValidator); \
wx##wt##BoolEnHandlerConnect(rb, wxID_ANY, *ben); \ wx##wt##BoolEnHandlerConnect(rb, wxID_ANY, *ben); \
@ -2374,7 +2371,7 @@ bool MainFrame::InitMore(void)
#define getrbbd(n, o) getbre(n, o, rb, wxRadioButton, RBD) #define getrbbd(n, o) getbre(n, o, rb, wxRadioButton, RBD)
wxTextCtrl *tc; wxTextCtrl *tc;
#define gettc(n, o) do { \ #define gettc(n, o) do { \
getfld(tc, d, n, wxTextCtrl); \ tc=vfld(d, n, wxTextCtrl); \
tc->SetValidator(wxTextValidator(wxFILTER_NONE, &o)); \ tc->SetValidator(wxTextValidator(wxFILTER_NONE, &o)); \
} while(0) } while(0)
#ifndef NO_LINK #ifndef NO_LINK
@ -2418,9 +2415,9 @@ bool MainFrame::InitMore(void)
cheat_list_handler.dlg = d; cheat_list_handler.dlg = d;
d->SetEscapeId(wxID_OK); d->SetEscapeId(wxID_OK);
wxCheckedListCtrl *cl; wxCheckedListCtrl *cl;
getfld(cl, d, "Cheats", wxCheckedListCtrl); cl=vfld(d, "Cheats", wxCheckedListCtrl);
if(!cl->Init()) if(!cl->Init())
throw std::runtime_error("Unable to load a dialog control from the builtin xrc file: Cheats"); throw std::runtime_error("Unable to initialize the Cheats dialog control from the builtin xrc file!");
cheat_list_handler.list = cl; cheat_list_handler.list = cl;
cl->SetValidator(CheatListFill()); cl->SetValidator(CheatListFill());
cl->InsertColumn(0, _("Code")); cl->InsertColumn(0, _("Code"));
@ -2490,7 +2487,7 @@ bool MainFrame::InitMore(void)
d=LoadXRCDialog("CheatEdit"); d=LoadXRCDialog("CheatEdit");
wxChoice *ch; wxChoice *ch;
#define getch(n, o) do { \ #define getch(n, o) do { \
getfld(ch, d, n, wxChoice); \ ch=vfld(d, n, wxChoice); \
ch->SetValidator(wxGenericValidator(&o)); \ ch->SetValidator(wxGenericValidator(&o)); \
} while(0) } while(0)
{ {
@ -2508,7 +2505,7 @@ bool MainFrame::InitMore(void)
cheat_find_handler.dlg = d; cheat_find_handler.dlg = d;
d->SetEscapeId(wxID_OK); d->SetEscapeId(wxID_OK);
CheatListCtrl *list; CheatListCtrl *list;
getfld(list, d, "CheatList", CheatListCtrl); list=vfld(d, "CheatList", CheatListCtrl);
cheat_find_handler.list = list; cheat_find_handler.list = list;
list->SetValidator(CheatFindFill()); list->SetValidator(CheatFindFill());
list->InsertColumn(0, _("Address")); list->InsertColumn(0, _("Address"));
@ -2555,7 +2552,7 @@ bool MainFrame::InitMore(void)
wxCommandEventHandler(CheatFind_t::f), \ wxCommandEventHandler(CheatFind_t::f), \
NULL, &cheat_find_handler); NULL, &cheat_find_handler);
#define cf_enbutton(n, v) do { \ #define cf_enbutton(n, v) do { \
getfld(cheat_find_handler.v, d, n, wxButton); \ cheat_find_handler.v=vfld(d, n, wxButton); \
cheat_find_handler.v->Disable(); \ cheat_find_handler.v->Disable(); \
} while(0) } while(0)
cf_button("Search", Search); cf_button("Search", Search);
@ -2595,12 +2592,12 @@ bool MainFrame::InitMore(void)
d=LoadXRCDialog("GeneralConfig"); d=LoadXRCDialog("GeneralConfig");
wxCheckBox *cb; wxCheckBox *cb;
#define getcbb(n, o) do { \ #define getcbb(n, o) do { \
getfld(cb, d, n, wxCheckBox); \ cb=vfld(d, n, wxCheckBox); \
cb->SetValidator(wxGenericValidator(&o)); \ cb->SetValidator(wxGenericValidator(&o)); \
} while(0) } while(0)
wxSpinCtrl *sc; wxSpinCtrl *sc;
#define getsc(n, o) do { \ #define getsc(n, o) do { \
getfld(sc, d, n, wxSpinCtrl); \ sc=vfld(d, n, wxSpinCtrl); \
sc->SetValidator(wxGenericValidator(&o)); \ sc->SetValidator(wxGenericValidator(&o)); \
} while(0) } while(0)
{ {
@ -2611,7 +2608,7 @@ bool MainFrame::InitMore(void)
getsc("RewindInterval", gopts.rewind_interval); getsc("RewindInterval", gopts.rewind_interval);
getsc("Throttle", gopts.throttle); getsc("Throttle", gopts.throttle);
throttle_ctrl.thr = sc; throttle_ctrl.thr = sc;
getfld(throttle_ctrl.thrsel, d, "ThrottleSel", wxChoice); throttle_ctrl.thrsel=vfld(d, "ThrottleSel", wxChoice);
throttle_ctrl.thr-> throttle_ctrl.thr->
Connect(wxEVT_COMMAND_SPINCTRL_UPDATED, Connect(wxEVT_COMMAND_SPINCTRL_UPDATED,
wxSpinEventHandler(ThrottleCtrl_t::SetThrottleSel), wxSpinEventHandler(ThrottleCtrl_t::SetThrottleSel),
@ -2627,7 +2624,7 @@ bool MainFrame::InitMore(void)
#define getcbbe(n, o) getbe(n, o, cb, wxCheckBox, CB) #define getcbbe(n, o) getbe(n, o, cb, wxCheckBox, CB)
wxBoolIntEnValidator *bienval; wxBoolIntEnValidator *bienval;
#define getbie(n, o, v, cv, t, wt) do { \ #define getbie(n, o, v, cv, t, wt) do { \
getfld(cv, d, n, t); \ cv=vfld(d, n, t); \
cv->SetValidator(wxBoolIntEnValidator(&o, v, v)); \ cv->SetValidator(wxBoolIntEnValidator(&o, v, v)); \
bienval = wxStaticCast(cv->GetValidator(), wxBoolIntEnValidator); \ bienval = wxStaticCast(cv->GetValidator(), wxBoolIntEnValidator); \
static wxBoolEnHandler _ben; \ static wxBoolEnHandler _ben; \
@ -2647,7 +2644,7 @@ bool MainFrame::InitMore(void)
#define getcbie(n, o, v) getbie(n, o, v, cb, wxCheckBox, CB) #define getcbie(n, o, v) getbie(n, o, v, cb, wxCheckBox, CB)
wxFilePickerCtrl *fp; wxFilePickerCtrl *fp;
#define getfp(n, o) do { \ #define getfp(n, o) do { \
getfld(fp, d, n, wxFilePickerCtrl); \ fp=vfld(d, n, wxFilePickerCtrl); \
fp->SetValidator(wxFileDirPickerValidator(&o)); \ fp->SetValidator(wxFileDirPickerValidator(&o)); \
} while(0) } while(0)
d=LoadXRCropertySheetDialog("GameBoyConfig"); d=LoadXRCropertySheetDialog("GameBoyConfig");
@ -2684,7 +2681,7 @@ bool MainFrame::InitMore(void)
addbe(lab); addbe(lab);
/// Custom Colors /// Custom Colors
getcbb("Color", gbColorOption); getcbb("Color", gbColorOption);
wxFarRadio *r = 0; wxFarRadio *r = NULL;
for(int i = 0; i < 3; i++) { for(int i = 0; i < 3; i++) {
wxString pn; wxString pn;
// NOTE: wx2.9.1 behaves differently for referenced nodes // NOTE: wx2.9.1 behaves differently for referenced nodes
@ -2694,25 +2691,21 @@ bool MainFrame::InitMore(void)
// "Unable to load dialog GameBoyConfig from resources", this is // "Unable to load dialog GameBoyConfig from resources", this is
// probably the reason. // probably the reason.
pn.Printf(wxT("cp%d"), i + 1); pn.Printf(wxT("cp%d"), i + 1);
wxWindow *w; wxWindow *w = vfld(d, ToString(pn).c_str(), wxWindow);
getfldv(w, d, pn, wxWindow);
GBColorConfigHandler[i].p = w; GBColorConfigHandler[i].p = w;
GBColorConfigHandler[i].pno = i; GBColorConfigHandler[i].pno = i;
wxFarRadio *cb; wxFarRadio *cb = vfld(w, "UsePalette", wxFarRadio);
#define d w if(r)
getfld(cb, d, "UsePalette", wxFarRadio);
if(r)
cb->SetGroup(r); cb->SetGroup(r);
else else
r = cb; r = cb;
cb->SetValidator(wxBoolIntValidator(&gbPaletteOption, i)); cb->SetValidator(wxBoolIntValidator(&gbPaletteOption, i));
getfld(ch, d, "ColorSet", wxChoice); ch=vfld(w, "ColorSet", wxChoice);
GBColorConfigHandler[i].c = ch; GBColorConfigHandler[i].c = ch;
for(int j = 0; j < 8; j++) { for(int j = 0; j < 8; j++) {
wxString s; wxString s;
s.Printf(wxT("Color%d"), j); s.Printf(wxT("Color%d"), j);
wxColourPickerCtrl *cp; wxColourPickerCtrl *cp = vfld(w, ToString(s).c_str(), wxColourPickerCtrl);
getfldv(cp, d, s, wxColourPickerCtrl);
GBColorConfigHandler[i].cp[j] = cp; GBColorConfigHandler[i].cp[j] = cp;
cp->SetValidator(wxColorValidator(&systemGbPalette[i * 8 + j])); cp->SetValidator(wxColorValidator(&systemGbPalette[i * 8 + j]));
} }
@ -2725,7 +2718,6 @@ bool MainFrame::InitMore(void)
w->Connect(wxID_ANY, wxEVT_COMMAND_COLOURPICKER_CHANGED, w->Connect(wxID_ANY, wxEVT_COMMAND_COLOURPICKER_CHANGED,
wxCommandEventHandler(GBColorConfig_t::ColorButton), wxCommandEventHandler(GBColorConfig_t::ColorButton),
NULL, &GBColorConfigHandler[i]); NULL, &GBColorConfigHandler[i]);
#undef d
} }
} }
@ -2817,7 +2809,7 @@ bool MainFrame::InitMore(void)
getcbb("VSync", gopts.vsync); getcbb("VSync", gopts.vsync);
// FIXME: make cb disabled when not GL or d3d // FIXME: make cb disabled when not GL or d3d
#define getcbi(n, o, v) do { \ #define getcbi(n, o, v) do { \
getfld(cb, d, n, wxCheckBox); \ cb=vfld(d, n, wxCheckBox); \
cb->SetValidator(wxBoolIntValidator(&o, v)); \ cb->SetValidator(wxBoolIntValidator(&o, v)); \
} while(0) } while(0)
int mthr = wxThread::GetCPUCount(); int mthr = wxThread::GetCPUCount();
@ -2831,15 +2823,15 @@ bool MainFrame::InitMore(void)
#ifdef MMX #ifdef MMX
getcbb("MMX", cpu_mmx); getcbb("MMX", cpu_mmx);
#else #else
getfld(cb, d, "MMX", wxCheckBox); cb=vfld(d, "MMX", wxCheckBox);
cb->Hide(); cb->Hide();
#endif #endif
getch("Filter", gopts.filter); getch("Filter", gopts.filter);
// these two are filled and/or hidden at dialog load time // these two are filled and/or hidden at dialog load time
wxControl *pll; wxControl *pll;
wxChoice *pl; wxChoice *pl;
getfld(pll, d, "PluginLab", wxControl); pll=vfld(d, "PluginLab", wxControl);
getfld(pl, d, "Plugin", wxChoice); pl=vfld(d, "Plugin", wxChoice);
pll->SetValidator(PluginEnabler()); pll->SetValidator(PluginEnabler());
pl->SetValidator(PluginListFiller(d, pll, ch)); pl->SetValidator(PluginListFiller(d, pll, ch));
PluginEnableHandler.lab = pll; PluginEnableHandler.lab = pll;
@ -2853,7 +2845,7 @@ bool MainFrame::InitMore(void)
d=LoadXRCropertySheetDialog("SoundConfig"); d=LoadXRCropertySheetDialog("SoundConfig");
wxSlider *sl; wxSlider *sl;
#define getsl(n, o) do { \ #define getsl(n, o) do { \
getfld(sl, d, n, wxSlider); \ sl=vfld(d, n, wxSlider); \
sl->SetValidator(wxGenericValidator(&o)); \ sl->SetValidator(wxGenericValidator(&o)); \
} while(0) } while(0)
{ {
@ -2885,7 +2877,7 @@ bool MainFrame::InitMore(void)
#if !defined(__WXMSW__) || defined(NO_XAUDIO2) #if !defined(__WXMSW__) || defined(NO_XAUDIO2)
rb->Hide(); rb->Hide();
#endif #endif
getfld(sound_config_handler.dev, d, "Device", wxChoice); sound_config_handler.dev=vfld(d, "Device", wxChoice);
sound_config_handler.dev->SetValidator(SoundConfigLoad()); sound_config_handler.dev->SetValidator(SoundConfigLoad());
getcbb("Upmix", gopts.upmix); getcbb("Upmix", gopts.upmix);
sound_config_handler.umix = cb; sound_config_handler.umix = cb;
@ -2914,7 +2906,7 @@ bool MainFrame::InitMore(void)
getcbb("GBDeclicking", gopts.gb_declick); getcbb("GBDeclicking", gopts.gb_declick);
getcbbe("GBEnhanceSound", gb_effects_config.enabled); getcbbe("GBEnhanceSound", gb_effects_config.enabled);
wxPanel *p; wxPanel *p;
getfld(p, d, "GBEnhanceSoundDep", wxPanel); p=vfld(d, "GBEnhanceSoundDep", wxPanel);
addbe(p); addbe(p);
getcbb("GBSurround", gb_effects_config.surround); getcbb("GBSurround", gb_effects_config.surround);
getsl("GBEcho", gopts.gb_echo); getsl("GBEcho", gopts.gb_echo);
@ -2927,7 +2919,7 @@ bool MainFrame::InitMore(void)
wxDirPickerCtrl *dp; wxDirPickerCtrl *dp;
#define getdp(n, o) do { \ #define getdp(n, o) do { \
getfld(dp, d, n, wxDirPickerCtrl); \ dp=vfld(d, n, wxDirPickerCtrl); \
dp->SetValidator(wxFileDirPickerValidator(&o)); \ dp->SetValidator(wxFileDirPickerValidator(&o)); \
} while(0) } while(0)
d=LoadXRCDialog("DirectoriesConfig"); d=LoadXRCDialog("DirectoriesConfig");
@ -2952,10 +2944,10 @@ bool MainFrame::InitMore(void)
// probably the reason. // probably the reason.
pn.Printf(wxT("joy%d"), i + 1); pn.Printf(wxT("joy%d"), i + 1);
wxWindow *w; wxWindow *w;
getfldv(w, d, pn, wxWindow); w=vfld(d, ToString(pn).c_str(), wxWindow);
#define d w #define d w
wxFarRadio *cb; wxFarRadio *cb;
getfld(cb, d, "DefaultConfig", wxFarRadio); cb=vfld(d, "DefaultConfig", wxFarRadio);
if(r) if(r)
cb->SetGroup(r); cb->SetGroup(r);
else else
@ -3003,15 +2995,15 @@ bool MainFrame::InitMore(void)
d=LoadXRCDialog("AccelConfig"); d=LoadXRCDialog("AccelConfig");
{ {
wxTreeCtrl *tc; wxTreeCtrl *tc;
getfld(tc, d, "Commands", wxTreeCtrl); tc=vfld(d, "Commands", wxTreeCtrl);
accel_config_handler.tc = tc; accel_config_handler.tc = tc;
wxControlWithItems *lb; wxControlWithItems *lb;
getfld(lb, d, "Current", wxControlWithItems); lb=vfld(d, "Current", wxControlWithItems);
accel_config_handler.lb = lb; accel_config_handler.lb = lb;
getfld(accel_config_handler.asb, d, "Assign", wxButton); accel_config_handler.asb=vfld(d, "Assign", wxButton);
getfld(accel_config_handler.remb, d, "Remove", wxButton); accel_config_handler.remb=vfld(d, "Remove", wxButton);
getfld(accel_config_handler.key, d, "Shortcut", wxKeyTextCtrl); accel_config_handler.key=vfld(d, "Shortcut", wxKeyTextCtrl);
getfld(accel_config_handler.curas, d, "AlreadyThere", wxControl); accel_config_handler.curas=vfld(d, "AlreadyThere", wxControl);
accel_config_handler.key->MoveBeforeInTabOrder(accel_config_handler.asb); accel_config_handler.key->MoveBeforeInTabOrder(accel_config_handler.asb);
accel_config_handler.key->SetMultikey(0); accel_config_handler.key->SetMultikey(0);
accel_config_handler.key->SetClearable(false); accel_config_handler.key->SetClearable(false);