Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ISSUE-20: Resolving warnings about discarding const qualifier on assignment. #141

Merged
merged 1 commit into from
Jan 7, 2023
Merged

ISSUE-20: Resolving warnings about discarding const qualifier on assignment. #141

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,23 +698,30 @@ void init(void) {
}
#ifndef __WXMSW__
// have to do this because we don't have __WXMAC__ in C
// if we might be running on a Mac, call C++ functions that will return
// an appropriate path if __WXMAC__ is defined and 0 otherwise.

const char* wxMacGetCslsloc();
const char* wxMacGetHelploc();
const char* wxMacGetLibloc();
const char* newlib;
const char* newcsls;
const char* newhelp;
// check if we are running wxMac

newlib = wxMacGetLibloc();
if(newlib)
logolib = newlib;
//if (helpfiles == NULL) helpfiles = wxMacGetHelploc();
newcsls = wxMacGetCslsloc();
if(newcsls)
csls = newcsls;
if (newlib) {
logolib = (char *)newlib;
}

newcsls = wxMacGetCslsloc();
if (newcsls) {
csls = (char *)newcsls;
}

newhelp = wxMacGetHelploc();
if(newhelp)
helpfiles = newhelp;
if (newhelp) {
helpfiles = (char *)newhelp;
}
#endif
#endif

Expand Down