Minor changes to make files compile (return values); added resource.cpp.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
145aa40682
commit
aad5220b82
@ -40,8 +40,10 @@
|
|||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
|
||||||
|
#ifdef __UNIX__
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef __WINDOWS__
|
#ifdef __WINDOWS__
|
||||||
#ifndef __GNUWIN32__
|
#ifndef __GNUWIN32__
|
||||||
@ -719,7 +721,7 @@ wxDos2UnixFilename (char *s)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
wxUnix2DosFilename (char *WXUNUSED(s))
|
wxUnix2DosFilename (char *s)
|
||||||
{
|
{
|
||||||
// Yes, I really mean this to happen under DOS only! JACS
|
// Yes, I really mean this to happen under DOS only! JACS
|
||||||
#ifdef __WINDOWS__
|
#ifdef __WINDOWS__
|
||||||
|
@ -535,8 +535,8 @@ const char *wxSysErrorMsg(unsigned long nErrCode)
|
|||||||
0, NULL);
|
0, NULL);
|
||||||
|
|
||||||
// copy it to our buffer and free memory
|
// copy it to our buffer and free memory
|
||||||
strncpy(s_szBuf, (const char *)lpMsgBuf, SIZEOF(s_szBuf) - 1);
|
strncpy(s_szBuf, (const char *)lpMsgBuf, WXSIZEOF(s_szBuf) - 1);
|
||||||
s_szBuf[SIZEOF(s_szBuf) - 1] = '\0';
|
s_szBuf[WXSIZEOF(s_szBuf) - 1] = '\0';
|
||||||
LocalFree(lpMsgBuf);
|
LocalFree(lpMsgBuf);
|
||||||
|
|
||||||
// returned string is capitalized and ended with '\r\n' - bad
|
// returned string is capitalized and ended with '\r\n' - bad
|
||||||
|
@ -414,6 +414,8 @@ int wxPreviewControlBar::GetZoomControl(void)
|
|||||||
return (int)atoi(buf);
|
return (int)atoi(buf);
|
||||||
}
|
}
|
||||||
else return 0;
|
else return 0;
|
||||||
|
#else
|
||||||
|
return 0;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -455,6 +457,8 @@ bool wxPreviewFrame::OnClose(void)
|
|||||||
}
|
}
|
||||||
delete printPreview;
|
delete printPreview;
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
#else
|
||||||
|
return FALSE;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
2861
src/common/resource.cpp
Normal file
2861
src/common/resource.cpp
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user