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

More accurately show that a function is creating a pointer. 

It still looks like a memory leak to me, but I want to get rid of all the crazy C macros before fixing it.
This commit is contained in:
Arthur Moore 2015-01-09 02:34:01 -05:00
parent 5e6cd24322
commit 872e2badf2
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/wx/guiinit.cpp
View File

@ -2049,20 +2049,13 @@ public:
} throttle_ctrl;
/////////////////////////////
#define LoadXRCDialog(name) LoadXRCDialog1(d,name,this)
void LoadXRCDialog1(wxDialog* & dialog,const char * name,MainFrame * theframe)
#define LoadXRCDialog(name) d=LoadXRCDialog1(name,this)
wxDialog * LoadXRCDialog1(const char * name,MainFrame * theframe)
{
/* why do I have to manually Fit()? */
/* since I do, always do it for last item so other init happens first */
/* don't forget to Fit() the last dialog! */
if(dialog != NULL)
{
dialog->Fit();
}
wxString dname = wxString::FromUTF8(name);
/* using this instead of LoadDialog() allows non-wxDialog classes that */
/* are derived from wxDialog (like wxPropertyDialog) to work */
dialog = wxDynamicCast(wxXmlResource::Get()->LoadObject(theframe, dname, wxEmptyString), wxDialog);
wxDialog * dialog = wxDynamicCast(wxXmlResource::Get()->LoadObject(theframe, dname, wxEmptyString), wxDialog);
if(!dialog)
{
wxLogError(_("Unable to load dialog %s from resources"), name);
@ -2074,6 +2067,7 @@ void LoadXRCDialog1(wxDialog* & dialog,const char * name,MainFrame * theframe)
if(!dialog->GetParent())
dialog->Reparent(theframe);
mark_recursive(dialog);
return dialog;
}
bool MainFrame::InitMore(void)
@ -3184,8 +3178,6 @@ bool MainFrame::InitMore(void)
NULL, &accel_config_handler);
}
d->Fit();
//// Debug menu
// actually, the viewers can be instantiated multiple times.
// since they're for debugging, it's probably OK to just detect errors