Applied fix for VC++ 7 which treats __LINE__ slightly differently, apparently.

[wxWidgets.git] / include / wx / motif / bitmap.h

diff --git a/include/wx/motif/bitmap.h b/include/wx/motif/bitmap.h
index 23f8bcd9bef656e04dcd118bcc9cbaddc1f8e76f..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);
@@ -171,6 +171,9 @@ public:
     virtual bool SaveFile(const wxString& name, int type, const wxPalette *cmap = NULL);
     
     wxImage ConvertToImage() const;
+
+    // copies the contents and mask of the given (colour) icon to the bitmap
+    virtual bool CopyFromIcon(const wxIcon& icon);
     
     bool Ok() const { return (M_BITMAPDATA && M_BITMAPDATA->m_ok); }
     int GetWidth() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_width : 0); }