Added wxTB_NODIVIDER and wxTB_NOALIGN so native Windows toolbar can

[wxWidgets.git] / src / mac / icon.cpp

diff --git a/src/mac/icon.cpp b/src/mac/icon.cpp
index 7bfb1d8309ea4b78af32a894770552e982546fd3..e886c1073ca51df91d7d384906f292e45b9e33b5 100644 (file)
--- a/src/mac/icon.cpp
+++ b/src/mac/icon.cpp
@@ -19,6 +19,9 @@
 IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
 #endif
 
+#include "wx/mac/private.h"
+
+
 /*
  * Icons
  */
@@ -43,25 +46,25 @@ wxIcon::wxIcon( char **bits ) :
 {
 }
 
-wxIcon::wxIcon(const wxString& icon_file, long flags,
+wxIcon::wxIcon(const wxString& icon_file, int flags,
     int desiredWidth, int desiredHeight)
 
 {
-    LoadFile(icon_file, flags, desiredWidth, desiredHeight);
+    LoadFile(icon_file, (wxBitmapType) flags, desiredWidth, desiredHeight);
 }
 
 wxIcon::~wxIcon()
 {
 }
 
-bool wxIcon::LoadFile(const wxString& filename, long type,
+bool wxIcon::LoadFile(const wxString& filename, wxBitmapType type,
     int desiredWidth, int desiredHeight)
 {
   UnRef();
 
   m_refData = new wxBitmapRefData;
 
-  wxBitmapHandler *handler = FindHandler(type);
+  wxBitmapHandler *handler = FindHandler((wxBitmapType)type);
 
   if ( handler )
        return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight);
@@ -69,13 +72,19 @@ bool wxIcon::LoadFile(const wxString& filename, long type,
        return FALSE;
 }
 
+void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
+{
+    wxIcon *icon = (wxIcon*)(&bmp);
+    *this = *icon;
+}
+
 IMPLEMENT_DYNAMIC_CLASS(wxICONResourceHandler, wxBitmapHandler)
 
 bool  wxICONResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
           int desiredWidth, int desiredHeight)
 {
        short theId = -1 ;
-    if ( name == "wxICON_INFO" )
+    if ( name == "wxICON_INFORMATION" )
     {
         theId = kNoteIcon ;
     }