implement click events in wxHeaderCtrl

[wxWidgets.git] / src / common / iconbndl.cpp

diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp
index 676ff07f1262973564b219c27eed7975fbf0d10e..ff0f8275732de22ca31575a9156476b902631087 100644 (file)
--- a/src/common/iconbndl.cpp
+++ b/src/common/iconbndl.cpp
@@ -8,14 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -27,7 +19,6 @@
 
 #ifndef WX_PRECOMP
     #include "wx/settings.h"
 
 #ifndef WX_PRECOMP
     #include "wx/settings.h"

-    #include "wx/icon.h"

     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/bitmap.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/bitmap.h"


@@ -35,12 +26,11 @@
 #endif
 
 #include "wx/arrimpl.cpp"
 #endif
 
 #include "wx/arrimpl.cpp"

-

 WX_DEFINE_OBJARRAY(wxIconArray)
 
 IMPLEMENT_DYNAMIC_CLASS(wxIconBundle, wxGDIObject)
 
 WX_DEFINE_OBJARRAY(wxIconArray)
 
 IMPLEMENT_DYNAMIC_CLASS(wxIconBundle, wxGDIObject)
 

-#define M_ICONBUNDLEDATA ((wxIconBundleRefData *)m_refData)
+#define M_ICONBUNDLEDATA static_cast<wxIconBundleRefData*>(m_refData)

 
 // ----------------------------------------------------------------------------
 // wxIconBundleRefData
 
 // ----------------------------------------------------------------------------
 // wxIconBundleRefData


@@ -53,10 +43,7 @@ public:
 
     virtual bool IsOk() const { return !m_icons.empty(); }
 
 
     virtual bool IsOk() const { return !m_icons.empty(); }
 

-protected:

     wxIconArray m_icons;
     wxIconArray m_icons;

-
-    friend class wxIconBundle;

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -64,22 +51,15 @@ protected:
 // ============================================================================
 
 wxIconBundle::wxIconBundle()
 // ============================================================================
 
 wxIconBundle::wxIconBundle()

-            : wxGDIObject()

 {
 }
 
 {
 }
 

-wxIconBundle::wxIconBundle(const wxString& file, long type)
+wxIconBundle::wxIconBundle(const wxString& file, wxBitmapType type)

             : wxGDIObject()
 {
     AddIcon(file, type);
 }
 
             : wxGDIObject()
 {
     AddIcon(file, type);
 }
 

-wxIconBundle::wxIconBundle(const wxIconBundle& icon)
-            : wxGDIObject()
-{
-    Ref(icon);
-}
-

 wxIconBundle::wxIconBundle(const wxIcon& icon)
             : wxGDIObject()
 {
 wxIconBundle::wxIconBundle(const wxIcon& icon)
             : wxGDIObject()
 {


@@ -93,7 +73,7 @@ wxGDIRefData *wxIconBundle::CreateGDIRefData() const
 
 wxGDIRefData *wxIconBundle::CloneGDIRefData(const wxGDIRefData *data) const
 {
 
 wxGDIRefData *wxIconBundle::CloneGDIRefData(const wxGDIRefData *data) const
 {

-    return new wxIconBundleRefData(*wx_static_cast(const wxIconBundleRefData *, data));
+    return new wxIconBundleRefData(*static_cast<const wxIconBundleRefData *>(data));

 }
 
 void wxIconBundle::DeleteIcons()
 }
 
 void wxIconBundle::DeleteIcons()


@@ -101,7 +81,7 @@ void wxIconBundle::DeleteIcons()
     UnRef();
 }
 
     UnRef();
 }
 

-void wxIconBundle::AddIcon(const wxString& file, long type)
+void wxIconBundle::AddIcon(const wxString& file, wxBitmapType type)

 {
 #ifdef __WXMAC__
     // Deal with standard icons
 {
 #ifdef __WXMAC__
     // Deal with standard icons


@@ -181,7 +161,7 @@ wxIcon wxIconBundle::GetIcon(const wxSize& size) const
             }
     }
 
             }
     }
 

-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && wxOSX_USE_CARBON

     return wxIcon(iconBest.GetHICON(), size);
 #else
     return iconBest;
     return wxIcon(iconBest.GetHICON(), size);
 #else
     return iconBest;


@@ -237,4 +217,3 @@ wxIcon wxIconBundle::GetIconByIndex(size_t n) const
 
     return M_ICONBUNDLEDATA->m_icons[n];
 }
 
     return M_ICONBUNDLEDATA->m_icons[n];
 }

-