Solves 2 problems I encounterd on OpenVMS :
stdpaths.cpp : missing rourtine in VMS part bitmap.cpp : type casts WXPixmap changed to Pixmap Modified Files: wxWidgets/src/unix/stdpaths.cpp wxWidgets/src/x11/bitmap.cpp git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
2b4b6ded9b
commit
b29aaf4a77
@ -100,6 +100,11 @@ wxStandardPaths::GetLocalizedResourcesDir(const wxChar *lang,
|
||||
return wxStandardPathsBase::GetLocalizedResourcesDir(lang, category);
|
||||
}
|
||||
|
||||
wxString wxStandardPaths::GetExecutablePath() const
|
||||
{
|
||||
return wxStandardPathsBase::GetExecutablePath();
|
||||
}
|
||||
|
||||
#else // !__VMS
|
||||
|
||||
// ============================================================================
|
||||
|
@ -1372,7 +1372,7 @@ bool wxXPMFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name,
|
||||
|
||||
XpmFreeAttributes(&xpmAttr);
|
||||
|
||||
M_BMPHANDLERDATA->m_bitmap = (WXPixmap) pixmap;
|
||||
M_BMPHANDLERDATA->m_bitmap = (Pixmap) pixmap;
|
||||
|
||||
if (mask)
|
||||
{
|
||||
@ -1497,7 +1497,7 @@ bool wxXPMDataHandler::Create(wxBitmap *bitmap, const void* bits,
|
||||
|
||||
XpmFreeAttributes(&xpmAttr);
|
||||
|
||||
M_BMPHANDLERDATA->m_pixmap = (WXPixmap) pixmap;
|
||||
M_BMPHANDLERDATA->m_pixmap = (Pixmap) pixmap;
|
||||
|
||||
if (mask)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user