attempt to fix crash in tree ctrl

[wxWidgets.git] / src / os2 / icon.cpp

diff --git a/src/os2/icon.cpp b/src/os2/icon.cpp
index 60614db09c32799db302b21132f5b68658c8726c..26f744c91f4633cc6b6c12530076354529e68067 100644 (file)
--- a/src/os2/icon.cpp
+++ b/src/os2/icon.cpp
@@ -17,12 +17,11 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include <stdio.h>
-#include "wx/setup.h"
-#include "wx/list.h"
-#include "wx/utils.h"
-#include "wx/app.h"
-#include "wx/icon.h"
+    #include "wx/defs.h"
+    #include "wx/list.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"
+    #include "wx/icon.h"

 #endif
 
 #include "wx/os2/private.h"
 #endif
 
 #include "wx/os2/private.h"


@@ -30,121 +29,86 @@
 
 #include "wx/icon.h"
 
 
 #include "wx/icon.h"
 

-#if !USE_SHARED_LIBRARIES
-IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
-IMPLEMENT_DYNAMIC_CLASS(wxICOFileHandler, wxBitmapHandler)
-IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxBitmapHandler)
-#endif
+    IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxIconBase)

 
 

-/*
- * Icons
- */
+// ============================================================================
+// implementation
+// ============================================================================

 
 

-wxIconRefData::wxIconRefData()
-{
-  m_hIcon = (WXHICON) NULL ;
-}
+// ----------------------------------------------------------------------------
+// wxIconRefData
+// ----------------------------------------------------------------------------

 
 

-wxIconRefData::~wxIconRefData()
+void wxIconRefData::Free()

 {
 {

-  if ( m_hIcon )
-     return;
-  // TODO  ::DestroyIcon((HICON) m_hIcon);
+    if (m_hIcon)
+        ::WinFreeFileIcon((HPOINTER)m_hIcon);

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// wxIcon
+// ----------------------------------------------------------------------------
+

 wxIcon::wxIcon()
 {
 }
 
 wxIcon::wxIcon()
 {
 }
 

-wxIcon::wxIcon(const char WXUNUSED(bits)[], int WXUNUSED(width), int WXUNUSED(height))
+wxIcon::wxIcon(
+  const char                        WXUNUSED(bits)[]
+, int                               WXUNUSED(nWidth)
+, int                               WXUNUSED(nHeight)
+)

 {
 }
 
 {
 }
 

-wxIcon::wxIcon(const wxString& icon_file, long flags,
-    int desiredWidth, int desiredHeight)
-
+wxIcon::wxIcon(
+  const wxString&                   rIconFile
+, long                              lFlags
+, int                               nDesiredWidth
+, int                               nDesiredHeight
+)

 {
 {

-    LoadFile(icon_file, flags, desiredWidth, desiredHeight);
+    //
+    // A very poor hack, but we have to have separate icon files from windows
+    // So we have a modified name where replace the last three characters
+    // with os2.  Also need the extension.
+    //
+    wxString                         sOs2Name = rIconFile.Mid(0, rIconFile.Length() - 3);
+
+    sOs2Name += "Os2.ico";
+    LoadFile( sOs2Name
+             ,lFlags
+             ,nDesiredWidth
+             ,nDesiredHeight
+            );

 }
 
 wxIcon::~wxIcon()
 {
 }
 
 }
 
 wxIcon::~wxIcon()
 {
 }
 

-bool wxIcon::LoadFile(const wxString& filename, long type,
-    int desiredWidth, int desiredHeight)
-{
-  UnRef();
-
-  m_refData = new wxIconRefData;
-
-  wxBitmapHandler *handler = FindHandler(type);
-
-  if ( handler )
-    return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight);
-  else
-    return FALSE;
-}
-
-void wxIcon::SetHICON(WXHICON ico)
+bool wxIcon::LoadFile(
+  const wxString&                   rFilename
+, long                              lType
+, int                               nDesiredWidth
+, int                               nDesiredHeight
+)

 {
 {

-  if ( !M_ICONDATA )
-  m_refData = new wxIconRefData;
+    HPS                             hPs = NULLHANDLE;

 
 

-  M_ICONDATA->m_hIcon = ico;
-}
+    UnRef();

 
 

-bool wxICOFileHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-    int desiredWidth, int desiredHeight)
-{
-  return FALSE;
-}
+    wxGDIImageHandler*              pHandler = FindHandler(lType);

 
 

-bool wxICOResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-    int desiredWidth, int desiredHeight)
-{
-// TODO
-/*
-  if ( bitmap->IsKindOf(CLASSINFO(wxIcon)) )
-  {
-    if (desiredWidth > -1 && desiredHeight > -1)
-    {
-        M_ICONHANDLERDATA->m_hIcon = (WXHICON) ::LoadImage(wxGetInstance(), name, IMAGE_ICON, desiredWidth, desiredHeight, LR_DEFAULTCOLOR);
-    }
+    if (pHandler)
+        return(pHandler->Load( this
+                              ,rFilename
+                              ,hPs
+                              ,lType
+                              ,nDesiredWidth
+                              ,nDesiredHeight
+                             ));

     else
     else

-    {
-      M_ICONHANDLERDATA->m_hIcon = (WXHICON) ::LoadIcon(wxGetInstance(), name);
-    }
-
-    ICONINFO info ;
-    if (::GetIconInfo((HICON) M_ICONHANDLERDATA->m_hIcon, &info))
-    {
-        HBITMAP ms_bitmap = info.hbmMask ;
-        if (ms_bitmap)
-        {
-            BITMAP bm;
-            ::GetObject(ms_bitmap, sizeof(BITMAP), (LPSTR) &bm);
-            M_ICONHANDLERDATA->m_width = bm.bmWidth;
-            M_ICONHANDLERDATA->m_height = bm.bmHeight;
-        }
-        if (info.hbmMask)
-            ::DeleteObject(info.hbmMask) ;
-        if (info.hbmColor)
-            ::DeleteObject(info.hbmColor) ;
-      }
-    }
-    // Override the found values with desired values
-    if (desiredWidth > -1 && desiredHeight > -1)
-    {
-       M_ICONHANDLERDATA->m_width = desiredWidth;
-       M_ICONHANDLERDATA->m_height = desiredHeight;
-    }
-
-    M_ICONHANDLERDATA->m_ok = (M_ICONHANDLERDATA->m_hIcon != 0);
-    return M_ICONHANDLERDATA->m_ok;
-  }
-  else
-*/
-    return FALSE;
+        return(FALSE);

 }
 
 }