supporting more key equivalents for display, fixing setHidden: method warning

[wxWidgets.git] / src / osx / imaglist.cpp

diff --git a/src/osx/imaglist.cpp b/src/osx/imaglist.cpp
index 9bd77204a4eb2c36de540e64a6e8144fdb86e727..0a5cc0c742581eeabb3ebaea558c587d825179c0 100644 (file)
--- a/src/osx/imaglist.cpp
+++ b/src/osx/imaglist.cpp
@@ -58,8 +58,8 @@ int wxImageList::Add( const wxIcon &bitmap )
 {
     wxASSERT_MSG( (bitmap.GetWidth() == m_width && bitmap.GetHeight() == m_height)
                   || (m_width == 0 && m_height == 0),
 {
     wxASSERT_MSG( (bitmap.GetWidth() == m_width && bitmap.GetHeight() == m_height)
                   || (m_width == 0 && m_height == 0),

-                  _T("invalid bitmap size in wxImageList: this might work ")
-                  _T("on this platform but definitely won't under Windows.") );
+                  wxT("invalid bitmap size in wxImageList: this might work ")
+                  wxT("on this platform but definitely won't under Windows.") );

 
     m_images.Append( new wxIcon( bitmap ) );
 
 
     m_images.Append( new wxIcon( bitmap ) );
 


@@ -76,8 +76,8 @@ int wxImageList::Add( const wxBitmap &bitmap )
 {
     wxASSERT_MSG( (bitmap.GetWidth() >= m_width && bitmap.GetHeight() == m_height)
                   || (m_width == 0 && m_height == 0),
 {
     wxASSERT_MSG( (bitmap.GetWidth() >= m_width && bitmap.GetHeight() == m_height)
                   || (m_width == 0 && m_height == 0),

-                  _T("invalid bitmap size in wxImageList: this might work ")
-                  _T("on this platform but definitely won't under Windows.") );
+                  wxT("invalid bitmap size in wxImageList: this might work ")
+                  wxT("on this platform but definitely won't under Windows.") );

 
     // Mimic behavior of Windows ImageList_Add that automatically breaks up the added
     // bitmap into sub-images of the correct size
 
     // Mimic behavior of Windows ImageList_Add that automatically breaks up the added
     // bitmap into sub-images of the correct size


@@ -133,9 +133,9 @@ wxBitmap wxImageList::GetBitmap(int index) const
     if ( obj == NULL )
         return wxNullBitmap ;
     else if ( obj->IsKindOf(CLASSINFO(wxIcon)) )
     if ( obj == NULL )
         return wxNullBitmap ;
     else if ( obj->IsKindOf(CLASSINFO(wxIcon)) )

-        return wxBitmap( *(wx_static_cast(wxIcon*, obj)) ) ;
+        return wxBitmap( *(static_cast<wxIcon*>(obj)) ) ;

     else
     else

-        return *(wx_static_cast(wxBitmap*, obj)) ;
+        return *(static_cast<wxBitmap*>(obj)) ;

 }
 
 // Get the icon
 }
 
 // Get the icon


@@ -154,7 +154,7 @@ wxIcon wxImageList::GetIcon(int index) const
         return wxNullIcon ;
     }
     else
         return wxNullIcon ;
     }
     else

-        return *(wx_static_cast(wxIcon*, obj)) ;
+        return *(static_cast<wxIcon*>(obj)) ;

 }
 
 bool wxImageList::Replace( int index, const wxBitmap &bitmap )
 }
 
 bool wxImageList::Replace( int index, const wxBitmap &bitmap )


@@ -269,13 +269,13 @@ bool wxImageList::GetSize( int index, int &width, int &height ) const
     wxObject *obj = (wxObject*)node->GetData();
     if (obj->IsKindOf(CLASSINFO(wxIcon)))
     {
     wxObject *obj = (wxObject*)node->GetData();
     if (obj->IsKindOf(CLASSINFO(wxIcon)))
     {

-        wxIcon *bm = wx_static_cast( wxIcon* , obj ) ;
+        wxIcon *bm = static_cast< wxIcon* >(obj ) ;

         width = bm->GetWidth();
         height = bm->GetHeight();
     }
     else
     {
         width = bm->GetWidth();
         height = bm->GetHeight();
     }
     else
     {

-        wxBitmap *bm = wx_static_cast( wxBitmap* , obj ) ;
+        wxBitmap *bm = static_cast< wxBitmap* >(obj ) ;

         width = bm->GetWidth();
         height = bm->GetHeight();
     }
         width = bm->GetWidth();
         height = bm->GetHeight();
     }


@@ -294,12 +294,12 @@ bool wxImageList::Draw(
     wxObject *obj = (wxObject*)node->GetData();
     if (obj->IsKindOf(CLASSINFO(wxIcon)))
     {
     wxObject *obj = (wxObject*)node->GetData();
     if (obj->IsKindOf(CLASSINFO(wxIcon)))
     {

-        wxIcon *bm = wx_static_cast( wxIcon* , obj ) ;
+        wxIcon *bm = static_cast< wxIcon* >(obj ) ;

         dc.DrawIcon( *bm , x, y );
     }
     else
     {
         dc.DrawIcon( *bm , x, y );
     }
     else
     {

-        wxBitmap *bm = wx_static_cast( wxBitmap* , obj ) ;
+        wxBitmap *bm = static_cast< wxBitmap* >(obj ) ;

         dc.DrawBitmap( *bm, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 );
     }
 
         dc.DrawBitmap( *bm, x, y, (flags & wxIMAGELIST_DRAW_TRANSPARENT) > 0 );
     }