ensure that GetItemRect() returns the real rect and not 0 even if it's called before...

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

diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp
index 86a9341ee271ef8416be6a2d2aeee88d12048d9e..3db6041ebd77bca211135cf9b69a4ae1be1ef3e8 100644 (file)
--- a/src/common/bmpbase.cpp
+++ b/src/common/bmpbase.cpp
@@ -8,7 +8,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "bitmapbase.h"
 #endif
 
 #pragma implementation "bitmapbase.h"
 #endif
 


@@ -19,9 +19,9 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if defined(__WXMGL__) || defined(__WXMAC__)
+#if defined(__WXMGL__) || defined(__WXMAC__) \
+    || defined(__WXMOTIF__) || defined(__WXX11__)

 
 

-#include "wx/wx.h"

 #include "wx/setup.h"
 #include "wx/utils.h"
 #include "wx/palette.h"
 #include "wx/setup.h"
 #include "wx/utils.h"
 #include "wx/palette.h"


@@ -60,53 +60,53 @@ bool wxBitmapBase::RemoveHandler(const wxString& name)
 
 wxBitmapHandler *wxBitmapBase::FindHandler(const wxString& name)
 {
 
 wxBitmapHandler *wxBitmapBase::FindHandler(const wxString& name)
 {

-    wxNode *node = sm_handlers.First();
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();

     while ( node )
     {
     while ( node )
     {

-        wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
+        wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData();

         if ( handler->GetName() == name )
             return handler;
         if ( handler->GetName() == name )
             return handler;

-        node = node->Next();
+        node = node->GetNext();

     }
     return NULL;
 }
 
 wxBitmapHandler *wxBitmapBase::FindHandler(const wxString& extension, wxBitmapType bitmapType)
 {
     }
     return NULL;
 }
 
 wxBitmapHandler *wxBitmapBase::FindHandler(const wxString& extension, wxBitmapType bitmapType)
 {

-    wxNode *node = sm_handlers.First();
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();

     while ( node )
     {
     while ( node )
     {

-        wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
+        wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData();

         if ( handler->GetExtension() == extension &&
                     (bitmapType == -1 || handler->GetType() == bitmapType) )
             return handler;
         if ( handler->GetExtension() == extension &&
                     (bitmapType == -1 || handler->GetType() == bitmapType) )
             return handler;

-        node = node->Next();
+        node = node->GetNext();

     }
     return NULL;
 }
 
 wxBitmapHandler *wxBitmapBase::FindHandler(wxBitmapType bitmapType)
 {
     }
     return NULL;
 }
 
 wxBitmapHandler *wxBitmapBase::FindHandler(wxBitmapType bitmapType)
 {

-    wxNode *node = sm_handlers.First();
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();

     while ( node )
     {
     while ( node )
     {

-        wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
+        wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData();

         if (handler->GetType() == bitmapType)
             return handler;
         if (handler->GetType() == bitmapType)
             return handler;

-        node = node->Next();
+        node = node->GetNext();

     }
     return NULL;
 }
 
 void wxBitmapBase::CleanUpHandlers()
 {
     }
     return NULL;
 }
 
 void wxBitmapBase::CleanUpHandlers()
 {

-    wxNode *node = sm_handlers.First();
+    wxList::compatibility_iterator node = sm_handlers.GetFirst();

     while ( node )
     {
     while ( node )
     {

-        wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
-        wxNode *next = node->Next();
+        wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData();
+        wxList::compatibility_iterator next = node->GetNext();

         delete handler;
         delete handler;

-        delete node;
+        sm_handlers.Erase(node);

         node = next;
     }
 }
         node = next;
     }
 }


@@ -122,5 +122,5 @@ public:
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapBaseModule, wxModule)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapBaseModule, wxModule)
 

-#endif // defined(__WXMGL__) || defined(__WXMAC__)
+#endif // defined(__WXMGL__) || defined(__WXMAC__) || defined(__WXCOCOA__) || defined(__WXMOTIF__) || defined(__WXX11__)