Easier platform testing class and function

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

diff --git a/include/wx/gtk1/icon.h b/include/wx/gtk1/icon.h
index 93dd3b354b1bef77f113c6130df9adfc239fd42b..f93b45ac128d47ae0c463af0310992b654485076 100644 (file)
--- a/include/wx/gtk1/icon.h
+++ b/include/wx/gtk1/icon.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        icon.h
+// Name:        wx/gtk1/icon.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,14 +7,9 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKICONH__
 #define __GTKICONH__
 
 #ifndef __GTKICONH__
 #define __GTKICONH__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface
-#endif
-

 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/bitmap.h"
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/bitmap.h"


@@ -23,22 +18,21 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class wxIcon;
+class WXDLLIMPEXP_CORE wxIcon;

 
 //-----------------------------------------------------------------------------
 // wxIcon
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxIcon
 //-----------------------------------------------------------------------------
 

-class wxIcon: public wxBitmap
+class WXDLLIMPEXP_CORE wxIcon: public wxBitmap

 {
 public:
     wxIcon();
 {
 public:
     wxIcon();

-    wxIcon( const wxIcon& icon);

     wxIcon( const char **bits, int width=-1, int height=-1 );
 
     // For compatibility with wxMSW where desired size is sometimes required to
     // distinguish between multiple icons in a resource.
     wxIcon( const char **bits, int width=-1, int height=-1 );
 
     // 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)
     {


@@ -50,7 +44,6 @@ public:
     {
     }
 
     {
     }
 

-    wxIcon& operator=(const wxIcon& icon);

     bool operator==(const wxIcon& icon) const { return m_refData == icon.m_refData; }
     bool operator!=(const wxIcon& icon) const { return !(*this == icon); }
 
     bool operator==(const wxIcon& icon) const { return m_refData == icon.m_refData; }
     bool operator!=(const wxIcon& icon) const { return !(*this == icon); }