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

diff --git a/include/wx/motif/bitmap.h b/include/wx/motif/bitmap.h
index 943f34cae15a25d150e8a49fa4582d2ce11f76c5..fd93fc1c2e130514cf7fe8052f910b466dbc698c 100644 (file)
--- a/include/wx/motif/bitmap.h
+++ b/include/wx/motif/bitmap.h
@@ -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);

diff --git a/src/motif/bitmap.cpp b/src/motif/bitmap.cpp
index e5b3c2c3086a44c67ae933dea32a1d8604f08fa2..9e5d80983ef44a4038a7e573c4d64010653dad77 100644 (file)
--- a/src/motif/bitmap.cpp
+++ b/src/motif/bitmap.cpp
@@ -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);
 }