Committing in .

changed one parameter in the definition of wxBitmap from long to int.
 (just as it is in wxGTK). This solves a compilation problem on OpenVMS.

 Modified Files:
 	wxWindows/include/wx/motif/bitmap.h
 	wxWindows/src/motif/bitmap.cpp
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jouk Jansen 2002-07-25 13:29:47 +00:00
parent ef0ed19e9d
commit 474cd91658
2 changed files with 2 additions and 2 deletions

View File

@ -149,7 +149,7 @@ public:
wxBitmap(char **data, wxControl* control);
// Load a file or resource
wxBitmap(const wxString& name, long type = wxBITMAP_TYPE_XPM);
wxBitmap(const wxString& name, int type = wxBITMAP_TYPE_XPM);
// Constructor for generalised creation from data
wxBitmap(void *data, long type, int width, int height, int depth = 1);

View File

@ -143,7 +143,7 @@ wxBitmap::wxBitmap(void *data, long type, int width, int height, int depth)
(void) Create(data, type, width, height, depth);
}
wxBitmap::wxBitmap(const wxString& filename, long type)
wxBitmap::wxBitmap(const wxString& filename, int type)
{
LoadFile(filename, (int)type);
}