corrected handling of timeouts in wxConditionInternal::WaitTimeout(): check for wxSEM...

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

diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h
index eea99e4055bdb32e8f7bca28b9c92dd40a3e0a88..fbd77dcd02ab4d1db3ec6aaf90db48b8e3b6c3f2 100644 (file)
--- a/include/wx/motif/icon.h
+++ b/include/wx/motif/icon.h
@@ -12,10 +12,6 @@
 #ifndef _WX_ICON_H_
 #define _WX_ICON_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "icon.h"
-#endif
-
 #include "wx/bitmap.h"
 
 // Icon
@@ -23,17 +19,17 @@ class WXDLLEXPORT wxIcon : public wxBitmap
 {
 public:
     wxIcon();
-    
+
     // Copy constructors
     inline wxIcon(const wxIcon& icon) { Ref(icon); }
-    
+
     // Initialize with XBM data
     wxIcon(const char bits[], int width, int height);
-    
+
     // Initialize with XPM data
     wxIcon(const char **data);
     wxIcon(char **data);
-    
+
     wxIcon(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_XPM,
            int desiredWidth = -1, int desiredHeight = -1)
     {
@@ -46,15 +42,22 @@ public:
     }
 
     ~wxIcon();
-    
-    bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_XPM,
-                  int desiredWidth = -1, int desiredHeight = -1);
+
+    bool LoadFile(const wxString& name, wxBitmapType type,
+                  int desiredWidth, int desiredHeight = -1);
+
+    // unhide base class LoadFile()
+    virtual bool LoadFile(const wxString& name,
+                          wxBitmapType type = wxBITMAP_TYPE_XPM)
+    {
+        return LoadFile(name, type, -1, -1);
+    }
 
     // create from bitmap (which should have a mask unless it's monochrome):
     // there shouldn't be any implicit bitmap -> icon conversion (i.e. no
     // ctors, assignment operators...), but it's ok to have such function
     void CopyFromBitmap(const wxBitmap& bmp);
-    
+
     wxIcon& operator = (const wxIcon& icon)
         { if (this != &icon) Ref(icon); return *this; }
     bool operator == (const wxIcon& icon) const
@@ -63,7 +66,7 @@ public:
         { return !(*this == icon); }
 
 
-    DECLARE_DYNAMIC_CLASS(wxIcon);
+    DECLARE_DYNAMIC_CLASS(wxIcon)
 };
 
 #endif // _WX_ICON_H_