Upported combobox changes and another fix.

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

diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h
index 365e581757ecb7bc7c212368aff1f766b7247784..9d58ceb38977836ca60030dd4466a81a9c53c073 100644 (file)
--- a/include/wx/motif/icon.h
+++ b/include/wx/motif/icon.h
@@ -39,11 +39,11 @@ public:
     wxIcon(const char **data);
     wxIcon(char **data);
     
-    wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_XPM,
+    wxIcon(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_XPM,
         int desiredWidth = -1, int desiredHeight = -1);
     ~wxIcon();
     
-    bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_XPM,
+    bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_XPM,
         int desiredWidth = -1, int desiredHeight = -1);
 
     // create from bitmap (which should have a mask unless it's monochrome):