Fixed bug in FlexGridSizer mods that prevented them from ever shrinking.

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

diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp
index 6405427cade3334c77f9c2224e55ef01b194088b..561c013ec39f3d2b6c01bd5f93208b8226e7df6e 100644 (file)
--- a/src/common/bmpbase.cpp
+++ b/src/common/bmpbase.cpp
@@ -12,6 +12,15 @@
 #pragma implementation "bitmapbase.h"
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#if defined(__WXMGL__) || defined(__WXMAC__) || defined(__WXMOTIF__)
+
 #include "wx/wx.h"
 #include "wx/setup.h"
 #include "wx/utils.h"
@@ -51,59 +60,57 @@ bool wxBitmapBase::RemoveHandler(const wxString& name)
 
 wxBitmapHandler *wxBitmapBase::FindHandler(const wxString& name)
 {
-    wxNode *node = sm_handlers.First();
+    wxList::Node *node = sm_handlers.GetFirst();
     while ( node )
     {
-        wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
+        wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData();
         if ( handler->GetName() == name )
             return handler;
-        node = node->Next();
+        node = node->GetNext();
     }
     return NULL;
 }
 
 wxBitmapHandler *wxBitmapBase::FindHandler(const wxString& extension, wxBitmapType bitmapType)
 {
-    wxNode *node = sm_handlers.First();
+    wxList::Node *node = sm_handlers.GetFirst();
     while ( node )
     {
-        wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
+        wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData();
         if ( handler->GetExtension() == extension &&
                     (bitmapType == -1 || handler->GetType() == bitmapType) )
             return handler;
-        node = node->Next();
+        node = node->GetNext();
     }
     return NULL;
 }
 
 wxBitmapHandler *wxBitmapBase::FindHandler(wxBitmapType bitmapType)
 {
-    wxNode *node = sm_handlers.First();
+    wxList::Node *node = sm_handlers.GetFirst();
     while ( node )
     {
-        wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
+        wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData();
         if (handler->GetType() == bitmapType)
             return handler;
-        node = node->Next();
+        node = node->GetNext();
     }
     return NULL;
 }
 
 void wxBitmapBase::CleanUpHandlers()
 {
-    wxNode *node = sm_handlers.First();
+    wxList::Node *node = sm_handlers.GetFirst();
     while ( node )
     {
-        wxBitmapHandler *handler = (wxBitmapHandler *)node->Data();
-        wxNode *next = node->Next();
+        wxBitmapHandler *handler = (wxBitmapHandler *)node->GetData();
+        wxList::Node *next = node->GetNext();
         delete handler;
         delete node;
         node = next;
     }
 }
 
-
-
 class wxBitmapBaseModule: public wxModule
 {
 DECLARE_DYNAMIC_CLASS(wxBitmapBaseModule)
@@ -114,3 +121,6 @@ public:
 };
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapBaseModule, wxModule)
+
+#endif // defined(__WXMGL__) || defined(__WXMAC__) || defined(__WXMOTIF__)
+