Add another test for the insertion point position after SetValue().

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

diff --git a/src/common/iconbndl.cpp b/src/common/iconbndl.cpp
index 8fa0ccd441d5f665d6832fcb47305d5bf293a71a..e87312bc5e4f77d524185f466e847c2d7fdb5699 100644 (file)
--- a/src/common/iconbndl.cpp
+++ b/src/common/iconbndl.cpp
@@ -57,19 +57,22 @@ wxIconBundle::wxIconBundle()
 {
 }
 
 {
 }
 

+#if wxUSE_STREAMS && wxUSE_IMAGE
+
+#if wxUSE_FFILE || wxUSE_FILE

 wxIconBundle::wxIconBundle(const wxString& file, wxBitmapType type)
             : wxGDIObject()
 {
     AddIcon(file, type);
 }
 wxIconBundle::wxIconBundle(const wxString& file, wxBitmapType type)
             : wxGDIObject()
 {
     AddIcon(file, type);
 }

+#endif // wxUSE_FFILE || wxUSE_FILE

 
 

-#if wxUSE_STREAMS

 wxIconBundle::wxIconBundle(wxInputStream& stream, wxBitmapType type)
             : wxGDIObject()
 {
     AddIcon(stream, type);
 }
 wxIconBundle::wxIconBundle(wxInputStream& stream, wxBitmapType type)
             : wxGDIObject()
 {
     AddIcon(stream, type);
 }

-#endif // wxUSE_STREAMS
+#endif // wxUSE_STREAMS && wxUSE_IMAGE

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


@@ -92,6 +95,8 @@ void wxIconBundle::DeleteIcons()
     UnRef();
 }
 
     UnRef();
 }
 

+#if wxUSE_STREAMS && wxUSE_IMAGE
+

 namespace
 {
 
 namespace
 {
 


@@ -139,6 +144,8 @@ void DoAddIcon(wxIconBundle& bundle,
 
 } // anonymous namespace
 
 
 } // anonymous namespace
 

+#if wxUSE_FFILE || wxUSE_FILE
+

 void wxIconBundle::AddIcon(const wxString& file, wxBitmapType type)
 {
 #ifdef __WXMAC__
 void wxIconBundle::AddIcon(const wxString& file, wxBitmapType type)
 {
 #ifdef __WXMAC__


@@ -154,7 +161,11 @@ void wxIconBundle::AddIcon(const wxString& file, wxBitmapType type)
     }
 #endif // __WXMAC__
 
     }
 #endif // __WXMAC__
 

+#if wxUSE_FFILE

     wxFFileInputStream stream(file);
     wxFFileInputStream stream(file);

+#elif wxUSE_FILE
+    wxFileInputStream stream(file);
+#endif

     DoAddIcon
     (
         *this,
     DoAddIcon
     (
         *this,


@@ -163,12 +174,14 @@ void wxIconBundle::AddIcon(const wxString& file, wxBitmapType type)
     );
 }
 
     );
 }
 

-#if wxUSE_STREAMS
+#endif // wxUSE_FFILE || wxUSE_FILE
+

 void wxIconBundle::AddIcon(wxInputStream& stream, wxBitmapType type)
 {
     DoAddIcon(*this, stream, type, _("Failed to load image %d from stream."));
 }
 void wxIconBundle::AddIcon(wxInputStream& stream, wxBitmapType type)
 {
     DoAddIcon(*this, stream, type, _("Failed to load image %d from stream."));
 }

-#endif // wxUSE_STREAMS
+
+#endif // wxUSE_STREAMS && wxUSE_IMAGE

 
 wxIcon wxIconBundle::GetIcon(const wxSize& size) const
 {
 
 wxIcon wxIconBundle::GetIcon(const wxSize& size) const
 {


@@ -233,7 +246,7 @@ wxIcon wxIconBundle::GetIconOfExactSize(const wxSize& size) const
 
 void wxIconBundle::AddIcon(const wxIcon& icon)
 {
 
 void wxIconBundle::AddIcon(const wxIcon& icon)
 {

-    wxCHECK_RET( icon.IsOk(), _T("invalid icon") );
+    wxCHECK_RET( icon.IsOk(), wxT("invalid icon") );

 
     AllocExclusive();
 
 
     AllocExclusive();
 


@@ -264,7 +277,7 @@ size_t wxIconBundle::GetIconCount() const
 
 wxIcon wxIconBundle::GetIconByIndex(size_t n) const
 {
 
 wxIcon wxIconBundle::GetIconByIndex(size_t n) const
 {

-    wxCHECK_MSG( n < GetIconCount(), wxNullIcon, _T("invalid index") );
+    wxCHECK_MSG( n < GetIconCount(), wxNullIcon, wxT("invalid index") );

 
     return M_ICONBUNDLEDATA->m_icons[n];
 }
 
     return M_ICONBUNDLEDATA->m_icons[n];
 }