streamlining slider, scroller, spinbutton for osx carbon and cocoa

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

diff --git a/include/wx/generic/icon.h b/include/wx/generic/icon.h
index 9a6976f6912aaee877aeab9f6ea3f5b7fc56a379..3a1f5072acd160792bd4029dee145fa42bf1cbf9 100644 (file)
--- a/include/wx/generic/icon.h
+++ b/include/wx/generic/icon.h
@@ -18,22 +18,20 @@
 // wxIcon
 //-----------------------------------------------------------------------------
 
 // wxIcon
 //-----------------------------------------------------------------------------
 

-#ifndef wxICON_DEFAULT_BITMAP_TYPE
-#define wxICON_DEFAULT_BITMAP_TYPE wxBITMAP_TYPE_XPM
-#endif
-

 class WXDLLIMPEXP_CORE wxIcon: public wxBitmap
 {
 public:
     wxIcon();
 
 class WXDLLIMPEXP_CORE wxIcon: public wxBitmap
 {
 public:
     wxIcon();
 

-    wxIcon( const char **bits, int width=-1, int height=-1 );
-    wxIcon( char **bits, int width=-1, int height=-1 );
+    wxIcon(const char* const* bits);
+#ifdef wxNEEDS_CHARPP
+    wxIcon(char **bits);
+#endif

 
     // For compatibility with wxMSW where desired size is sometimes required to
     // distinguish between multiple icons in a resource.
     wxIcon( const wxString& filename,
 
     // For compatibility with wxMSW where desired size is sometimes required to
     // distinguish between multiple icons in a resource.
     wxIcon( const wxString& filename,

-            wxBitmapType type = wxICON_DEFAULT_BITMAP_TYPE,
+            wxBitmapType type = wxICON_DEFAULT_TYPE,

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


@@ -44,10 +42,14 @@ public:
     {
     }
 
     {
     }
 

-    bool operator==(const wxIcon& icon) const
-        { return m_refData == icon.m_refData; }
-    bool operator!=(const wxIcon& icon) const
-        { return !(*this == icon); }
+    bool LoadFile(const wxString& name, wxBitmapType flags,
+                  int WXUNUSED(desiredWidth), int WXUNUSED(desiredHeight))
+        { return wxBitmap::LoadFile(name, flags); }
+
+    // unhide the base class version
+    virtual bool LoadFile(const wxString& name,
+                          wxBitmapType flags = wxICON_DEFAULT_TYPE)
+        { return wxBitmap::LoadFile(name, flags); }

 
     // create from bitmap (which should have a mask unless it's monochrome):
     // there shouldn't be any implicit bitmap -> icon conversion (i.e. no
 
     // create from bitmap (which should have a mask unless it's monochrome):
     // there shouldn't be any implicit bitmap -> icon conversion (i.e. no