Various wxMotif changes including size optimisation and debugging operator fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -105,7 +105,7 @@ wxExtHelpController::Initialize(const wxString& file)
|
||||
|
||||
|
||||
bool
|
||||
wxExtHelpController::LoadFile(const wxString& ifile = "")
|
||||
wxExtHelpController::LoadFile(const wxString& ifile)
|
||||
{
|
||||
wxString mapFile, file, url, doc;
|
||||
int id,i,len;
|
||||
@@ -118,7 +118,9 @@ wxExtHelpController::LoadFile(const wxString& ifile = "")
|
||||
file = ifile;
|
||||
if(! wxIsAbsolutePath(file))
|
||||
{
|
||||
file = wxGetWorkingDirectory();
|
||||
char* f = wxGetWorkingDirectory();
|
||||
file = f;
|
||||
delete[] f; // wxGetWorkingDirectory returns new memory
|
||||
file << WXEXTHELP_SEPARATOR << ifile;
|
||||
}
|
||||
else
|
||||
|
Reference in New Issue
Block a user