Hopefully fixed library names generated by wx-config for OS/2's PM port.

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

diff --git a/include/wx/gtk/icon.h b/include/wx/gtk/icon.h
index 10bb5b12a27bcbd7690ec3a9599b7c9c1152b1e3..0bcbf462c0cf84116b01e2740ebd16ebde72316b 100644 (file)
--- a/include/wx/gtk/icon.h
+++ b/include/wx/gtk/icon.h
@@ -11,7 +11,7 @@
 #ifndef __GTKICONH__
 #define __GTKICONH__
 
 #ifndef __GTKICONH__
 #define __GTKICONH__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 


@@ -38,7 +38,7 @@ public:
 
     // For compatibility with wxMSW where desired size is sometimes required to
     // distinguish between multiple icons in a resource.
 
     // For compatibility with wxMSW where desired size is sometimes required to
     // distinguish between multiple icons in a resource.

-    wxIcon( const wxString& filename, int type = wxBITMAP_TYPE_XPM,
+    wxIcon( const wxString& filename, wxBitmapType type = wxBITMAP_TYPE_XPM,

             int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ) :
         wxBitmap(filename, type)
     {
             int WXUNUSED(desiredWidth)=-1, int WXUNUSED(desiredHeight)=-1 ) :
         wxBitmap(filename, type)
     {


@@ -46,7 +46,7 @@ public:
     wxIcon( char **bits, int width=-1, int height=-1 );
 
     wxIcon(const wxIconLocation& loc)
     wxIcon( char **bits, int width=-1, int height=-1 );
 
     wxIcon(const wxIconLocation& loc)

-        : wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_XPM)
+        : wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_ANY)

     {
     }
 
     {
     }