fixes to ShowFullScreen (KDE 3.1)

[wxWidgets.git] / src / msw / gdiimage.cpp

diff --git a/src/msw/gdiimage.cpp b/src/msw/gdiimage.cpp
index 6891c30349cb7f2f18f62290ccd418b0671d56ff..7fb451d303b26555de5ac60f9c9940d724b46f26 100644 (file)
--- a/src/msw/gdiimage.cpp
+++ b/src/msw/gdiimage.cpp
@@ -45,6 +45,10 @@
 #include "wx/msw/gdiimage.h"
 #include "wx/bitmap.h"
 
 #include "wx/msw/gdiimage.h"
 #include "wx/bitmap.h"
 

+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxGDIImageHandlerList);
+
+

 #ifdef __WIN16__
 #   include "wx/msw/curico.h"
 #endif // __WIN16__
 #ifdef __WIN16__
 #   include "wx/msw/curico.h"
 #endif // __WIN16__


@@ -191,7 +195,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxObject)
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-wxList wxGDIImage::ms_handlers;
+wxGDIImageHandlerList wxGDIImage::ms_handlers;

 
 // ----------------------------------------------------------------------------
 // wxGDIImage functions forwarded to wxGDIImageRefData
 
 // ----------------------------------------------------------------------------
 // wxGDIImage functions forwarded to wxGDIImageRefData


@@ -241,10 +245,10 @@ bool wxGDIImage::RemoveHandler(const wxString& name)
 
 wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& name)
 {
 
 wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& name)
 {

-    wxNode *node = ms_handlers.GetFirst();
+    wxGDIImageHandlerList::Node *node = ms_handlers.GetFirst();

     while ( node )
     {
     while ( node )
     {

-        wxGDIImageHandler *handler = (wxGDIImageHandler *)node->GetData();
+        wxGDIImageHandler *handler = node->GetData();

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


@@ -256,10 +260,10 @@ wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& name)
 wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& extension,
                                            long type)
 {
 wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& extension,
                                            long type)
 {

-    wxNode *node = ms_handlers.GetFirst();
+    wxGDIImageHandlerList::Node *node = ms_handlers.GetFirst();

     while ( node )
     {
     while ( node )
     {

-        wxGDIImageHandler *handler = (wxGDIImageHandler *)node->GetData();
+        wxGDIImageHandler *handler = node->GetData();

         if ( (handler->GetExtension() = extension) &&
              (type == -1 || handler->GetType() == type) )
         {
         if ( (handler->GetExtension() = extension) &&
              (type == -1 || handler->GetType() == type) )
         {


@@ -273,10 +277,10 @@ wxGDIImageHandler *wxGDIImage::FindHandler(const wxString& extension,
 
 wxGDIImageHandler *wxGDIImage::FindHandler(long type)
 {
 
 wxGDIImageHandler *wxGDIImage::FindHandler(long type)
 {

-    wxNode *node = ms_handlers.GetFirst();
+    wxGDIImageHandlerList::Node *node = ms_handlers.GetFirst();

     while ( node )
     {
     while ( node )
     {

-        wxGDIImageHandler *handler = (wxGDIImageHandler *)node->GetData();
+        wxGDIImageHandler *handler = node->GetData();

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


@@ -288,11 +292,11 @@ wxGDIImageHandler *wxGDIImage::FindHandler(long type)
 
 void wxGDIImage::CleanUpHandlers()
 {
 
 void wxGDIImage::CleanUpHandlers()
 {

-    wxNode *node = ms_handlers.GetFirst();
+    wxGDIImageHandlerList::Node *node = ms_handlers.GetFirst();

     while ( node )
     {
     while ( node )
     {

-        wxGDIImageHandler *handler = (wxGDIImageHandler *)node->GetData();
-        wxNode *next = node->GetNext();
+        wxGDIImageHandler *handler = node->GetData();
+        wxGDIImageHandlerList::Node *next = node->GetNext();

         delete handler;
         delete node;
         node = next;
         delete handler;
         delete node;
         node = next;